mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-03 11:25:40 +00:00
Code Activity

work on niil

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2018-08-13 20:34:52 +08:00
parent 91086baa54
commit 92b5a9b134
4 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/smt/theory_lra.cpp
View file

@ -272,20 +272,6 @@ class theory_lra::imp {
switcher(theory_lra::imp& i): m_th_imp(i), m_nra(nullptr), m_niil(nullptr) { switcher(theory_lra::imp& i): m_th_imp(i), m_nra(nullptr), m_niil(nullptr) {
} }
lbool check(lp::explanation_t& ex) {
if (m_use_niil) {
if (m_niil != nullptr) {
std::cout << "check niil\n";
return (*m_niil)->check(ex);
}
}
else {
if (m_nra != nullptr)
return (*m_nra)->check(ex);
}
return l_undef;
}
bool need_check() { bool need_check() {
if (m_use_niil) { if (m_use_niil) {
if (m_niil != nullptr) if (m_niil != nullptr)
@ -2070,6 +2056,8 @@ public:
return r; return r;
} }
niil::lemma m_lemma;
lbool check_aftermath_niil(lbool r) { lbool check_aftermath_niil(lbool r) {
return r; return r;
} }
@ -2083,7 +2071,8 @@ public:
if (!m_nra && !m_niil) return l_true; if (!m_nra && !m_niil) return l_true;
if (!m_switcher.need_check()) return l_true; if (!m_switcher.need_check()) return l_true;
m_a1 = nullptr; m_a2 = nullptr; m_a1 = nullptr; m_a2 = nullptr;
lbool r = m_switcher.check(m_explanation);
lbool r = m_nra? m_nra->check(m_explanation): m_niil->check(m_lemma);
return m_nra? check_aftermath_nra(r) : check_aftermath_niil(r); return m_nra? check_aftermath_nra(r) : check_aftermath_niil(r);
} }

6
src/util/lp/niil_solver.cpp
View file

@ -59,7 +59,7 @@ struct solver::imp {
return r == model_val; return r == model_val;
} }
lbool check(lp::explanation_t& ex) { lbool check(lemma& ) {
lp_assert(m_lar_solver.get_status() == lp::lp_status::OPTIMAL); lp_assert(m_lar_solver.get_status() == lp::lp_status::OPTIMAL);
svector<unsigned> to_refine; svector<unsigned> to_refine;
for (unsigned i = 0; i < m_monomials.size(); i++) { for (unsigned i = 0; i < m_monomials.size(); i++) {
@ -80,8 +80,8 @@ void solver::add_monomial(lp::var_index v, unsigned sz, lp::var_index const* vs)
bool solver::need_check() { return true; } bool solver::need_check() { return true; }
lbool solver::check(lp::explanation_t& ex) { lbool solver::check(lemma& l) {
return m_imp->check(ex); return m_imp->check(l);
} }

9
src/util/lp/niil_solver.h
View file

@ -25,6 +25,13 @@ Revision History:
#include "nlsat/nlsat_solver.h" #include "nlsat/nlsat_solver.h"
#include "util/lp/lar_solver.h" #include "util/lp/lar_solver.h"
namespace niil { namespace niil {
struct ineq {
lp::lconstraint_kind m_cmp;
lp::lar_term m_term;
};
typedef vector<ineq> lemma;
// nonlinear integer incremental linear solver // nonlinear integer incremental linear solver
class solver { class solver {
public: public:
@ -37,6 +44,6 @@ public:
void push(); void push();
void pop(unsigned scopes); void pop(unsigned scopes);
bool need_check(); bool need_check();
lbool check(lp::explanation_t& ex); lbool check(lemma&);
}; };
} }

4
src/util/lp/ul_pair.h
View file

@ -27,9 +27,7 @@ Revision History:
namespace lp { namespace lp {
enum lconstraint_kind { enum lconstraint_kind { LE = -2, LT = -1 , GE = 2, GT = 1, EQ = 0, NE = 3 };
LE = -2, LT = -1 , GE = 2, GT = 1, EQ = 0
};
inline bool kind_is_strict(lconstraint_kind kind) { return kind == LT || kind == GT;} inline bool kind_is_strict(lconstraint_kind kind) { return kind == LT || kind == GT;}