mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

fix loop in equiv_monomials (#91)

Browse source 
* fix loop in equiv_monomials

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fixes

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-04-18 19:11:02 -07:00 committed by Lev Nachmanson
parent e6561c983f
commit 7e67e1ce99
5 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/util/lp/emonomials.cpp
View file

@ -228,15 +228,16 @@ namespace nla {
}
void emonomials::insert_cg(unsigned idx, monomial const& m) {
canonize(m);
do_canonize(m);
lpvar v = m.var(), w;
if (m_cg_table.find(v, w)) {
SASSERT(w != v);
unsigned idxr = m_var2index[w];
// Insert idx to the right of idxr
m_canonized[idx].m_prev = idxr;
m_canonized[idx].m_next = m_canonized[idxr].m_next;
m_canonized[idxr].m_next = idx;
unsigned idxl = m_canonized[idxr].m_next;
m_canonized[idx].m_next = idxr;
m_canonized[idx].m_prev = idxl;
m_canonized[idxr].m_prev = idx;
m_canonized[idxl].m_next = idx;
}
else {
m_cg_table.insert(v);

20
src/util/lp/emonomials.h
View file

@ -305,27 +305,37 @@ namespace nla {
*/
class sign_equiv_monomials_it {
emonomials const& m;
unsigned m_index;
bool m_touched;
unsigned m_index;
bool m_touched;
public:
sign_equiv_monomials_it(emonomials const& m, unsigned idx, bool at_end): m(m), m_index(idx), m_touched(at_end) {}
sign_equiv_monomials_it(emonomials const& m, unsigned idx, bool at_end):
m(m), m_index(idx), m_touched(at_end) {}
monomial const& operator*() { return m.m_monomials[m_index]; }
sign_equiv_monomials_it& operator++() {
m_touched = true;
m_index = m.m_canonized[m_index].m_next;
return *this;
}
sign_equiv_monomials_it operator++(int) { sign_equiv_monomials_it tmp = *this; ++*this; return tmp; }
sign_equiv_monomials_it operator++(int) {
sign_equiv_monomials_it tmp = *this;
++*this;
return tmp;
}
bool operator==(sign_equiv_monomials_it const& other) const {
return m_index == other.m_index && m_touched == other.m_touched;
}
bool operator!=(sign_equiv_monomials_it const& other) const {
return m_index != other.m_index || m_touched != other.m_touched;
}
};
class sign_equiv_monomials {
emonomials& em;
emonomials& em;
monomial const& m;
unsigned index() const { return em.m_var2index[m.var()]; }
public:

9
src/util/lp/nla_basics_lemmas.cpp
View file

@ -245,13 +245,14 @@ bool basics::basic_lemma(bool derived) {
return true;
if (derived)
return false;
c().init_rm_to_refine();
const auto& rm_ref = c().m_to_refine;
TRACE("nla_solver", tout << "rm_ref = "; print_vector(rm_ref, tout););
unsigned start = c().random();
for (unsigned j = rm_ref.size(); j-- > 0; ) {
const signed_vars& r = c().m_emons.canonical[(j + start) % rm_ref.size()];
SASSERT (!c().check_monomial(c().m_emons[r.var()]));
unsigned sz = rm_ref.size();
for (unsigned j = 0; j < sz; ++j) {
lpvar v = rm_ref[(j + start) % rm_ref.size()];
const signed_vars& r = c().m_emons.canonical[v];
SASSERT (!c().check_monomial(c().m_emons[v]));
basic_lemma_for_mon(r, derived);
}

1
src/util/lp/nla_core.h
View file

@ -276,7 +276,6 @@ public:
template <typename T>
bool mon_has_zero(const T& product) const;
void init_rm_to_refine() { NOT_IMPLEMENTED_YET(); }
lp::lp_settings& settings();
unsigned random();
void map_monomial_vars_to_monomial_indices(unsigned i);

1
src/util/lp/nla_order_lemmas.cpp
View file

@ -138,7 +138,6 @@ void order::negate_var_factor_relation(const rational& a_sign, lpvar a, const ra
void order::order_lemma() {
TRACE("nla_solver", );
c().init_rm_to_refine();
const auto& rm_ref = c().m_to_refine;
unsigned start = random();
unsigned sz = rm_ref.size();