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

remove interp from documentation

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-05-25 07:33:43 -07:00
parent 6b700f1f5f
commit 8eeaa27cf3
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/opt/opt_context.cpp
View file

@ -497,7 +497,7 @@ namespace opt {
case O_MINIMIZE:
is_ge = !is_ge;
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) {
result = mk_ge(obj.m_term, val);
}
@ -517,9 +517,12 @@ namespace opt {
for (unsigned i = 0; i < sz; ++i) {
terms.push_back(obj.m_terms[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];
}
else {
TRACE("opt", tout << val << "\n";);
}
}
if (is_ge) {
result = pb.mk_ge(sz, coeffs.c_ptr(), terms.c_ptr(), k);
@ -1044,7 +1047,7 @@ namespace opt {
model_ref mdl = md->copy();
fix_model(mdl);
if (!mdl->eval(term, val)) {
if (!mdl->eval(term, val, true)) {
TRACE("opt", tout << "Term does not evaluate " << term << "\n";);
return false;
}