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

hook up nla_solver it lp bound propagation

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2019-06-05 15:56:44 -07:00
parent 9c18ede687
commit 58003f9f97
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/math/interval/interval.h
View file

@ -197,6 +197,8 @@ public:
void set(interval & t, interval const & s); void set(interval & t, interval const & s);
void set(interval & t, numeral const& n);
bool eq(interval const & a, interval const & b) const; bool eq(interval const & a, interval const & b) const;
/** /**
@ -234,11 +236,6 @@ public:
bool check_invariant(interval const & n) const; bool check_invariant(interval const & n) const;
/**
\brief b <- k
*/
void set(numeral const& k, interval & b);
/** /**
\brief b <- -a \brief b <- -a
*/ */

21
src/math/interval/interval_def.h
View file

@ -662,16 +662,6 @@ bool interval_manager<C>::check_invariant(interval const & n) const {
return true; return true;
} }
template<typename C>
void interval_manager<C>::set(numeral const& k, interval & b) {
set_lower_is_inf(b, false);
set_upper_is_inf(b, false);
m().set(lower(b), k);
m().set(upper(b), k);
set_lower_is_open(b, false);
set_upper_is_open(b, false);
}
template<typename C> template<typename C>
void interval_manager<C>::set(interval & t, interval const & s) { void interval_manager<C>::set(interval & t, interval const & s) {
if (&t == &const_cast<interval&>(s)) if (&t == &const_cast<interval&>(s))
@ -695,6 +685,17 @@ void interval_manager<C>::set(interval & t, interval const & s) {
SASSERT(check_invariant(t)); SASSERT(check_invariant(t));
} }
template<typename C>
void interval_manager<C>::set(interval & t, numeral const& n) {
m().set(lower(t), n);
set_lower_is_inf(t, false);
m().set(upper(t), n);
set_upper_is_inf(t, false);
set_lower_is_open(t, false);
set_upper_is_open(t, false);
SASSERT(check_invariant(t));
}
template<typename C> template<typename C>
bool interval_manager<C>::eq(interval const & a, interval const & b) const { bool interval_manager<C>::eq(interval const & a, interval const & b) const {
return return

1
src/math/lp/CMakeLists.txt
View file

@ -28,6 +28,7 @@ z3_add_component(lp
nla_basics_lemmas.cpp nla_basics_lemmas.cpp
nla_common.cpp nla_common.cpp
nla_core.cpp nla_core.cpp
nla_intervals.cpp
nla_monotone_lemmas.cpp nla_monotone_lemmas.cpp
nla_order_lemmas.cpp nla_order_lemmas.cpp
nla_solver.cpp nla_solver.cpp

1
src/math/lp/lp_bound_propagator.cpp
View file

@ -4,6 +4,7 @@
*/ */
#include "math/lp/lar_solver.h" #include "math/lp/lar_solver.h"
#include "math/lp/nla_solver.h" #include "math/lp/nla_solver.h"
#include "math/lp/nla_intervals.h"
namespace lp { namespace lp {
lp_bound_propagator::lp_bound_propagator(lar_solver & ls, nla::solver* nla): lp_bound_propagator::lp_bound_propagator(lar_solver & ls, nla::solver* nla):