mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

fix #1647

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-05-25 07:38:30 -07:00
parent da32997f93
commit 7145a9ac41
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/opt/opt_context.cpp
View file

@ -499,7 +499,7 @@ namespace opt {
case O_MINIMIZE: case O_MINIMIZE:
is_ge = !is_ge; is_ge = !is_ge;
case O_MAXIMIZE: case O_MAXIMIZE:
if (mdl->eval(obj.m_term, val) && is_numeral(val, k)) { if (mdl->eval(obj.m_term, val, true) && is_numeral(val, k)) {
if (is_ge) { if (is_ge) {
result = mk_ge(obj.m_term, val); result = mk_ge(obj.m_term, val);
} }
@ -519,7 +519,7 @@ namespace opt {
for (unsigned i = 0; i < sz; ++i) { for (unsigned i = 0; i < sz; ++i) {
terms.push_back(obj.m_terms[i]); terms.push_back(obj.m_terms[i]);
coeffs.push_back(obj.m_weights[i]); coeffs.push_back(obj.m_weights[i]);
if (mdl->eval(obj.m_terms[i], val) && m.is_true(val)) { if (mdl->eval(obj.m_terms[i], val, true) && m.is_true(val)) {
k += obj.m_weights[i]; k += obj.m_weights[i];
} }
} }
@ -1046,7 +1046,7 @@ namespace opt {
model_ref mdl = md->copy(); model_ref mdl = md->copy();
fix_model(mdl); fix_model(mdl);
if (!mdl->eval(term, val)) { if (!mdl->eval(term, val, true)) {
TRACE("opt", tout << "Term does not evaluate " << term << "\n";); TRACE("opt", tout << "Term does not evaluate " << term << "\n";);
return false; return false;
} }