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

fix #3294

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-03-14 10:46:03 -07:00
parent b29c77dc87
commit 51e459d02b
55 changed files with 27 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/tactic/arith/card2bv_tactic.cpp
View file

@ -54,7 +54,6 @@ public:
void operator()(goal_ref const & g,
goal_ref_buffer & result) override {
TRACE("card2bv-before", g->display(tout););
SASSERT(g->is_well_sorted());
result.reset();
tactic_report report("card2bv", *g);
th_rewriter rw1(m, m_params);
@ -92,8 +91,6 @@ public:
g->inc_depth();
result.push_back(g.get());
TRACE("card2bv", g->display(tout););
SASSERT(g->is_well_sorted());
}
void cleanup() override {

2
src/tactic/arith/degree_shift_tactic.cpp
View file

@ -222,7 +222,6 @@ class degree_shift_tactic : public tactic {
void operator()(goal_ref const & g,
goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
m_produce_proofs = g->proofs_enabled();
m_produce_models = g->models_enabled();
tactic_report report("degree_shift", *g);
@ -268,7 +267,6 @@ class degree_shift_tactic : public tactic {
g->add(mc.get());
result.push_back(g.get());
TRACE("degree_shift", g->display(tout); if (mc) mc->display(tout););
SASSERT(g->is_well_sorted());
}
};

3
src/tactic/arith/diff_neq_tactic.cpp
View file

@ -314,7 +314,6 @@ class diff_neq_tactic : public tactic {
void operator()(goal_ref const & g,
goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
m_produce_models = g->models_enabled();
result.reset();
tactic_report report("diff-neq", *g);
@ -339,8 +338,6 @@ class diff_neq_tactic : public tactic {
}
g->inc_depth();
result.push_back(g.get());
TRACE("diff_neq", g->display(tout););
SASSERT(g->is_well_sorted());
}
};

3
src/tactic/arith/eq2bv_tactic.cpp
View file

@ -151,7 +151,6 @@ public:
}
void operator()(goal_ref const & g, goal_ref_buffer & result) override {
SASSERT(g->is_well_sorted());
m_trail.reset();
m_fd.reset();
m_max.reset();
@ -209,8 +208,6 @@ public:
g->inc_depth();
g->add(mc1.get());
result.push_back(g.get());
TRACE("pb", g->display(tout););
SASSERT(g->is_well_sorted());
}

3
src/tactic/arith/factor_tactic.cpp
View file

@ -258,7 +258,6 @@ class factor_tactic : public tactic {
void operator()(goal_ref const & g,
goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
tactic_report report("factor", *g);
bool produce_proofs = g->proofs_enabled();
@ -276,8 +275,6 @@ class factor_tactic : public tactic {
}
g->inc_depth();
result.push_back(g.get());
TRACE("factor", g->display(tout););
SASSERT(g->is_well_sorted());
}
};

3
src/tactic/arith/fix_dl_var_tactic.cpp
View file

@ -248,7 +248,6 @@ class fix_dl_var_tactic : public tactic {
void operator()(goal_ref const & g,
goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
tactic_report report("fix-dl-var", *g);
bool produce_proofs = g->proofs_enabled();
m_produce_models = g->models_enabled();
@ -284,8 +283,6 @@ class fix_dl_var_tactic : public tactic {
g->inc_depth();
}
result.push_back(g.get());
TRACE("fix_dl_var", g->display(tout););
SASSERT(g->is_well_sorted());
}
};

2
src/tactic/arith/fm_tactic.cpp
View file

@ -1550,7 +1550,6 @@ class fm_tactic : public tactic {
void operator()(goal_ref const & g,
goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
tactic_report report("fm", *g);
fail_if_proof_generation("fm", g);
m_produce_models = g->models_enabled();
@ -1604,7 +1603,6 @@ class fm_tactic : public tactic {
reset_constraints();
result.push_back(m_new_goal.get());
TRACE("fm", m_new_goal->display(tout););
SASSERT(m_new_goal->is_well_sorted());
}
void display_constraints(std::ostream & out, constraints const & cs) const {

4
src/tactic/arith/lia2card_tactic.cpp
View file

@ -170,13 +170,11 @@ public:
}
void operator()(goal_ref const & g, goal_ref_buffer & result) override {
SASSERT(g->is_well_sorted());
m_bounds.reset();
m_mc.reset();
expr_ref_vector axioms(m);
expr_safe_replace rep(m);
TRACE("pb", g->display(tout););
tactic_report report("lia2card", *g);
bound_manager bounds(m);
@ -218,8 +216,6 @@ public:
if (m_mc) g->add(m_mc.get());
g->inc_depth();
result.push_back(g.get());
TRACE("pb", g->display(tout););
SASSERT(g->is_well_sorted());
m_bounds.reset();
}

3
src/tactic/arith/lia2pb_tactic.cpp
View file

@ -185,7 +185,6 @@ class lia2pb_tactic : public tactic {
void operator()(goal_ref const & g,
goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
fail_if_proof_generation("lia2pb", g);
m_produce_models = g->models_enabled();
m_produce_unsat_cores = g->unsat_core_enabled();
@ -287,8 +286,6 @@ class lia2pb_tactic : public tactic {
g->inc_depth();
g->add(gmc.get());
result.push_back(g.get());
TRACE("lia2pb", g->display(tout););
SASSERT(g->is_well_sorted());
}
};

2
src/tactic/arith/nla2bv_tactic.cpp
View file

@ -456,7 +456,6 @@ public:
*/
void operator()(goal_ref const & g,
goal_ref_buffer & result) override {
SASSERT(g->is_well_sorted());
fail_if_proof_generation("nla2bv", g);
fail_if_unsat_core_generation("nla2bv", g);
result.reset();
@ -467,7 +466,6 @@ public:
proc(*(g.get()), mc);
g->add(mc.get());
result.push_back(g.get());
SASSERT(g->is_well_sorted());
}
void cleanup() override {

3
src/tactic/arith/pb2bv_tactic.cpp
View file

@ -885,7 +885,6 @@ private:
void operator()(goal_ref const & g,
goal_ref_buffer & result) {
TRACE("pb2bv", g->display(tout););
SASSERT(g->is_well_sorted());
fail_if_proof_generation("pb2bv", g);
m_produce_models = g->models_enabled();
m_produce_unsat_cores = g->unsat_core_enabled();
@ -958,8 +957,6 @@ private:
g->inc_depth();
result.push_back(g.get());
TRACE("pb2bv", g->display(tout););
SASSERT(g->is_well_sorted());
}
void throw_tactic(expr* e) {

3
src/tactic/arith/propagate_ineqs_tactic.cpp
View file

@ -528,14 +528,13 @@ void propagate_ineqs_tactic::updt_params(params_ref const & p) {
void propagate_ineqs_tactic::operator()(goal_ref const & g,
goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
fail_if_proof_generation("propagate-ineqs", g);
fail_if_unsat_core_generation("propagate-ineqs", g);
result.reset();
goal_ref r;
(*m_imp)(g.get(), r);
result.push_back(r.get());
SASSERT(r->is_well_sorted());
SASSERT(r->is_well_formed());
}

3
src/tactic/arith/purify_arith_tactic.cpp
View file

@ -910,7 +910,6 @@ public:
void operator()(goal_ref const & g,
goal_ref_buffer & result) override {
try {
SASSERT(g->is_well_sorted());
tactic_report report("purify-arith", *g);
TRACE("goal", g->display(tout););
bool produce_proofs = g->proofs_enabled();
@ -924,8 +923,6 @@ public:
g->add(mc.get());
g->inc_depth();
result.push_back(g.get());
TRACE("goal", g->display(tout););
SASSERT(g->is_well_sorted());
}
catch (rewriter_exception & ex) {
throw tactic_exception(ex.msg());

3
src/tactic/arith/recover_01_tactic.cpp
View file

@ -293,7 +293,6 @@ class recover_01_tactic : public tactic {
void operator()(goal_ref const & g,
goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
fail_if_proof_generation("recover-01", g);
fail_if_unsat_core_generation("recover-01", g);
m_produce_models = g->models_enabled();
@ -365,7 +364,7 @@ class recover_01_tactic : public tactic {
}
result.push_back(new_goal.get());
TRACE("recover_01", new_goal->display(tout););
SASSERT(new_goal->is_well_sorted());
SASSERT(new_goal->is_well_formed());
}
~imp() {