mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-19 02:42:02 +00:00
Code Activity

cleaning

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-09-19 07:52:57 -04:00
parent 02a38009b9
commit dac2f1c026
2 changed files with 22 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -110,30 +110,6 @@ namespace polysat {
m_free_pvars.del_var_eh(v); m_free_pvars.del_var_eh(v);
} }
signed_constraint solver::eq(pdd const& p) {
return m_constraints.eq(p);
}
signed_constraint solver::diseq(pdd const& p) {
return ~m_constraints.eq(p);
}
signed_constraint solver::ule(pdd const& p, pdd const& q) {
return m_constraints.ule(p, q);
}
signed_constraint solver::ult(pdd const& p, pdd const& q) {
return m_constraints.ult(p, q);
}
signed_constraint solver::sle(pdd const& p, pdd const& q) {
return m_constraints.sle(p, q);
}
signed_constraint solver::slt(pdd const& p, pdd const& q) {
return m_constraints.slt(p, q);
}
void solver::ext_constraint(signed_constraint c, unsigned dep, bool activate) { void solver::ext_constraint(signed_constraint c, unsigned dep, bool activate) {
VERIFY(at_base_level()); VERIFY(at_base_level());
SASSERT(c); SASSERT(c);
@ -224,8 +200,7 @@ namespace polysat {
wlist[end++] = &cl; wlist[end++] = &cl;
if (m_bvars.is_false(cl[idx])) { if (m_bvars.is_false(cl[idx])) {
set_conflict(cl); set_conflict(cl);
++j; continue;
break;
} }
assign_bool(level(cl), cl[idx], &cl, nullptr); assign_bool(level(cl), cl[idx], &cl, nullptr);
} }
@ -454,18 +429,6 @@ namespace polysat {
#endif #endif
} }
void solver::set_conflict(signed_constraint c) {
m_conflict.set(c);
}
void solver::set_conflict(pvar v) {
m_conflict.set(v);
}
void solver::set_conflict(clause& cl) {
m_conflict.set(cl);
}
/** /**
* Conflict resolution. * Conflict resolution.
* - m_conflict are constraints that are infeasible in the current assignment. * - m_conflict are constraints that are infeasible in the current assignment.
@ -552,9 +515,9 @@ namespace polysat {
sat::bool_var const var = lit.var(); sat::bool_var const var = lit.var();
SASSERT(m_bvars.is_propagation(var)); SASSERT(m_bvars.is_propagation(var));
// NOTE: boolean resolution should work normally even in bailout mode. // NOTE: boolean resolution should work normally even in bailout mode.
clause* other = m_bvars.reason(var); clause other = *m_bvars.reason(var);
LOG_H3("resolve_bool: " << lit << " " << *other); LOG_H3("resolve_bool: " << lit << " " << other);
m_conflict.resolve(m_constraints, var, *other); m_conflict.resolve(m_constraints, var, other);
} }
void solver::report_unsat() { void solver::report_unsat() {
@ -576,14 +539,12 @@ namespace polysat {
*/ */
} }
void solver::learn_lemma(pvar v, clause_ref lemma) { void solver::learn_lemma(pvar v, clause& lemma) {
if (!lemma) LOG("Learning: "<< lemma);
return; SASSERT(lemma.size() > 0);
LOG("Learning: " << show_deref(lemma)); lemma.set_justified_var(v);
SASSERT(lemma->size() > 0); add_lemma(lemma);
lemma->set_justified_var(v); decide_bool(lemma);
add_lemma(*lemma);
decide_bool(*lemma);
} }
// Guess a literal from the given clause; returns the guessed constraint // Guess a literal from the given clause; returns the guessed constraint
@ -641,12 +602,12 @@ namespace polysat {
clause_ref lemma = m_conflict.build_lemma().build(); clause_ref lemma = m_conflict.build_lemma().build();
m_conflict.reset(); m_conflict.reset();
backjump(m_justification[v].level() - 1); backjump(get_level(v) - 1);
// The justification for this restriction is the guessed constraint from the lemma. // The justification for this restriction is the guessed constraint from the lemma.
// cjust[v] will be updated accordingly by decide_bool. // cjust[v] will be updated accordingly by decide_bool.
m_viable.add_non_viable(v, val); m_viable.add_non_viable(v, val);
learn_lemma(v, std::move(lemma)); learn_lemma(v, *lemma);
if (!is_conflict()) if (!is_conflict())
narrow(v); narrow(v);
@ -707,7 +668,6 @@ namespace polysat {
backjump(m_bvars.level(var) - 1); backjump(m_bvars.level(var) - 1);
add_lemma(*reason); add_lemma(*reason);
// propagate_bool(~lit, reason.get());
if (is_conflict()) { if (is_conflict()) {
LOG_H1("Conflict during revert_bool_decision/propagate_bool!"); LOG_H1("Conflict during revert_bool_decision/propagate_bool!");
return; return;

20
src/math/polysat/solver.h
View file

@ -173,9 +173,9 @@ namespace polysat {
void add_watch(signed_constraint c); void add_watch(signed_constraint c);
void add_watch(signed_constraint c, pvar v); void add_watch(signed_constraint c, pvar v);
void set_conflict(signed_constraint c); void set_conflict(signed_constraint c) { m_conflict.set(c); }
void set_conflict(clause& cl); void set_conflict(clause& cl) { m_conflict.set(cl); }
void set_conflict(pvar v); void set_conflict(pvar v) { m_conflict.set(v); }
bool can_decide() const { return !m_free_pvars.empty() || m_bvars.can_decide(); } bool can_decide() const { return !m_free_pvars.empty() || m_bvars.can_decide(); }
void decide(); void decide();
@ -202,20 +202,20 @@ namespace polysat {
void revert_bool_decision(sat::literal lit); void revert_bool_decision(sat::literal lit);
void report_unsat(); void report_unsat();
void learn_lemma(pvar v, clause_ref lemma); void learn_lemma(pvar v, clause& lemma);
void backjump(unsigned new_level); void backjump(unsigned new_level);
void add_lemma(clause& lemma); void add_lemma(clause& lemma);
signed_constraint eq(pdd const& p); signed_constraint eq(pdd const& p) { return m_constraints.eq(p); }
signed_constraint diseq(pdd const& p); signed_constraint diseq(pdd const& p) { return ~m_constraints.eq(p); }
signed_constraint eq(pdd const& p, pdd const& q) { return eq(p - q); } signed_constraint eq(pdd const& p, pdd const& q) { return eq(p - q); }
signed_constraint diseq(pdd const& p, pdd const& q) { return diseq(p - q); } signed_constraint diseq(pdd const& p, pdd const& q) { return diseq(p - q); }
signed_constraint eq(pdd const& p, rational const& q) { return eq(p - q); } signed_constraint eq(pdd const& p, rational const& q) { return eq(p - q); }
signed_constraint diseq(pdd const& p, rational const& q) { return diseq(p - q); } signed_constraint diseq(pdd const& p, rational const& q) { return diseq(p - q); }
signed_constraint ule(pdd const& p, pdd const& q); signed_constraint ule(pdd const& p, pdd const& q) { return m_constraints.ule(p, q); }
signed_constraint ult(pdd const& p, pdd const& q); signed_constraint ult(pdd const& p, pdd const& q) { return m_constraints.ult(p, q); }
signed_constraint sle(pdd const& p, pdd const& q); signed_constraint sle(pdd const& p, pdd const& q) { return m_constraints.sle(p, q); }
signed_constraint slt(pdd const& p, pdd const& q); signed_constraint slt(pdd const& p, pdd const& q) { return m_constraints.slt(p, q); }
signed_constraint lit2cnstr(sat::literal lit) const { return m_constraints.lookup(lit); } signed_constraint lit2cnstr(sat::literal lit) const { return m_constraints.lookup(lit); }
void ext_constraint(signed_constraint c, unsigned dep, bool activate); void ext_constraint(signed_constraint c, unsigned dep, bool activate);
static void insert_constraint(signed_constraints& cs, signed_constraint c); static void insert_constraint(signed_constraints& cs, signed_constraint c);