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

address compiler warnings, and user question #6544

Browse source
This commit is contained in:
Nikolaj Bjorner 2023-01-19 19:02:43 -08:00
parent 523a3f34b0
commit d11e5c8ca6
16 changed files with 11 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tactic/core/cofactor_elim_term_ite.cpp
View file

@ -438,7 +438,6 @@ struct cofactor_elim_term_ite::imp {
if (m_cache.find(s, t))
return true;
unsigned step = 0;
TRACE("cofactor_ite", tout << "cofactor target:\n" << mk_ismt2_pp(s, m) << "\n";);
expr_ref curr(m);
curr = s;
@ -451,7 +450,6 @@ struct cofactor_elim_term_ite::imp {
t = curr.get();
return true;
}
step++;
expr_ref pos_cofactor(m);
expr_ref neg_cofactor(m);
m_cofactor.set_cofactor_atom(c);
@ -461,7 +459,7 @@ struct cofactor_elim_term_ite::imp {
m_cofactor.set_cofactor_atom(neg_c);
m_cofactor(curr, neg_cofactor);
curr = m.mk_ite(c, pos_cofactor, neg_cofactor);
TRACE("cofactor", tout << "cofactor_ite step: " << step << "\n" << mk_ismt2_pp(curr, m) << "\n";);
TRACE("cofactor", tout << "cofactor_ite step\n" << mk_ismt2_pp(curr, m) << "\n";);
}
}
return false;
@ -515,7 +513,6 @@ struct cofactor_elim_term_ite::imp {
}
void cofactor(expr * t, expr_ref & r) {
unsigned step = 0;
TRACE("cofactor", tout << "cofactor target:\n" << mk_ismt2_pp(t, m) << "\n";);
expr_ref curr(m);
curr = t;
@ -526,7 +523,6 @@ struct cofactor_elim_term_ite::imp {
r = curr.get();
return;
}
step++;
expr_ref pos_cofactor(m);
expr_ref neg_cofactor(m);
m_cofactor.set_cofactor_atom(c);
@ -548,7 +544,7 @@ struct cofactor_elim_term_ite::imp {
curr = m.mk_ite(c, pos_cofactor, neg_cofactor);
}
TRACE("cofactor",
tout << "cofactor_ite step: " << step << "\n";
tout << "cofactor_ite step\n";
tout << "cofactor: " << mk_ismt2_pp(c, m) << "\n";
tout << mk_ismt2_pp(curr, m) << "\n";);
}

20
src/tactic/fd_solver/smtfd_solver.cpp
View file

@ -1040,11 +1040,6 @@ namespace smtfd {
// A[j] = w: i = j or T[j] = A[j]
//
void reconcile_stores(app* t, expr* vT, table& tT, expr* vA, table& tA) {
unsigned r = 0;
//if (get_lambda(vA) <= 1) {
// return;
//}
//std::cout << get_lambda(vA) << " " << get_lambda(vT) << "\n";
inc_lambda(vT);
for (auto& fA : tA) {
f_app fT;
@ -1056,23 +1051,8 @@ namespace smtfd {
}
if (!tT.find(fA, fT) || (value_of(fA) != value_of(fT) && !eq(m_vargs, fA))) {
add_select_store_axiom(t, fA);
++r;
}
}
#if 0
// only up-propagation really needed.
for (auto& fT : tT) {
f_app fA;
if (m_context.at_max()) {
break;
}
if (!tA.find(fT, fA) && t->get_sort() == m.get_sort(fT.m_t->get_arg(0))) {
TRACE("smtfd", tout << "not found\n";);
add_select_store_axiom(t, fT);
++r;
}
}
#endif
}
void add_select_store_axiom(app* t, f_app& f) {

2
src/tactic/smtlogics/qfnia_tactic.cpp
View file

@ -95,8 +95,6 @@ static tactic * mk_qfnia_sat_solver(ast_manager & m, params_ref const & p) {
}
static tactic * mk_qfnia_nlsat_solver(ast_manager & m, params_ref const & p) {
params_ref nia2sat_p = p;
nia2sat_p.set_uint("nla2bv_max_bv_size", 64);
params_ref simp_p = p;
simp_p.set_bool("som", true); // expand into sums of monomials
simp_p.set_bool("factor", false);