mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-19 19:02:02 +00:00
Code Activity

address divergence in the case of shared theory symbols. Codeplex issue 147, thanks to George Karpenkov

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-12-09 16:04:25 +01:00
commit 08cb8b8de8
74 changed files with 1280 additions and 896 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/opt/opt_solver.h
View file

@ -76,6 +76,8 @@ namespace opt {
bool m_objective_enabled;
svector<smt::theory_var> m_objective_vars;
vector<inf_eps> m_objective_values;
sort_ref_vector m_objective_sorts;
svector<bool> m_valid_objectives;
bool m_dump_benchmarks;
static unsigned m_dump_count;
statistics m_stats;
@ -109,6 +111,9 @@ namespace opt {
void maximize_objectives(expr_ref_vector& blockers);
inf_eps const & saved_objective_value(unsigned obj_index);
inf_eps current_objective_value(unsigned obj_index);
bool objective_is_model_valid(unsigned obj_index) const {
return m_valid_objectives[obj_index];
}
vector<inf_eps> const& get_objective_values();
expr_ref mk_ge(unsigned obj_index, inf_eps const& val);
@ -124,6 +129,9 @@ namespace opt {
unsigned num_assumptions, expr * const * assumptions,
char const * name = "benchmarks",
char const * logic = "", char const * status = "unknown", char const * attributes = "");
private:
void decrement_value(unsigned i, inf_eps& val);
};
}