mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-24 03:57:51 +00:00
Code Activity

conflict logging

Browse source
This commit is contained in:
Jakob Rath 2022-04-12 16:06:20 +02:00
parent 00fa4b3320
commit 9fa5096776
11 changed files with 210 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/math/polysat/solver.cpp
View file

@ -566,10 +566,12 @@ namespace polysat {
++m_stats.m_num_conflicts;
SASSERT(is_conflict());
m_conflict.begin_conflict();
if (m_conflict.conflict_var() != null_var) {
pvar v = m_conflict.conflict_var();
// This case corresponds to a propagation of conflict_var, except it's not explicitly on the stack.
// TODO: use unsat core from m_viable_fallback if the conflict is from there
VERIFY(m_viable.resolve(v, m_conflict));
// TBD: saturate resulting conflict to get better lemmas.
LOG("try-eliminate v" << v);
@ -600,6 +602,7 @@ namespace polysat {
inc_activity(v);
justification& j = m_justification[v];
if (j.level() > base_level() && !m_conflict.resolve_value(v) && j.is_decision()) {
m_conflict.log_gamma();
revert_decision(v);
return;
}
@ -620,6 +623,7 @@ namespace polysat {
if (m_bvars.is_assumption(var))
continue;
else if (m_bvars.is_decision(var)) {
m_conflict.log_gamma();
revert_bool_decision(lit);
return;
}
@ -631,8 +635,7 @@ namespace polysat {
}
}
}
// here we build conflict clause if it has free variables.
// the last decision is reverted.
m_conflict.log_gamma();
report_unsat();
}
@ -1030,9 +1033,12 @@ namespace polysat {
out << "v" << var << " := ";
rational const& p = rational::power_of_two(s.size(var));
if (val > mod(-val, p))
return out << -mod(-val, p);
out << -mod(-val, p);
else
return out << val;
out << val;
if (with_justification)
out << " (" << s.m_justification[var] << ")";
return out;
}