mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-05 21:53:23 +00:00
Code Activity

fix regression on push/pop

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-09-01 14:37:58 -07:00
parent 89f0319043
commit 75c114feab
3 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/opt/maxsmt.cpp
View file

@ -136,6 +136,7 @@ namespace opt {
m_wth = s.ensure_wmax_theory(); m_wth = s.ensure_wmax_theory();
} }
maxsmt_solver_base::scoped_ensure_theory::~scoped_ensure_theory() { maxsmt_solver_base::scoped_ensure_theory::~scoped_ensure_theory() {
//m_wth->reset_local();
} }
smt::theory_wmaxsat& maxsmt_solver_base::scoped_ensure_theory::operator()() { return *m_wth; } smt::theory_wmaxsat& maxsmt_solver_base::scoped_ensure_theory::operator()() { return *m_wth; }

2
src/opt/opt_context.cpp
View file

@ -143,11 +143,9 @@ namespace opt {
void context::push() { void context::push() {
m_scoped_state.push(); m_scoped_state.push();
m_solver->push();
} }
void context::pop(unsigned n) { void context::pop(unsigned n) {
m_solver->pop(n);
for (unsigned i = 0; i < n; ++i) { for (unsigned i = 0; i < n; ++i) {
m_scoped_state.pop(); m_scoped_state.pop();
} }

2
src/smt/theory_arith_core.h
View file

@ -869,7 +869,7 @@ namespace smt {
atom_kind kind1 = a1->get_atom_kind(); atom_kind kind1 = a1->get_atom_kind();
atom_kind kind2 = a2->get_atom_kind(); atom_kind kind2 = a2->get_atom_kind();
bool v_is_int = is_int(v); bool v_is_int = is_int(v);
SASSERT(v === a2->get_var()); SASSERT(v == a2->get_var());
SASSERT(k1 != k2 || kind1 != kind2); SASSERT(k1 != k2 || kind1 != kind2);
parameter coeffs[3] = { parameter(symbol("farkas")), parameter coeffs[3] = { parameter(symbol("farkas")),
parameter(rational(1)), parameter(rational(1)) }; parameter(rational(1)), parameter(rational(1)) };