mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Code Activity

fix nex order and cross_nested

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2019-10-12 16:13:21 -07:00
parent eaba70e916
commit dc39ef761c
4 changed files with 50 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/math/lp/cross_nested.h
View file

@ -91,10 +91,7 @@ public:
nex_mul* f = m_nex_creator.mk_mul();
for(const auto & p : m_nex_creator.occurences_map()) { // randomize here: todo
if (p.second.m_occs == size) {
unsigned pow = p.second.m_power;
while (pow --) {
f->add_child(m_nex_creator.mk_var(p.first));
}
f->add_child_in_power(m_nex_creator.mk_var(p.first), p.second.m_power);
}
}
return f;

4
src/math/lp/nex.h
View file

@ -202,6 +202,10 @@ public:
return out;
}
void add_child(const rational& r) {
m_coeff *= r;
}
void add_child(nex* e) {
if (e->is_scalar()) {
m_coeff *= to_scalar(e)->value();

13
src/math/lp/nex_creator.cpp
View file

@ -123,7 +123,7 @@ bool nex_creator::less_than_on_mul_mul_same_degree_iterate(const nex_mul* a, con
auto a_end = a->end();
auto b_end = b->end();
unsigned a_pow, b_pow;
bool ret;
int ret = - 1;
do {
if (!inside_a_p) { a_pow = it_a->pow(); }
if (!inside_b_p) { b_pow = it_b->pow(); }
@ -141,14 +141,14 @@ bool nex_creator::less_than_on_mul_mul_same_degree_iterate(const nex_mul* a, con
it_a++; it_b++;
if (it_a == a_end) {
if (it_b != b_end) {
ret = true;
ret = false;
break;
}
SASSERT(it_a == a_end && it_b == b_end);
ret = a->coeff() < b->coeff();
break;
}
if (it_b == b_end) {
if (it_b == b_end) { // it_a is not at the end
ret = false;
break;
}
@ -176,7 +176,8 @@ bool nex_creator::less_than_on_mul_mul_same_degree_iterate(const nex_mul* a, con
inside_b_p = false;
}
} while (true);
if (ret == -1)
ret = true;
TRACE("nla_cn_details", tout << "a = " << *a << (ret == 1?" < ":" >= ") << *b << "\n";);
return ret;
}
@ -193,9 +194,9 @@ bool nex_creator::less_than_on_mul_mul(const nex_mul* a, const nex_mul* b) const
unsigned b_deg = b->get_degree();
bool ret;
if (a_deg > b_deg) {
ret = true;
} else if (a_deg < b_deg) {
ret = false;
} else if (a_deg < b_deg) {
ret = true;
} else {
ret = less_than_on_mul_mul_same_degree(a, b);
}