mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-22 05:43:39 +00:00
Code Activity

add randomization to lookahead selection'

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-02-01 10:48:43 -08:00
parent 615da0e3fb
commit 75fb25a06c
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/smt/smt_lookahead.cpp
View file

@ -18,7 +18,8 @@ Revision History:
--*/ --*/
#include <cmath> #include <cmath>
#include "ast/ast_smt2_pp.h" #include "ast/ast_pp.h"
#include "ast/ast_ll_pp.h"
#include "smt/smt_lookahead.h" #include "smt/smt_lookahead.h"
#include "smt/smt_context.h" #include "smt/smt_context.h"
@ -78,7 +79,7 @@ namespace smt {
compare comp(ctx); compare comp(ctx);
std::sort(vars.begin(), vars.end(), comp); std::sort(vars.begin(), vars.end(), comp);
unsigned nf = 0, nc = 0, ns = 0, bound = 2000; unsigned nf = 0, nc = 0, ns = 0, bound = 2000, n = 0;
for (bool_var v : vars) { for (bool_var v : vars) {
if (!ctx.bool_var2expr(v)) continue; if (!ctx.bool_var2expr(v)) continue;
literal lit(v, false); literal lit(v, false);
@ -108,7 +109,9 @@ namespace smt {
continue; continue;
} }
double score = score1 + score2 + 1024*score1*score2; double score = score1 + score2 + 1024*score1*score2;
if (score > best_score) {
if (score > best_score || (score == best_score && ctx.get_random_value() % (++n) == 0)) {
if (score > best_score) n = 0;
best_score = score; best_score = score;
best_v = v; best_v = v;
bound += ns; bound += ns;

3
src/smt/smt_parallel.cpp
View file

@ -17,6 +17,7 @@ Author:
#include "util/scoped_ptr_vector.h" #include "util/scoped_ptr_vector.h"
#include "ast/ast_util.h" #include "ast/ast_util.h"
#include "ast/ast_pp.h"
#include "ast/ast_translation.h" #include "ast/ast_translation.h"
#include "smt/smt_parallel.h" #include "smt/smt_parallel.h"
#include "smt/smt_lookahead.h" #include "smt/smt_lookahead.h"
@ -115,7 +116,7 @@ namespace smt {
} }
IF_VERBOSE(1, verbose_stream() << "(smt.thread " << i; IF_VERBOSE(1, verbose_stream() << "(smt.thread " << i;
if (num_rounds > 0) verbose_stream() << " :round " << num_rounds; if (num_rounds > 0) verbose_stream() << " :round " << num_rounds;
if (c) verbose_stream() << " :cube: " << c; if (c) verbose_stream() << " :cube: " << mk_pp(c, pm);
verbose_stream() << ")\n";); verbose_stream() << ")\n";);
lbool r = pctx.check(lasms.size(), lasms.c_ptr()); lbool r = pctx.check(lasms.size(), lasms.c_ptr());