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

re-organize proof and model converters to be associated with goals instead of external

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-11-18 16:33:54 -08:00
parent 00f5308a0e
commit 4bbece6616
118 changed files with 617 additions and 1070 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/opt/opt_context.cpp
View file

@ -324,10 +324,8 @@ namespace opt {
void context::fix_model(model_ref& mdl) {
if (mdl) {
if (m_model_converter) {
(*m_model_converter)(mdl, 0);
}
m_fm(mdl, 0);
apply(m_model_converter, mdl);
m_fm(mdl);
}
}
@ -749,9 +747,10 @@ namespace opt {
}
expr_dependency_ref core(m);
goal_ref_buffer result;
(*m_simplify)(g, result, m_model_converter, core);
(*m_simplify)(g, result, core);
SASSERT(result.size() == 1);
goal* r = result[0];
m_model_converter = r->mc();
fmls.reset();
expr_ref tmp(m);
for (unsigned i = 0; i < r->size(); ++i) {