mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-27 19:05:51 +00:00
Code Activity

add normalize and sort to nex

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2019-08-19 12:34:23 -07:00
parent 992ab89856
commit 41064f2b25
2 changed files with 111 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -590,6 +590,52 @@ public:
}
return nullptr;
}
nex * normalize_sum(nex_sum* a) {
for (unsigned j = 0; j < a->size(); j ++) {
a->children()[j] = normalize(a->children()[j]);
}
a->simplify();
return a;
}
nex * normalize_mul(nex_mul* a) {
int sum_j = -1;
for (unsigned j = 0; j < a->size(); j ++) {
a->children()[j] = normalize(a->children()[j]);
if (a->children()[j]->is_sum())
sum_j = j;
}
if (sum_j == -1)
return a;
nex_sum *r = mk_sum();
nex_sum *as = to_sum(a->children()[sum_j]);
for (unsigned k = 0; k < as->size(); k++) {
nex_mul *b = mk_mul(as->children()[k]);
r->add_child(b);
for (unsigned j = 0; j < a->size(); j ++) {
if ((int)j != sum_j)
b->add_child(a->children()[j]);
}
}
return normalize_sum(r);
}
nex * normalize(nex* a) {
if (a->is_simple())
return a;
nex *r;
if (a->is_mul()) {
r = normalize_mul(to_mul(a));
} else {
r = normalize_sum(to_sum(a));
}
r->sort();
}
#endif
};