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

fix #1699

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-06-23 21:57:10 -07:00
parent 0c32989144
commit e187023304
3 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/opt/opt_context.cpp
View file

@ -351,6 +351,7 @@ namespace opt {
void context::get_model_core(model_ref& mdl) { void context::get_model_core(model_ref& mdl) {
mdl = m_model; mdl = m_model;
fix_model(mdl); fix_model(mdl);
mdl->set_model_completion(true);
TRACE("opt", tout << *mdl;); TRACE("opt", tout << *mdl;);
} }
@ -528,7 +529,7 @@ namespace opt {
k += obj.m_weights[i]; k += obj.m_weights[i];
} }
else { else {
TRACE("opt", tout << val << "\n";); TRACE("opt", tout << (*mdl)(obj.m_terms[i]) << "\n";);
} }
} }
if (is_ge) { if (is_ge) {
@ -1539,6 +1540,7 @@ namespace opt {
expr_ref tmp(m); expr_ref tmp(m);
model_ref mdl; model_ref mdl;
get_model(mdl); get_model(mdl);
mdl->set_model_completion(true);
for (expr * f : fmls) { for (expr * f : fmls) {
if (!mdl->is_true(f)) { if (!mdl->is_true(f)) {
//IF_VERBOSE(0, m_fm->display(verbose_stream() << "fm\n")); //IF_VERBOSE(0, m_fm->display(verbose_stream() << "fm\n"));

2
src/opt/opt_pareto.cpp
View file

@ -40,6 +40,7 @@ namespace opt {
} }
m_solver->get_model(m_model); m_solver->get_model(m_model);
m_solver->get_labels(m_labels); m_solver->get_labels(m_labels);
m_model->set_model_completion(true);
IF_VERBOSE(1, IF_VERBOSE(1,
model_ref mdl(m_model); model_ref mdl(m_model);
cb.fix_model(mdl); cb.fix_model(mdl);
@ -99,6 +100,7 @@ namespace opt {
if (is_sat == l_true) { if (is_sat == l_true) {
m_solver->get_model(m_model); m_solver->get_model(m_model);
m_solver->get_labels(m_labels); m_solver->get_labels(m_labels);
m_model->set_model_completion(true);
mk_not_dominated_by(); mk_not_dominated_by();
} }
return is_sat; return is_sat;

24
src/tactic/sine_filter.cpp
View file

@ -94,10 +94,7 @@ private:
ptr_vector<func_decl> & next_consts) { ptr_vector<func_decl> & next_consts) {
TRACE("sine", TRACE("sine",
tout << "size of consts is "; tout << consts.size(); tout << "\n"; tout << "size of consts is "; tout << consts.size(); tout << "\n";
obj_hashtable<func_decl>::iterator it = consts.begin(); for (func_decl* f : consts) tout << f->get_name() << "\n";);
obj_hashtable<func_decl>::iterator end = consts.end();
for (; it != end; it++)
tout << *it << "\n"; );
bool matched = false; bool matched = false;
for (unsigned i = 0; i < q->get_num_patterns(); i++) { for (unsigned i = 0; i < q->get_num_patterns(); i++) {
@ -156,10 +153,8 @@ private:
if (!consts.contains(f)) { if (!consts.contains(f)) {
consts.insert(f); consts.insert(f);
if (const2quantifier.contains(f)) { if (const2quantifier.contains(f)) {
obj_pair_hashtable<expr, expr>::iterator it = const2quantifier[f].begin(); for (auto const& p : const2quantifier[f])
obj_pair_hashtable<expr, expr>::iterator end = const2quantifier[f].end(); stack.push_back(p);
for (; it != end; it++)
stack.push_back(*it);
const2quantifier.remove(f); const2quantifier.remove(f);
} }
} }
@ -220,15 +215,10 @@ private:
visiting = to_visit.back(); visiting = to_visit.back();
to_visit.pop_back(); to_visit.pop_back();
visited.insert(visiting); visited.insert(visiting);
obj_hashtable<func_decl>::iterator it = exp2const[visiting].begin(); for (func_decl* f : exp2const[visiting])
obj_hashtable<func_decl>::iterator end = exp2const[visiting].end(); for (expr* e : const2exp[f]) {
for (; it != end; it++) { if (!visited.contains(e))
obj_hashtable<expr>::iterator exprit = const2exp[*it].begin(); to_visit.push_back(e);
obj_hashtable<expr>::iterator exprend = const2exp[*it].end();
for (; exprit != exprend; exprit++) {
if (!visited.contains(*exprit))
to_visit.push_back(*exprit);
}
} }
} }