mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-23 06:13:40 +00:00
Code Activity

work on horner

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2019-07-10 19:18:24 -07:00
parent bab5c2f078
commit 8e21342549
2 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/math/lp/horner.cpp
View file

@ -39,9 +39,9 @@ bool horner::row_is_interesting(const T& row) const {
void horner::lemmas_on_expr(nex& e) { void horner::lemmas_on_expr(nex& e) {
TRACE("nla_cn", tout << "e = " << e << "\n";); TRACE("nla_cn", tout << "e = " << e << "\n";);
TRACE("nla_cn_cn", tout << "e = " << e << "\n";);
vector<nex*> front; vector<nex*> front;
front.push_back(&e); cross_nested_of_expr_on_front_elem(e, &e, front);
cross_nested_of_expr(e, front);
} }
nex* pop_back(vector<nex*>& front) { nex* pop_back(vector<nex*>& front) {
@ -50,14 +50,6 @@ nex* pop_back(vector<nex*>& front) {
return c; return c;
} }
void horner::cross_nested_of_expr(nex& e, vector<nex*>& front) {
TRACE("nla_cn", tout << "e = " << e << ", front:"; print_vector_of_ptrs(front, tout) << "\n";);
while (!front.empty()) {
nex* c = pop_back(front);
cross_nested_of_expr_on_front_elem(e, c, front);
}
}
void horner::cross_nested_of_expr_on_front_elem(nex& e, nex* c, vector<nex*>& front) { void horner::cross_nested_of_expr_on_front_elem(nex& e, nex* c, vector<nex*>& front) {
SASSERT(c->is_sum()); SASSERT(c->is_sum());
vector<lpvar> occurences = get_mult_occurences(*c); vector<lpvar> occurences = get_mult_occurences(*c);
@ -65,7 +57,7 @@ void horner::cross_nested_of_expr_on_front_elem(nex& e, nex* c, vector<nex*>& fr
if (occurences.empty()) { if (occurences.empty()) {
if(front.empty()) { if(front.empty()) {
TRACE("nla_cn", tout << "got the cn form: e=" << e << "\n";); TRACE("nla_cn_cn", tout << "got the cn form: e=" << e << "\n";);
SASSERT(!can_be_cross_nested_more(e)); SASSERT(!can_be_cross_nested_more(e));
auto i = interval_of_expr(e); auto i = interval_of_expr(e);
m_intervals.check_interval_for_conflict_on_zero(i); m_intervals.check_interval_for_conflict_on_zero(i);

1
src/math/lp/horner.h
View file

@ -50,7 +50,6 @@ public:
void set_interval_for_scalar(intervals::interval&, const rational&); void set_interval_for_scalar(intervals::interval&, const rational&);
std::set<lpvar> get_vars_of_expr(const nex &) const; std::set<lpvar> get_vars_of_expr(const nex &) const;
void lemmas_on_expr(nex &); void lemmas_on_expr(nex &);
void cross_nested_of_expr(nex& , vector<nex*>& front);
void cross_nested_of_expr_on_front_elem(nex& , nex*, vector<nex*>& front); void cross_nested_of_expr_on_front_elem(nex& , nex*, vector<nex*>& front);
void cross_nested_of_expr_on_sum_and_var(nex& , nex*, lpvar, vector<nex*>& front); void cross_nested_of_expr_on_sum_and_var(nex& , nex*, lpvar, vector<nex*>& front);
bool can_be_cross_nested_more(const nex&) const; bool can_be_cross_nested_more(const nex&) const;