mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-27 08:28:44 +00:00
Code Activity

use expression structure for objectives instead of custom s-expression

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-12-02 13:00:51 -08:00
parent a016caa5d8
commit 191efbb72f
6 changed files with 251 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/opt/opt_context.h
View file

@ -29,7 +29,7 @@ Notes:
#include "opt_solver.h"
#include "optsmt.h"
#include "maxsmt.h"
#include "objective_ast.h"
#include "objective_decl_plugin.h"
namespace opt {
@ -45,6 +45,7 @@ namespace opt {
map_t m_maxsmts;
expr_ref_vector m_objs;
svector<bool> m_ismaxs;
objective_util m_obj_util;
public:
context(ast_manager& m);
~context();
@ -52,17 +53,17 @@ namespace opt {
void add_objective(app* t, bool is_max) { m_objs.push_back(t); m_ismaxs.push_back(is_max); }
void add_hard_constraint(expr* f) { m_hard_constraints.push_back(f); }
lbool execute(objective & obj, bool committed);
lbool execute_min_max(min_max_objective & obj, bool committed);
lbool execute_maxsat(maxsat_objective & obj, bool committed);
lbool execute_lex(compound_objective & obj);
lbool execute_box(compound_objective & obj);
lbool execute_pareto(compound_objective & obj);
lbool execute(expr* obj, bool committed);
lbool execute_min_max(app* obj, bool committed);
lbool execute_maxsat(app* obj, bool committed);
lbool execute_lex(app* obj);
lbool execute_box(app* obj);
lbool execute_pareto(app* obj);
void push();
void pop(unsigned sz);
lbool optimize(objective & objective);
lbool optimize(expr* objective);
lbool optimize();
void set_cancel(bool f);