mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Code Activity

tracking use of assumptions in tactics

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-03-09 21:33:08 -08:00
parent 71fff8ffa2
commit 3d7eb12117
5 changed files with 76 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/solver/combined_solver.cpp
View file

@ -194,7 +194,7 @@ public:
m_use_solver1_results = false;
if (get_num_assumptions() != 0 ||
num_assumptions > 0 || // assumptions were provided
num_assumptions > 0 || // assumptions were provided
m_ignore_solver1) {
// must use incremental solver
switch_inc_mode();

24
src/solver/solver_na2as.cpp
View file

@ -23,12 +23,11 @@ Notes:
#include"ast_smt2_pp.h"
solver_na2as::solver_na2as(ast_manager & m):
m_manager(m) {
m(m),
m_assumptions(m) {
}
solver_na2as::~solver_na2as() {
restore_assumptions(0);
}
solver_na2as::~solver_na2as() {}
void solver_na2as::assert_expr(expr * t, expr * a) {
if (a == 0) {
@ -36,20 +35,19 @@ void solver_na2as::assert_expr(expr * t, expr * a) {
}
else {
SASSERT(is_uninterp_const(a));
SASSERT(m_manager.is_bool(a));
TRACE("solver_na2as", tout << "asserting\n" << mk_ismt2_pp(t, m_manager) << "\n" << mk_ismt2_pp(a, m_manager) << "\n";);
m_manager.inc_ref(a);
SASSERT(m.is_bool(a));
TRACE("solver_na2as", tout << "asserting\n" << mk_ismt2_pp(t, m) << "\n" << mk_ismt2_pp(a, m) << "\n";);
m_assumptions.push_back(a);
expr_ref new_t(m_manager);
new_t = m_manager.mk_implies(a, t);
expr_ref new_t(m);
new_t = m.mk_implies(a, t);
assert_expr(new_t);
}
}
struct append_assumptions {
ptr_vector<expr> & m_assumptions;
expr_ref_vector & m_assumptions;
unsigned m_old_sz;
append_assumptions(ptr_vector<expr> & _m_assumptions,
append_assumptions(expr_ref_vector & _m_assumptions,
unsigned num_assumptions,
expr * const * assumptions):
m_assumptions(_m_assumptions) {
@ -82,10 +80,6 @@ void solver_na2as::pop(unsigned n) {
}
void solver_na2as::restore_assumptions(unsigned old_sz) {
// SASSERT(old_sz == 0);
for (unsigned i = old_sz; i < m_assumptions.size(); i++) {
m_manager.dec_ref(m_assumptions[i]);
}
m_assumptions.shrink(old_sz);
}

4
src/solver/solver_na2as.h
View file

@ -25,8 +25,8 @@ Notes:
#include"solver.h"
class solver_na2as : public solver {
ast_manager & m_manager;
ptr_vector<expr> m_assumptions;
ast_manager & m;
expr_ref_vector m_assumptions;
unsigned_vector m_scopes;
void restore_assumptions(unsigned old_sz);
public: