mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 14:13:23 +00:00
Code Activity

revising pd-maxres

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-08-23 12:09:07 -07:00
parent 76c9abada2
commit ee458fa601
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/opt/maxres.cpp
View file

@ -247,6 +247,7 @@ public:
break; break;
} }
} }
m_lower = m_upper;
trace(); trace();
return l_true; return l_true;
} }
@ -468,6 +469,9 @@ public:
fml = mk_not(m, mk_and(m, m_B.size(), m_B.c_ptr())); fml = mk_not(m, mk_and(m, m_B.size(), m_B.c_ptr()));
s().assert_expr(fml); s().assert_expr(fml);
m_lower += w; m_lower += w;
if (m_st == s_primal_dual) {
m_lower = std::min(m_lower, m_upper);
}
trace(); trace();
} }

2
src/sat/sat_solver.cpp
View file

@ -959,11 +959,13 @@ namespace sat {
assign(lit, justification()); assign(lit, justification());
break; break;
case l_false: { case l_false: {
m_assumptions.push_back(lit);
SASSERT(!inconsistent()); SASSERT(!inconsistent());
set_conflict(justification(), ~lit); set_conflict(justification(), ~lit);
flet<bool> _min1(m_config.m_minimize_core, false); flet<bool> _min1(m_config.m_minimize_core, false);
flet<bool> _min2(m_config.m_minimize_core_partial, false); flet<bool> _min2(m_config.m_minimize_core_partial, false);
resolve_conflict_for_unsat_core(); resolve_conflict_for_unsat_core();
m_assumptions.pop_back();
weight += weights[i]; weight += weights[i];
blocker.push_back(lit); blocker.push_back(lit);
TRACE("sat", tout << "core: " << m_core << "\nassumptions: " << m_assumptions << "\n";); TRACE("sat", tout << "core: " << m_core << "\nassumptions: " << m_assumptions << "\n";);