aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/Core
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Core')
-rw-r--r--lib/Core/Searcher.cpp6
-rw-r--r--lib/Core/Searcher.h3
-rw-r--r--lib/Core/UserSearcher.cpp12
3 files changed, 9 insertions, 12 deletions
diff --git a/lib/Core/Searcher.cpp b/lib/Core/Searcher.cpp
index 2dbabd01..8c3e26bc 100644
--- a/lib/Core/Searcher.cpp
+++ b/lib/Core/Searcher.cpp
@@ -157,10 +157,8 @@ void RandomSearcher::update(ExecutionState *current,
///
-WeightedRandomSearcher::WeightedRandomSearcher(Executor &_executor,
- WeightType _type)
- : executor(_executor),
- states(new DiscretePDF<ExecutionState*>()),
+WeightedRandomSearcher::WeightedRandomSearcher(WeightType _type)
+ : states(new DiscretePDF<ExecutionState*>()),
type(_type) {
switch(type) {
case Depth:
diff --git a/lib/Core/Searcher.h b/lib/Core/Searcher.h
index 79c233c4..3944d4b4 100644
--- a/lib/Core/Searcher.h
+++ b/lib/Core/Searcher.h
@@ -135,7 +135,6 @@ namespace klee {
};
private:
- Executor &executor;
DiscretePDF<ExecutionState*> *states;
WeightType type;
bool updateWeights;
@@ -143,7 +142,7 @@ namespace klee {
double getWeight(ExecutionState*);
public:
- WeightedRandomSearcher(Executor &executor, WeightType type);
+ WeightedRandomSearcher(WeightType type);
~WeightedRandomSearcher();
ExecutionState &selectState();
diff --git a/lib/Core/UserSearcher.cpp b/lib/Core/UserSearcher.cpp
index a20ae968..2c75f796 100644
--- a/lib/Core/UserSearcher.cpp
+++ b/lib/Core/UserSearcher.cpp
@@ -81,12 +81,12 @@ Searcher *getNewSearcher(Searcher::CoreSearchType type, Executor &executor) {
case Searcher::BFS: searcher = new BFSSearcher(); break;
case Searcher::RandomState: searcher = new RandomSearcher(); break;
case Searcher::RandomPath: searcher = new RandomPathSearcher(executor); break;
- case Searcher::NURS_CovNew: searcher = new WeightedRandomSearcher(executor, WeightedRandomSearcher::CoveringNew); break;
- case Searcher::NURS_MD2U: searcher = new WeightedRandomSearcher(executor, WeightedRandomSearcher::MinDistToUncovered); break;
- case Searcher::NURS_Depth: searcher = new WeightedRandomSearcher(executor, WeightedRandomSearcher::Depth); break;
- case Searcher::NURS_ICnt: searcher = new WeightedRandomSearcher(executor, WeightedRandomSearcher::InstCount); break;
- case Searcher::NURS_CPICnt: searcher = new WeightedRandomSearcher(executor, WeightedRandomSearcher::CPInstCount); break;
- case Searcher::NURS_QC: searcher = new WeightedRandomSearcher(executor, WeightedRandomSearcher::QueryCost); break;
+ case Searcher::NURS_CovNew: searcher = new WeightedRandomSearcher(WeightedRandomSearcher::CoveringNew); break;
+ case Searcher::NURS_MD2U: searcher = new WeightedRandomSearcher(WeightedRandomSearcher::MinDistToUncovered); break;
+ case Searcher::NURS_Depth: searcher = new WeightedRandomSearcher(WeightedRandomSearcher::Depth); break;
+ case Searcher::NURS_ICnt: searcher = new WeightedRandomSearcher(WeightedRandomSearcher::InstCount); break;
+ case Searcher::NURS_CPICnt: searcher = new WeightedRandomSearcher(WeightedRandomSearcher::CPInstCount); break;
+ case Searcher::NURS_QC: searcher = new WeightedRandomSearcher(WeightedRandomSearcher::QueryCost); break;
}
return searcher;