mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Code Activity

improving drat output perf

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-02-01 09:16:46 -08:00
parent 1e90be62bc
commit 7fa9768c36
4 changed files with 50 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/opt/opt_context.cpp
View file

@ -48,6 +48,7 @@ Notes:
namespace opt {
void context::scoped_state::push() {
m_asms_lim.push_back(m_asms.size());
m_hard_lim.push_back(m_hard.size());
m_objectives_lim.push_back(m_objectives.size());
m_objectives_term_trail_lim.push_back(m_objectives_term_trail.size());
@ -55,6 +56,7 @@ namespace opt {
void context::scoped_state::pop() {
m_hard.resize(m_hard_lim.back());
m_asms.resize(m_asms_lim.back());
unsigned k = m_objectives_term_trail_lim.back();
while (m_objectives_term_trail.size() > k) {
unsigned idx = m_objectives_term_trail.back();
@ -73,6 +75,7 @@ namespace opt {
}
m_objectives_lim.pop_back();
m_hard_lim.pop_back();
m_asms_lim.pop_back();
}
void context::scoped_state::add(expr* hard) {
@ -188,6 +191,12 @@ namespace opt {
clear_state();
}
void context::add_hard_constraint(expr* f, expr* t) {
m_scoped_state.m_asms.push_back(t);
m_scoped_state.add(m.mk_implies(t, f));
clear_state();
}
void context::get_hard_constraints(expr_ref_vector& hard) {
hard.append(m_scoped_state.m_hard);
}
@ -253,7 +262,7 @@ namespace opt {
m_hard_constraints.append(s.m_hard);
}
lbool context::optimize(expr_ref_vector const& asms) {
lbool context::optimize(expr_ref_vector const& _asms) {
if (m_pareto) {
return execute_pareto();
}
@ -263,6 +272,8 @@ namespace opt {
clear_state();
init_solver();
import_scoped_state();
expr_ref_vector asms(_asms);
asms.append(m_scoped_state.m_asms);
normalize(asms);
if (m_hard_constraints.size() == 1 && m.is_false(m_hard_constraints.get(0))) {
return l_false;

8
src/opt/opt_context.h
View file

@ -115,20 +115,23 @@ namespace opt {
arith_util m_arith;
bv_util m_bv;
unsigned_vector m_hard_lim;
unsigned_vector m_asms_lim;
unsigned_vector m_objectives_lim;
unsigned_vector m_objectives_term_trail;
unsigned_vector m_objectives_term_trail_lim;
map_id m_indices;
public:
expr_ref_vector m_hard;
expr_ref_vector m_hard;
expr_ref_vector m_asms;
vector<objective> m_objectives;
scoped_state(ast_manager& m):
m(m),
m_arith(m),
m_bv(m),
m_hard(m)
m_hard(m),
m_asms(m)
{}
void push();
void pop();
@ -180,6 +183,7 @@ namespace opt {
unsigned add_soft_constraint(expr* f, rational const& w, symbol const& id);
unsigned add_objective(app* t, bool is_max);
void add_hard_constraint(expr* f);
void add_hard_constraint(expr* f, expr* t);
void get_hard_constraints(expr_ref_vector& hard);
expr_ref get_objective(unsigned i);