mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 17:44:08 +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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/mk_api_doc.py
View file

@ -272,7 +272,6 @@ try:
cleanup_API(doc_path('../src/api/z3_rcf.h'), temp_path('z3_rcf.h')) cleanup_API(doc_path('../src/api/z3_rcf.h'), temp_path('z3_rcf.h'))
cleanup_API(doc_path('../src/api/z3_fixedpoint.h'), temp_path('z3_fixedpoint.h')) cleanup_API(doc_path('../src/api/z3_fixedpoint.h'), temp_path('z3_fixedpoint.h'))
cleanup_API(doc_path('../src/api/z3_optimization.h'), temp_path('z3_optimization.h')) cleanup_API(doc_path('../src/api/z3_optimization.h'), temp_path('z3_optimization.h'))
cleanup_API(doc_path('../src/api/z3_interp.h'), temp_path('z3_interp.h'))
cleanup_API(doc_path('../src/api/z3_fpa.h'), temp_path('z3_fpa.h')) cleanup_API(doc_path('../src/api/z3_fpa.h'), temp_path('z3_fpa.h'))
print("Removed annotations from z3_api.h.") print("Removed annotations from z3_api.h.")

9
src/opt/opt_context.cpp
View file

@ -497,7 +497,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);
} }
@ -517,9 +517,12 @@ 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];
} }
else {
TRACE("opt", tout << val << "\n";);
}
} }
if (is_ge) { if (is_ge) {
result = pb.mk_ge(sz, coeffs.c_ptr(), terms.c_ptr(), k); result = pb.mk_ge(sz, coeffs.c_ptr(), terms.c_ptr(), k);
@ -1044,7 +1047,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;
} }

7
src/opt/opt_pareto.cpp
View file

@ -20,6 +20,7 @@ Notes:
#include "opt/opt_pareto.h" #include "opt/opt_pareto.h"
#include "ast/ast_pp.h" #include "ast/ast_pp.h"
#include "ast/ast_util.h"
#include "model/model_smt2_pp.h" #include "model/model_smt2_pp.h"
namespace opt { namespace opt {
@ -66,8 +67,8 @@ namespace opt {
fmls.push_back(cb.mk_ge(i, m_model)); fmls.push_back(cb.mk_ge(i, m_model));
gt.push_back(cb.mk_gt(i, m_model)); gt.push_back(cb.mk_gt(i, m_model));
} }
fmls.push_back(m.mk_or(gt.size(), gt.c_ptr())); fmls.push_back(mk_or(gt));
fml = m.mk_and(fmls.size(), fmls.c_ptr()); fml = mk_and(fmls);
IF_VERBOSE(10, verbose_stream() << "dominates: " << fml << "\n";); IF_VERBOSE(10, verbose_stream() << "dominates: " << fml << "\n";);
TRACE("opt", tout << fml << "\n"; model_smt2_pp(tout, m, *m_model, 0);); TRACE("opt", tout << fml << "\n"; model_smt2_pp(tout, m, *m_model, 0););
m_solver->assert_expr(fml); m_solver->assert_expr(fml);
@ -80,7 +81,7 @@ namespace opt {
for (unsigned i = 0; i < sz; ++i) { for (unsigned i = 0; i < sz; ++i) {
le.push_back(cb.mk_le(i, m_model)); le.push_back(cb.mk_le(i, m_model));
} }
fml = m.mk_not(m.mk_and(le.size(), le.c_ptr())); fml = m.mk_not(mk_and(le));
IF_VERBOSE(10, verbose_stream() << "not dominated by: " << fml << "\n";); IF_VERBOSE(10, verbose_stream() << "not dominated by: " << fml << "\n";);
TRACE("opt", tout << fml << "\n";); TRACE("opt", tout << fml << "\n";);
m_solver->assert_expr(fml); m_solver->assert_expr(fml);

2
src/smt/theory_pb.cpp
View file

@ -2007,7 +2007,7 @@ namespace smt {
if (m_bound > static_cast<int>(m_active_vars.size())) { if (m_bound > static_cast<int>(m_active_vars.size())) {
return; return;
} }
if (m_bound == m_active_vars.size()) { if (m_bound == static_cast<int>(m_active_vars.size())) {
return; return;
} }