mirror of
https://github.com/Z3Prover/z3
synced 2025-04-23 17:15:31 +00:00
fixes to bv/dual-solver,
This commit is contained in:
parent
a4354c960c
commit
89ffb45c4f
19 changed files with 94 additions and 75 deletions
|
@ -1192,10 +1192,10 @@ namespace lp {
|
|||
|
||||
impq lar_solver::get_tv_ivalue(tv const& t) const {
|
||||
if (t.is_var())
|
||||
return get_ivalue(t.column());
|
||||
return get_column_value(t.column());
|
||||
impq r;
|
||||
for (const auto& p : get_term(t))
|
||||
r += p.coeff() * get_ivalue(p.column());
|
||||
r += p.coeff() * get_column_value(p.column());
|
||||
return r;
|
||||
}
|
||||
|
||||
|
@ -1317,9 +1317,8 @@ namespace lp {
|
|||
|
||||
void lar_solver::mark_rows_for_bound_prop(lpvar j) {
|
||||
auto& column = A_r().m_columns[j];
|
||||
for (auto const& r : column) {
|
||||
m_rows_with_changed_bounds.insert(r.var());
|
||||
}
|
||||
for (auto const& r : column)
|
||||
m_rows_with_changed_bounds.insert(r.var());
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -638,7 +638,7 @@ public:
|
|||
inline const static_matrix<mpq, impq> & A_r() const { return m_mpq_lar_core_solver.m_r_A; }
|
||||
// columns
|
||||
bool column_is_int(column_index const& j) const { return column_is_int((unsigned)j); }
|
||||
const impq& get_ivalue(column_index const& j) const { return get_column_value(j); }
|
||||
// const impq& get_ivalue(column_index const& j) const { return get_column_value(j); }
|
||||
const impq& get_column_value(column_index const& j) const { return m_mpq_lar_core_solver.m_r_x[j]; }
|
||||
inline
|
||||
var_index external_to_local(unsigned j) const {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue