mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-03 03:15:41 +00:00
Code Activity

include paths

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-08-04 17:54:36 -07:00
parent 66d0ffd13f
commit 3e32317d11
3 changed files with 45 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/math/bigfix/lib_intrinsics.h
View file

@ -2,9 +2,6 @@
#include <sys/types.h> #include <sys/types.h>
#if __has_include("config.h")
#include "config.h"
#endif
#if defined(COMPILE_INTRINSICS) #if defined(COMPILE_INTRINSICS)
#if defined(_MSC_VER) #if defined(_MSC_VER)
@ -16,7 +13,7 @@
#if !defined(COMPILE_INTRINSICS) #if !defined(COMPILE_INTRINSICS)
#include "Hacl_IntTypes_Intrinsics.h" #include "math/bigfix/Hacl_IntTypes_Intrinsics.h"
#define Lib_IntTypes_Intrinsics_add_carry_u32(x1, x2, x3, x4) \ #define Lib_IntTypes_Intrinsics_add_carry_u32(x1, x2, x3, x4) \
(Hacl_IntTypes_Intrinsics_add_carry_u32(x1, x2, x3, x4)) (Hacl_IntTypes_Intrinsics_add_carry_u32(x1, x2, x3, x4))

12
src/math/polysat/fixplex.h
View file

@ -204,7 +204,7 @@ namespace polysat {
void set_max_iterations(unsigned n) { m_max_iterations = n; } void set_max_iterations(unsigned n) { m_max_iterations = n; }
unsigned get_num_vars() const { return m_vars.size(); } unsigned get_num_vars() const { return m_vars.size(); }
void reset(); void reset();
void propagate_bounds(); lbool propagate_bounds();
void propagate_eqs(); void propagate_eqs();
vector<var_eq> const& var_eqs() const { return m_var_eqs; } vector<var_eq> const& var_eqs() const { return m_var_eqs; }
void reset_eqs() { m_var_eqs.reset(); } void reset_eqs() { m_var_eqs.reset(); }
@ -230,11 +230,11 @@ namespace polysat {
void get_offset_eqs(row const& r); void get_offset_eqs(row const& r);
void fixed_var_eh(row const& r, var_t x); void fixed_var_eh(row const& r, var_t x);
void eq_eh(var_t x, var_t y, row const& r1, row const& r2); void eq_eh(var_t x, var_t y, row const& r1, row const& r2);
void propagate_bounds(row const& r); lbool propagate_bounds(row const& r);
void propagate_bounds(ineq const& i); lbool propagate_bounds(ineq const& i);
void new_bound(row const& r, var_t x, mod_interval<numeral> const& range); lbool new_bound(row const& r, var_t x, mod_interval<numeral> const& range);
void new_bound(ineq const& i, var_t x, numeral const& lo, numeral const& hi); lbool new_bound(ineq const& i, var_t x, numeral const& lo, numeral const& hi);
void conflict_bound(ineq const& i); lbool conflict_bound(ineq const& i);
void pivot(var_t x_i, var_t x_j, numeral const& b, numeral const& value); void pivot(var_t x_i, var_t x_j, numeral const& b, numeral const& value);
numeral value2delta(var_t v, numeral const& new_value) const; numeral value2delta(var_t v, numeral const& new_value) const;
numeral value2error(var_t v, numeral const& new_value) const; numeral value2error(var_t v, numeral const& new_value) const;

62
src/math/polysat/fixplex_def.h
View file

@ -1052,11 +1052,16 @@ namespace polysat {
template<typename Ext> template<typename Ext>
void fixplex<Ext>::propagate_bounds() { lbool fixplex<Ext>::propagate_bounds() {
for (unsigned i = 0; i < m_rows.size(); ++i) lbool r = l_true;
propagate_bounds(row(i)); for (unsigned i = 0; r == l_true && i < m_rows.size(); ++i)
for (auto ineq : m_ineqs) r = propagate_bounds(row(i));
propagate_bounds(ineq); for (auto ineq : m_ineqs) {
if (r != l_true)
break;
r = propagate_bounds(ineq);
}
return r;
} }
/** /**
@ -1069,7 +1074,7 @@ namespace polysat {
*/ */
template<typename Ext> template<typename Ext>
void fixplex<Ext>::propagate_bounds(row const& r) { lbool fixplex<Ext>::propagate_bounds(row const& r) {
mod_interval<numeral> range(0, 1); mod_interval<numeral> range(0, 1);
numeral free_c = 0; numeral free_c = 0;
var_t free_v = null_var; var_t free_v = null_var;
@ -1078,33 +1083,36 @@ namespace polysat {
numeral const& c = e.coeff(); numeral const& c = e.coeff();
if (is_free(v)) { if (is_free(v)) {
if (free_v != null_var) if (free_v != null_var)
return; return l_true;
free_v = v; free_v = v;
free_c = c; free_c = c;
continue; continue;
} }
range += m_vars[v] * c; range += m_vars[v] * c;
if (range.is_free()) if (range.is_free())
return; return l_true;
} }
if (free_v != null_var) { if (free_v != null_var) {
range = (-range) * free_c; range = (-range) * free_c;
new_bound(r, free_v, range); lbool res = new_bound(r, free_v, range);
SASSERT(in_bounds(free_v)); SASSERT(in_bounds(free_v));
return; return res;
} }
for (auto const& e : M.row_entries(r)) { for (auto const& e : M.row_entries(r)) {
var_t v = e.var(); var_t v = e.var();
SASSERT(!is_free(v)); SASSERT(!is_free(v));
auto range1 = range - m_vars[v] * e.coeff(); auto range1 = range - m_vars[v] * e.coeff();
new_bound(r, v, range1); lbool res = new_bound(r, v, range1);
if (res != l_true)
return res;
// SASSERT(in_bounds(v)); // SASSERT(in_bounds(v));
} }
return l_true;
} }
template<typename Ext> template<typename Ext>
void fixplex<Ext>::propagate_bounds(ineq const& i) { lbool fixplex<Ext>::propagate_bounds(ineq const& i) {
// v < w & lo(v) + 1 = 0 -> conflict // v < w & lo(v) + 1 = 0 -> conflict
// v < w & hi(w) = 0 -> conflict // v < w & hi(w) = 0 -> conflict
// v < w & lo(v) >= hi(w) -> conflict // v < w & lo(v) >= hi(w) -> conflict
@ -1116,65 +1124,71 @@ namespace polysat {
var_t v = i.v, w = i.w; var_t v = i.v, w = i.w;
bool s = i.strict; bool s = i.strict;
if (s && lo(v) + 1 == 0) if (s && lo(v) + 1 == 0)
conflict_bound(i); return conflict_bound(i);
else if (s && hi(w) == 0) else if (s && hi(w) == 0)
conflict_bound(i); return conflict_bound(i);
else if (s && lo(v) >= hi(w)) else if (s && lo(v) >= hi(w))
conflict_bound(i); return conflict_bound(i);
else if (!s && lo(v) > hi(w)) else if (!s && lo(v) > hi(w))
conflict_bound(i); return conflict_bound(i);
else if (s && hi(v) >= hi(w)) { else if (s && hi(v) >= hi(w)) {
SASSERT(lo(v) < hi(w)); SASSERT(lo(v) < hi(w));
SASSERT(hi(w) != 0); SASSERT(hi(w) != 0);
new_bound(i, v, lo(v), hi(w) - 1); return new_bound(i, v, lo(v), hi(w) - 1);
} }
else if (s && lo(v) >= lo(w)) { else if (s && lo(v) >= lo(w)) {
SASSERT(lo(v) + 1 != 0); SASSERT(lo(v) + 1 != 0);
SASSERT(hi(w) > lo(v)); SASSERT(hi(w) > lo(v));
new_bound(i, w, lo(v) + 1, hi(w)); return new_bound(i, w, lo(v) + 1, hi(w));
} }
else if (!s && hi(v) > hi(w)) { else if (!s && hi(v) > hi(w)) {
SASSERT(lo(v) <= hi(w)); SASSERT(lo(v) <= hi(w));
new_bound(i, v, lo(v), hi(w)); return new_bound(i, v, lo(v), hi(w));
} }
else if (!s && lo(v) > lo(w)) { else if (!s && lo(v) > lo(w)) {
SASSERT(lo(v) <= hi(w)); SASSERT(lo(v) <= hi(w));
new_bound(i, w, lo(v), hi(w)); return new_bound(i, w, lo(v), hi(w));
} }
return l_true;
} }
template<typename Ext> template<typename Ext>
void fixplex<Ext>::conflict_bound(ineq const& i) { lbool fixplex<Ext>::conflict_bound(ineq const& i) {
NOT_IMPLEMENTED_YET(); NOT_IMPLEMENTED_YET();
return l_false;
} }
template<typename Ext> template<typename Ext>
void fixplex<Ext>::new_bound(ineq const& i, var_t x, numeral const& l, numeral const& h) { lbool fixplex<Ext>::new_bound(ineq const& i, var_t x, numeral const& l, numeral const& h) {
mod_interval<numeral> r(l, h); mod_interval<numeral> r(l, h);
bool was_fixed = lo(x) + 1 == hi(x); bool was_fixed = lo(x) + 1 == hi(x);
m_vars[x] &= r; m_vars[x] &= r;
if (m_vars[x].is_empty()) { if (m_vars[x].is_empty()) {
// TODO // TODO
IF_VERBOSE(0, verbose_stream() << "infeasible\n"); IF_VERBOSE(0, verbose_stream() << "infeasible\n");
return l_false;
} }
else if (!was_fixed && lo(x) + 1 == hi(x)) { else if (!was_fixed && lo(x) + 1 == hi(x)) {
// TBD: track based on inequality not row // TBD: track based on inequality not row
// fixed_var_eh(r, x); // fixed_var_eh(r, x);
} }
return l_true;
} }
template<typename Ext> template<typename Ext>
void fixplex<Ext>::new_bound(row const& r, var_t x, mod_interval<numeral> const& range) { lbool fixplex<Ext>::new_bound(row const& r, var_t x, mod_interval<numeral> const& range) {
if (range.is_free()) if (range.is_free())
return; return l_true;
bool was_fixed = lo(x) + 1 == hi(x); bool was_fixed = lo(x) + 1 == hi(x);
m_vars[x] &= range; m_vars[x] &= range;
IF_VERBOSE(0, verbose_stream() << "new-bound v" << x << " " << m_vars[x] << "\n"); IF_VERBOSE(0, verbose_stream() << "new-bound v" << x << " " << m_vars[x] << "\n");
if (m_vars[x].is_empty()) { if (m_vars[x].is_empty()) {
IF_VERBOSE(0, verbose_stream() << "infeasible\n"); IF_VERBOSE(0, verbose_stream() << "infeasible\n");
return l_false;
} }
else if (!was_fixed && lo(x) + 1 == hi(x)) else if (!was_fixed && lo(x) + 1 == hi(x))
fixed_var_eh(r, x); fixed_var_eh(r, x);
return l_true;
} }
template<typename Ext> template<typename Ext>