mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-01 21:05:52 +00:00
Code Activity

na

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-05-21 18:03:05 -07:00
parent 28996429df
commit 5ad486901e
4 changed files with 70 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,8 @@ namespace polysat {
virtual void set_bounds(var_t v, rational const& lo, rational const& hi) = 0;
virtual void set_value(var_t v, rational const& val) = 0;
virtual void restore_bound() = 0;
virtual void add_le(var_t v, var_t w) = 0;
virtual void add_lt(var_t v, var_t w) = 0;
};
@ -162,6 +164,8 @@ namespace polysat {
void set_bounds(var_t v, rational const& lo, rational const& hi) override;
void set_value(var_t v, rational const& val) override;
void restore_bound() override;
void add_le(var_t v, var_t w) override;
void add_lt(var_t v, var_t w) override;
void set_bounds(var_t v, numeral const& lo, numeral const& hi);
void unset_bounds(var_t v) { m_vars[v].set_free(); }

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

@ -472,6 +472,17 @@ namespace polysat {
m_stashed_bounds.pop_back();
}
template<typename Ext>
void fixplex<Ext>::add_le(var_t v, var_t w) {
NOT_IMPLEMENTED_YET();
}
template<typename Ext>
void fixplex<Ext>::add_lt(var_t v, var_t w) {
NOT_IMPLEMENTED_YET();
}
/**
* Check if the coefficient b of y has the minimal number of trailing zeros.
* In other words, the coefficient b is a multiple of the smallest power of 2.

61
src/math/polysat/linear_solver.cpp
View file

@ -128,19 +128,58 @@ namespace polysat {
m_bool_var2row.setx(c.bvar(), pr, pr);
}
//
// v <= w:
// static constraints:
// - lo(v) <= lo(w)
// - hi(v) <= hi(w)
//
// special case for inequalities with constant bounds
// bounds propagation on fp, then bounds strengthening
// based on static constraints
// internal backtrack search over bounds
// inequality graph (with offsets)
//
void linear_solver::assert_le(ule_constraint& c) {
auto [v, w] = m_bool_var2row[c.bvar()];
// v <= w:
// static constraints:
// - lo(v) <= lo(w)
// - hi(v) <= hi(w)
//
// special case for inequalities with constant bounds
// bounds propagation on fp, then bounds strengthening
// based on static constraints
// internal backtrack search over bounds
// inequality graph (with offsets)
//
unsigned sz = c.lhs().power_of_2();
auto& fp = sz2fixplex(sz);
rational z(0);
if (c.rhs().is_val()) {
bool is_max_value = false;
if (c.is_positive())
// v <= rhs
fp.set_bounds(v, z, c.rhs().val());
else if (is_max_value)
throw default_exception("conflict not implemented");
else
// rhs < v
fp.set_bounds(v, c.rhs().val() + 1, z);
m_trail.push_back(trail_i::set_bound_i);
m_rows.push_back(std::make_pair(v, sz));
return;
}
if (c.lhs().is_val()) {
if (c.is_positive())
// w >= lhs
fp.set_bounds(w, c.lhs().val(), z);
else if (c.lhs().val() == 0)
throw default_exception("conflict not implemented");
else
// w < lhs
fp.set_bounds(w, z, c.lhs().val() - 1);
m_trail.push_back(trail_i::set_bound_i);
m_rows.push_back(std::make_pair(w, sz));
return;
}
if (c.is_positive())
fp.add_le(v, w);
else
fp.add_lt(w, v);
}
void linear_solver::new_bit(var_constraint& c) {