mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

tune initial propagation for pd-maxres

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-08-25 17:15:31 -07:00
parent d00d6a3506
commit af9143b64a
2 changed files with 45 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/sat/sat_solver.cpp
View file

@ -943,6 +943,14 @@ namespace sat {
} }
} }
void solver::resolve_weighted() {
flet<bool> _min1(m_config.m_minimize_core, false);
flet<bool> _min2(m_config.m_minimize_core_partial, false);
m_conflict_lvl = m_scope_lvl;
resolve_conflict_for_unsat_core();
m_assumptions.pop_back();
}
bool solver::init_weighted_assumptions(unsigned num_lits, literal const* lits, double const* weights, double max_weight, bool solver::init_weighted_assumptions(unsigned num_lits, literal const* lits, double const* weights, double max_weight,
svector<literal>& blocker) { svector<literal>& blocker) {
double weight = 0; double weight = 0;
@ -952,44 +960,56 @@ namespace sat {
SASSERT(is_external(lit.var())); SASSERT(is_external(lit.var()));
m_assumption_set.insert(lit); m_assumption_set.insert(lit);
TRACE("sat", tout << "propagate: " << lit << " " << value(lit) << "\n";); TRACE("sat", tout << "propagate: " << lit << " " << value(lit) << "\n";);
SASSERT(m_scope_lvl == 1);
switch(value(lit)) { switch(value(lit)) {
case l_undef: case l_undef:
m_assumptions.push_back(lit); m_assumptions.push_back(lit);
assign(lit, justification()); assign(lit, justification());
propagate(false);
if (inconsistent()) {
resolve_weighted();
pop(1);
push();
for (unsigned j = 0; j < m_assumptions.size(); ++j) {
assign(m_assumptions[j], justification());
}
propagate(false);
goto post_process_false;
}
break; break;
case l_false: { case l_false: {
m_assumptions.push_back(lit); 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); resolve_weighted();
flet<bool> _min2(m_config.m_minimize_core_partial, false); goto post_process_false;
m_conflict_lvl = 1;
resolve_conflict_for_unsat_core();
m_assumptions.pop_back();
weight += weights[i];
blocker.push_back(lit);
TRACE("sat", tout << "core: " << m_core << "\nassumptions: " << m_assumptions << "\n";);
SASSERT(m_core.size() <= m_assumptions.size() + 1);
SASSERT(m_assumptions.size() <= i);
if (m_core.size() <= 3 || m_core.size() < blocker.size()) {
TRACE("opt", tout << "found small core: " << m_core.size() << "\n";);
return true;
}
m_inconsistent = false;
if (weight >= max_weight) {
++m_stats.m_blocked_corr_sets;
TRACE("opt", tout << "blocking soft correction set: " << blocker.size() << "\n";);
// block the current correction set candidate.
return false;
}
break;
} }
case l_true: case l_true:
break; break;
} }
propagate(false); continue;
post_process_false:
weight += weights[i];
blocker.push_back(lit);
TRACE("sat", tout << "core: " << m_core << "\nassumptions: " << m_assumptions << "\n";);
SASSERT(m_core.size() <= m_assumptions.size() + 1);
SASSERT(m_assumptions.size() <= i);
if (m_core.size() <= 3) {
m_inconsistent = true;
TRACE("opt", tout << "found small core: " << m_core << "\n";);
return true;
}
m_inconsistent = false;
if (weight >= max_weight) {
++m_stats.m_blocked_corr_sets;
TRACE("opt", tout << "blocking soft correction set: " << blocker.size() << "\n";);
// block the current correction set candidate.
return false;
}
} }
TRACE("sat", tout << "initialized\n";);
return true; return true;
} }

1
src/sat/sat_solver.h
View file

@ -298,6 +298,7 @@ namespace sat {
void init_search(); void init_search();
void init_assumptions(unsigned num_lits, literal const* lits, double const* weights, double max_weight); void init_assumptions(unsigned num_lits, literal const* lits, double const* weights, double max_weight);
bool init_weighted_assumptions(unsigned num_lits, literal const* lits, double const* weights, double max_weight, svector<literal>& blocker); bool init_weighted_assumptions(unsigned num_lits, literal const* lits, double const* weights, double max_weight, svector<literal>& blocker);
void resolve_weighted();
void reinit_assumptions(); void reinit_assumptions();
bool tracking_assumptions() const; bool tracking_assumptions() const;
bool is_assumption(literal l) const; bool is_assumption(literal l) const;