mirror of
https://github.com/Z3Prover/z3
synced 2025-04-29 03:45:51 +00:00
rename and add some interval methods
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson
parent
4ef7bf2bf6
commit
9fb66e9365
5 changed files with 170 additions and 160 deletions
|
|
@ -145,29 +145,31 @@ interv horner::interval_of_expr(const nex& e) {
|
|||
interv horner::interval_of_mul(const nex& e) {
|
||||
SASSERT(e.is_mul());
|
||||
auto & es = e.children();
|
||||
SASSERT(es.size());
|
||||
TRACE("nla_horner_details", tout << "e=" << e << "\n";);
|
||||
interval_deps_combine_rule comb_rule;
|
||||
interv a = interval_of_expr(es[0]);
|
||||
if (m_intervals.is_zero(a)) {
|
||||
m_intervals.set_zero_interval_deps_for_mult(a);
|
||||
TRACE("nla_horner_details", tout << "es[0]= "<< es[0] << std::endl << "a = "; m_intervals.display(tout, a); );
|
||||
return a;
|
||||
}
|
||||
TRACE("nla_horner_details", tout << "es[0]= "<< es[0] << std::endl << "a = "; m_intervals.display(tout, a); );
|
||||
for (unsigned k = 1; k < es.size(); k++) {
|
||||
interval_deps deps;
|
||||
if (m_intervals.is_zero(a)) {
|
||||
interv t;
|
||||
set_interval_for_scalar(t, rational(1));
|
||||
m_intervals.mul(a, t, a, deps);
|
||||
m_intervals.add_deps(a, t, deps, a);
|
||||
TRACE("nla_horner_details", tout << "got zero\n"; );
|
||||
break;
|
||||
}
|
||||
interv b = interval_of_expr(es[k]);
|
||||
if (m_intervals.is_zero(b)) {
|
||||
m_intervals.set_zero_interval_deps_for_mult(b);
|
||||
TRACE("nla_horner_details", tout << "es[k]= "<< es[k] << std::endl << ", "; m_intervals.display(tout, b); );
|
||||
TRACE("nla_horner_details", tout << "got zero\n"; );
|
||||
return b;
|
||||
}
|
||||
TRACE("nla_horner_details", tout << "es[k]= "<< es[k] << std::endl << ", "; m_intervals.display(tout, b); );
|
||||
interv c;
|
||||
m_intervals.mul(a, b, c, deps);
|
||||
m_intervals.add_deps(a, b, deps, a);
|
||||
m_intervals.mul(a, b, c, comb_rule);
|
||||
m_intervals.combine_deps(a, b, comb_rule, a);
|
||||
m_intervals.set(a, c);
|
||||
TRACE("nla_horner_details", tout << "es[" << k << "]=" << es[k] << ", "; m_intervals.display(tout, a) << "\n";);
|
||||
TRACE("nla_horner_details", tout << "part mult "; m_intervals.display(tout, a) << "\n";);
|
||||
}
|
||||
TRACE("nla_horner_details", tout << "e=" << e << "\n";
|
||||
tout << " interv = "; m_intervals.display(tout, a););
|
||||
tout << " return "; m_intervals.display(tout, a););
|
||||
return a;
|
||||
}
|
||||
|
||||
|
|
@ -190,10 +192,10 @@ interv horner::interval_of_sum(const nex& e) {
|
|||
return b;
|
||||
}
|
||||
interv c;
|
||||
interval_deps deps;
|
||||
interval_deps_combine_rule combine_rule;
|
||||
TRACE("nla_horner_details_sum", tout << "a = "; m_intervals.display(tout, a) << "\nb = "; m_intervals.display(tout, b) << "\n";);
|
||||
m_intervals.add(a, b, c, deps);
|
||||
m_intervals.add_deps(a, b, deps, a);
|
||||
m_intervals.add(a, b, c, combine_rule);
|
||||
m_intervals.combine_deps(a, b, combine_rule, a);
|
||||
m_intervals.set(a, c);
|
||||
TRACE("nla_horner_details_sum", tout << es[k] << ", ";
|
||||
m_intervals.display(tout, a); tout << "\n";);
|
||||
|
|
@ -209,7 +211,7 @@ interv horner::interval_of_sum(const nex& e) {
|
|||
// sets the dependencies also
|
||||
void horner::set_var_interval(lpvar v, interv& b) {
|
||||
m_intervals.set_var_interval_with_deps(v, b);
|
||||
TRACE("nla_horner_details", tout << "v = "; print_var(v, tout) << "\n"; m_intervals.display(tout, b););
|
||||
TRACE("nla_horner_details_var", tout << "v = "; print_var(v, tout) << "\n"; m_intervals.display(tout, b););
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,11 @@ void intervals::set_var_interval_with_deps(lpvar v, interval& b) {
|
|||
}
|
||||
}
|
||||
|
||||
void intervals::set_zero_interval_deps_for_mult(interval& a) {
|
||||
a.m_lower_dep = m_dep_manager.mk_join(a.m_lower_dep, a.m_upper_dep);
|
||||
a.m_upper_dep = a.m_lower_dep;
|
||||
}
|
||||
|
||||
bool intervals::check_interval_for_conflict_on_zero(const interval & i) {
|
||||
return check_interval_for_conflict_on_zero_lower(i) || check_interval_for_conflict_on_zero_upper(i);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,9 +74,9 @@ class intervals : common {
|
|||
};
|
||||
|
||||
|
||||
void add_deps(interval const& a, interval const& b, interval_deps const& deps, interval& i) const {
|
||||
i.m_lower_dep = mk_dependency(a, b, deps.m_lower_deps);
|
||||
i.m_upper_dep = mk_dependency(a, b, deps.m_upper_deps);
|
||||
void add_deps(interval const& a, interval const& b, interval_deps_combine_rule const& deps, interval& i) const {
|
||||
i.m_lower_dep = mk_dependency(a, b, deps.m_lower_combine);
|
||||
i.m_upper_dep = mk_dependency(a, b, deps.m_upper_combine);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -118,7 +118,7 @@ class intervals : common {
|
|||
|
||||
im_config(numeral_manager & m, ci_dependency_manager& d):m_manager(m), m_dep_manager(d) {}
|
||||
private:
|
||||
ci_dependency* mk_dependency(interval const& a, interval const& b, bound_deps bd) const {
|
||||
ci_dependency* mk_dependency(interval const& a, interval const& b, deps_combine_rule bd) const {
|
||||
ci_dependency* dep = nullptr;
|
||||
if (dep_in_lower1(bd)) {
|
||||
dep = m_dep_manager.mk_join(dep, a.m_lower_dep);
|
||||
|
|
@ -173,16 +173,19 @@ public:
|
|||
bool is_zero(const interval& a) const { return m_config.is_zero(a); }
|
||||
void mul(const interval& a, const interval& b, interval& c) { m_imanager.mul(a, b, c); }
|
||||
void add(const interval& a, const interval& b, interval& c) { m_imanager.add(a, b, c); }
|
||||
void add(const interval& a, const interval& b, interval& c, interval_deps& deps) { m_imanager.add(a, b, c, deps); }
|
||||
void add(const interval& a, const interval& b, interval& c, interval_deps_combine_rule& deps) { m_imanager.add(a, b, c, deps); }
|
||||
void set(interval& a, const interval& b) { m_imanager.set(a, b); }
|
||||
void mul(const interval& a, const interval& b, interval& c, interval_deps& deps) { m_imanager.mul(a, b, c, deps); }
|
||||
void add_deps(interval const& a, interval const& b, interval_deps const& deps, interval& i) const {
|
||||
void mul(const interval& a, const interval& b, interval& c, interval_deps_combine_rule& deps) { m_imanager.mul(a, b, c, deps); }
|
||||
void combine_deps(interval const& a, interval const& b, interval_deps_combine_rule const& deps, interval& i) const {
|
||||
m_config.add_deps(a, b, deps, i);
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool upper_is_inf(const interval& a) const { return m_config.upper_is_inf(a); }
|
||||
bool lower_is_inf(const interval& a) const { return m_config.lower_is_inf(a); }
|
||||
void set_var_interval_with_deps(lpvar, interval &);
|
||||
void set_zero_interval_deps_for_mult(interval&);
|
||||
bool is_inf(const interval& i) const { return m_config.is_inf(i); }
|
||||
bool check_interval_for_conflict_on_zero(const interval & i);
|
||||
bool check_interval_for_conflict_on_zero_lower(const interval & i);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue