mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

fix #3704

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-04-03 10:38:31 -07:00
parent c431a100b7
commit 50624723af
4 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/sat/sat_lookahead.cpp
View file

@ -234,9 +234,9 @@ namespace sat {
for (bool newbies = false; ; newbies = true) {
sum = init_candidates(level, newbies);
if (!m_candidates.empty()) break;
if (is_sat()) {
if (is_sat() || newbies) {
return false;
}
}
}
SASSERT(!m_candidates.empty());
// cut number of candidates down to max_num_cand.
@ -334,7 +334,7 @@ namespace sat {
}
}
}
if (m_candidates.empty() && (m_select_lookahead_vars.empty() || newbies)) {
if (m_candidates.empty() && (m_select_lookahead_vars.empty() && newbies)) {
for (bool_var x : m_freevars) {
SASSERT(is_undef(x));
if (newbies || active_prefix(x)) {
@ -635,9 +635,7 @@ namespace sat {
if (sz-- == 0) break;
tsum += h[b.m_u.index()] * h[b.m_v.index()];
}
// std::cout << "sum: " << sum << " afactor " << afactor << " sqfactor " << sqfactor << " tsum " << tsum << "\n";
sum = (double)(0.1 + afactor*sum + sqfactor*tsum);
// std::cout << "sum: " << sum << " max score " << m_config.m_max_score << "\n";
return std::min(m_config.m_max_score, sum);
}
@ -2224,9 +2222,10 @@ namespace sat {
for (auto v : m_freevars) if (in_reduced_clause(v)) vars.push_back(v);
m_model.reset();
init_model();
return l_true;
return m_freevars.empty() ? l_true : l_undef;
}
TRACE("sat", tout << "choose: " << lit << " cube: " << m_cube_state.m_cube << "\n";);
SASSERT(vars.empty() || vars.contains(lit.var()));
++m_stats.m_decisions;
push(lit, c_fixed_truth);
m_cube_state.m_cube.push_back(lit);
@ -2512,7 +2511,6 @@ namespace sat {
}
}
}
// std::cout << candidates.size() << " -> " << k << "\n";
if (k == candidates.size()) break;
candidates.shrink(k);
if (k == 0) break;

13
src/sat/sat_solver/inc_sat_solver.cpp
View file

@ -384,7 +384,18 @@ public:
lit2expr.resize(m_solver.num_vars() * 2);
m_map.mk_inv(lit2expr);
for (sat::literal l : lits) {
fmls.push_back(lit2expr[l.index()].get());
expr* e = lit2expr.get(l.index());
if (!e) {
std::cout << l << "\n";
std::cout << lits << "\n";
std::cout << vars << "\n";
std::cout << lit2expr << "\n";
for (auto const& kv : m_map) {
std::cout << kv.m_value << " " << mk_pp(kv.m_key, m) << "\n";
}
}
SASSERT(e);
fmls.push_back(e);
}
vs.reset();
for (sat::bool_var v : vars) {