3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-23 19:47:52 +00:00

push blocking code to optimizer context

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-10-29 20:26:54 -07:00
parent b0fddd8e60
commit bc44bcad10
11 changed files with 152 additions and 49 deletions

View file

@ -33,17 +33,19 @@ Notes:
namespace opt {
typedef inf_eps_rational<inf_rational> inf_eps;
class opt_solver : public solver_na2as {
public:
typedef inf_eps_rational<inf_rational> inf_value;
private:
smt_params m_params;
smt::kernel m_context;
ast_manager& m;
progress_callback * m_callback;
symbol m_logic;
bool m_objective_enabled;
svector<smt::theory_var> m_objective_vars;
vector<inf_value> m_objective_values;
vector<inf_eps> m_objective_values;
public:
opt_solver(ast_manager & m, params_ref const & p, symbol const & l);
virtual ~opt_solver();
@ -69,7 +71,8 @@ namespace opt {
smt::theory_var add_objective(app* term);
void reset_objectives();
vector<inf_value> const& get_objective_values();
vector<inf_eps> const& get_objective_values();
expr_ref block_lower_bound(unsigned obj_index, inf_eps const& val);
class toggle_objective {
opt_solver& s;