mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 03:45:51 +00:00
Code Activity

add tuple features, remove dead code from mbp

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-05-22 08:31:19 -07:00 • committed by Arie Gurfinkel
parent 560a26127e
commit 5eacb8122d
2 changed files with 94 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/qe/qe_mbp.cpp
View file

@ -578,7 +578,7 @@ public:
qe_lite qe(m, m_params, false);
qe (vars, fml);
m_rw (fml);
TRACE ("qe", tout << "After qe_lite:\n" << fml << "\n" << "Vars:\n" << vars;);
TRACE ("qe", tout << "After qe_lite:\n" << fml << "\n" << "Vars: " << vars << "\n";);
SASSERT (!m.is_false (fml));
}
@ -590,7 +590,7 @@ public:
}
void spacer(app_ref_vector& vars, model& mdl, expr_ref& fml) {
TRACE ("qe", tout << "Before projection:\n" << fml << "\n" << "Vars:\n" << vars;);
TRACE ("qe", tout << "Before projection:\n" << fml << "\n" << "Vars: " << vars << "\n";);
model_evaluator eval(mdl, m_params);
eval.set_model_completion(true);
@ -620,7 +620,7 @@ public:
}
}
TRACE ("qe", tout << "Array vars:\n" << array_vars;);
TRACE ("qe", tout << "Array vars: " << array_vars << "\n";);
vars.reset ();
@ -636,14 +636,16 @@ public:
TRACE ("qe",
tout << "extended model:\n";
model_pp (tout, mdl);
tout << "Auxiliary variables of index and value sorts:\n";
tout << "Vars: ";
tout << vars << "\n";
);
}
// project reals and ints
if (!arith_vars.empty ()) {
TRACE ("qe", tout << "Arith vars: " << arith_vars << "\n";);
TRACE ("qe", tout << "Arith vars: " << arith_vars << "\n";
model_pp(tout, mdl);
);
expr_ref_vector fmls(m);
flatten_and (fml, fmls);