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

make lp_bound_propagator a field of theory_lra::imp

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2020-06-09 11:20:40 -07:00
parent dd30b5e3af
commit b3bdce7837
3 changed files with 43 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/math/lp/lar_solver.h
View file

@ -299,7 +299,7 @@ public:
inline void backup_x() { m_backup_x = m_mpq_lar_core_solver.m_r_x; }
inline void restore_x() { m_mpq_lar_core_solver.m_r_x = m_backup_x; }
template <typename T>
void explain_implied_bound(implied_bound & ib, lp_bound_propagator<T> & bp) {
void explain_implied_bound(const implied_bound & ib, lp_bound_propagator<T> & bp) {
unsigned i = ib.m_row_or_term_index;
int bound_sign = ib.m_is_lower_bound? 1: -1;
int j_sign = (ib.m_coeff_before_j_is_pos ? 1 :-1) * bound_sign;

22
src/math/lp/lp_bound_propagator.h
View file

@ -67,8 +67,14 @@ class lp_bound_propagator {
std::unordered_map<unsigned, unsigned> m_improved_upper_bounds;
T& m_imp;
impq m_zero;
public:
vector<implied_bound> m_ibounds;
public:
const vector<implied_bound>& ibounds() const { return m_ibounds; }
void init() {
m_improved_upper_bounds.clear();
m_improved_lower_bounds.clear();
m_ibounds.reset();
}
lp_bound_propagator(T& imp): m_imp(imp), m_zero(impq(0)) {}
const lar_solver& lp() const { return m_imp.lp(); }
column_type get_column_type(unsigned j) const {
@ -178,9 +184,8 @@ public:
}
}
void clear_for_eq() {
// m_reported_pairs.reset();
m_visited_rows.reset();
m_visited_columns.reset();
m_offset_to_verts.reset();
@ -251,8 +256,9 @@ public:
void find_path_on_tree(ptr_vector<vertex> & path, vertex* u, vertex* v) const {
vertex* up; // u parent
vertex* vp; // v parent
ptr_vector<vertex> v_branch;
path.push_back(u);
path.push_back(v);
v_branch.push_back(v);
// equalize the levels
while (u->level() > v->level()) {
up = u->parent();
@ -264,7 +270,7 @@ public:
while (u->level() < v->level()) {
vp = v->parent();
if (v->row() == vp->row())
path.push_back(vp);
v_branch.push_back(vp);
v = vp;
}
SASSERT(u->level() == v->level());
@ -278,9 +284,13 @@ public:
if (up->row() == u->row())
path.push_back(up);
if (vp->row() == v->row())
path.push_back(vp);
v_branch.push_back(vp);
u = up; v = vp;
}
for (unsigned i = v_branch.size(); i--; ) {
path.push_back(v_branch[i]);
}
}
bool tree_is_correct() const {