mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-22 16:45:31 +00:00
Code Activity

remove dead code and a fix in no_lemmas_hold

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2019-04-03 21:43:46 -07:00
parent 826d2582e2
commit ab1b2ae86d
2 changed files with 6 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -115,14 +115,15 @@ static tactic * mk_qfnia_smt_solver(ast_manager& m, params_ref const& p) {
}
tactic * mk_qfnia_tactic(ast_manager & m, params_ref const & p) {
return and_then(
mk_report_verbose_tactic("(qfnia-tactic)", 10),
mk_qfnia_premable(m, p),
// or_else(mk_qfnia_sat_solver(m, p),
// try_for(mk_qfnia_smt_solver(m, p), 2000),
// mk_qfnia_nlsat_solver(m, p),
mk_qfnia_smt_solver(m, p))
// )
;
}

24
src/util/lp/nla_solver.cpp
View file

@ -58,22 +58,6 @@ point operator+(const point& a, const point& b) {
point operator-(const point& a, const point& b) {
return point(a.x - b.x, a.y - b.y);
}
void divide_by_common_factor(unsigned_vector& a, unsigned_vector& b) {
SASSERT(lp::is_non_decreasing(a) && lp::is_non_decreasing(b));
unsigned i = 0, j = 0;
while (i < a.size() && j < b.size()){
if (a[i] == b[j]) {
a.erase(a.begin() + i);
b.erase(b.begin() + j);
} else if (a[i] < b[j]) {
i++;
} else {
j++;
}
}
}
struct solver::imp {
struct bfc {
lpvar m_x, m_y;
@ -161,10 +145,10 @@ struct solver::imp {
return compare_holds(value(t), n.cmp(), n.rs());
}
bool an_ineq_holds(const lemma& l) const {
bool lemma_holds(const lemma& l) const {
for(const ineq &i : l.ineqs()) {
if (!ineq_holds(i))
return false;
if (ineq_holds(i))
return true;
}
return false;
}
@ -3126,7 +3110,7 @@ struct solver::imp {
bool no_lemmas_hold() const {
for (auto & l : * m_lemma_vec) {
if (an_ineq_holds(l))
if (lemma_holds(l))
return false;
}
return true;