mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-25 00:44:36 +00:00
Code Activity

Merge branch 'master' of https://github.com/z3prover/z3 into xor

Browse source
This commit is contained in:
Nikolaj Bjorner 2022-11-10 10:42:38 -08:00
commit 08a925323c
67 changed files with 1057 additions and 379 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/sat/sat_config.cpp
View file

@ -46,7 +46,7 @@ namespace sat {
else if (s == symbol("static"))
m_restart = RS_STATIC;
else
throw sat_param_exception("invalid restart strategy");
throw sat_param_exception("invalid restart strategy. Use ema (default), luby, geometric, static");
m_fast_glue_avg = p.restart_emafastglue();
m_slow_glue_avg = p.restart_emaslowglue();

2
src/sat/sat_solver.h
View file

@ -353,10 +353,8 @@ namespace sat {
void init_visited(unsigned lim = 1) { m_visited.init_visited(2 * num_vars(), lim); }
bool is_visited(sat::bool_var v) const { return is_visited(literal(v, false)); }
bool is_visited(literal lit) const { return m_visited.is_visited(lit.index()); }
unsigned num_visited(bool_var v) const { return m_visited.num_visited(v); }
void mark_visited(literal lit) { m_visited.mark_visited(lit.index()); }
void mark_visited(bool_var v) { mark_visited(literal(v, false)); }
void inc_visited(bool_var v) { m_visited.inc_visited(v); }
bool all_distinct(literal_vector const& lits);
bool all_distinct(clause const& cl);