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

integrating diff opt

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-03-05 16:29:26 -08:00
parent 80ba830091
commit 99b4ce037d
10 changed files with 67 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/smt/theory_arith.h
View file

@ -998,9 +998,8 @@ namespace smt {
// Optimization
//
// -----------------------------------
virtual inf_eps_rational<inf_rational> maximize(theory_var v);
virtual inf_eps_rational<inf_rational> maximize(theory_var v, expr_ref& blocker);
virtual theory_var add_objective(app* term);
virtual expr* mk_gt(theory_var v, inf_rational const& val);
virtual expr* mk_ge(filter_model_converter& fm, theory_var v, inf_numeral const& val);
void enable_record_conflict(expr* bound);
void record_conflict(unsigned num_lits, literal const * lits,
@ -1008,6 +1007,8 @@ namespace smt {
unsigned num_params, parameter* params);
inf_eps_rational<inf_rational> conflict_minimize();
private:
virtual expr_ref mk_gt(theory_var v);
bool_var m_bound_watch;
inf_eps_rational<inf_rational> m_upper_bound;
bool get_theory_vars(expr * n, uint_set & vars);