mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

A few changes based on previous reviews

Browse source 
Tested the optimization procedure with:
- unbounded objectives
- bounded with rational solutions
- bounded with irrational solutions
This commit is contained in:
Anh-Dung Phan 2013-10-21 17:25:34 -07:00
parent 3dd72f8f16
commit 3441fc2942
8 changed files with 24 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/smt/theory_arith.h
View file

@ -994,7 +994,7 @@ namespace smt {
// -----------------------------------
virtual bool maximize(theory_var v) { return max_min(v, true); }
virtual theory_var add_objective(app* term);
virtual inf_eps_rational<rational> get_objective_value(theory_var v);
virtual inf_eps_rational<inf_rational> get_objective_value(theory_var v);
inf_rational m_objective;
// -----------------------------------

5
src/smt/theory_arith_aux.h
View file

@ -961,9 +961,8 @@ namespace smt {
}
template<typename Ext>
inf_eps_rational<rational> theory_arith<Ext>::get_objective_value(theory_var v) {
inf_eps_rational<rational> val;
val = m_objective.get_rational();
inf_eps_rational<inf_rational> theory_arith<Ext>::get_objective_value(theory_var v) {
inf_eps_rational<inf_rational> val(m_objective);
return val;
}

5
src/smt/theory_opt.h
View file

@ -18,6 +18,7 @@ Notes:
--*/
#include "inf_rational.h"
#include "inf_eps_rational.h"
#ifndef _THEORY_OPT_H_
@ -28,9 +29,9 @@ namespace smt {
public:
virtual bool maximize(theory_var v) { UNREACHABLE(); return false; };
virtual theory_var add_objective(app* term) { UNREACHABLE(); return null_theory_var; }
virtual inf_eps_rational<rational> get_objective_value(theory_var v) {
virtual inf_eps_rational<inf_rational> get_objective_value(theory_var v) {
UNREACHABLE();
inf_eps_rational<rational> r(rational(1), rational(0));
inf_eps_rational<inf_rational> r(rational(1), inf_rational(0));
return r;
}
};