From ebd3eb0ec11b053ddf5eee44c1217436948279d9 Mon Sep 17 00:00:00 2001 From: Timotej Kapus Date: Mon, 2 Dec 2019 15:05:03 +0000 Subject: [Searchers] Remove weight from es, add nurs_depth Having both weight and depth in execution state is wasteful, therefore this patch removes weight. The nurs:depth searcher is replaced by nurs:rp, which uses pow to compute the weight A new nurs:depth searcher is introduced that biases the search with depth, making it the only other searcher that prefers to go deep (similar to dfs). --- lib/Core/Executor.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'lib/Core/Executor.cpp') diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index f90a8909..934fa43e 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -2940,14 +2940,6 @@ void Executor::run(ExecutionState &initialState) { klee_message("seeding done (%d states remain)", (int) states.size()); - // XXX total hack, just because I like non uniform better but want - // seed results to be equally weighted. - for (std::set::iterator - it = states.begin(), ie = states.end(); - it != ie; ++it) { - (*it)->weight = 1.; - } - if (OnlySeed) { doDumpStates(); return; @@ -4113,7 +4105,6 @@ void Executor::dumpStates() { *os << "{"; *os << "'depth' : " << es->depth << ", "; - *os << "'weight' : " << es->weight << ", "; *os << "'queryCost' : " << es->queryCost << ", "; *os << "'coveredNew' : " << es->coveredNew << ", "; *os << "'instsSinceCovNew' : " << es->instsSinceCovNew << ", "; -- cgit 1.4.1