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

update to retain original behavior

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-05-02 19:30:54 -07:00
parent 561a4331a8
commit eeb79e1c3c
2 changed files with 3 additions and 3 deletions

View file

@ -406,7 +406,7 @@ namespace opt {
if (r == l_true && !get_lower_as_num(i).is_finite()) { if (r == l_true && !get_lower_as_num(i).is_finite()) {
return r; return r;
} }
if (r == l_true && i + 1 < m_objectives.size()) { if (r == l_true && i + 1 < m_objectives.size() && get_lower_as_num(i).is_finite()) {
update_lower(); update_lower();
} }
} }

View file

@ -252,12 +252,12 @@ static void cnf_backbones(bool use_chunk, char const* file_name) {
vector<sat::literal_vector> tracking_clauses; vector<sat::literal_vector> tracking_clauses;
track_clauses(solver, solver2, assumptions, tracking_clauses); track_clauses(solver, solver2, assumptions, tracking_clauses);
} }
// remove this line to limit variables to exclude assumptions
num_vars = g_solver->num_vars();
for (unsigned i = 1; i < num_vars; ++i) { for (unsigned i = 1; i < num_vars; ++i) {
vars.push_back(i); vars.push_back(i);
g_solver->set_external(i); g_solver->set_external(i);
} }
num_vars = g_solver->num_vars();
lbool r; lbool r;
if (use_chunk) { if (use_chunk) {
r = core_chunking(*g_solver, vars, assumptions, conseq, 100); r = core_chunking(*g_solver, vars, assumptions, conseq, 100);