From d686e92bfa48eac2c980b103a7c121387e83d851 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Wed, 2 Oct 2024 10:45:11 -0700 Subject: [PATCH] disambiguate Signed-off-by: Nikolaj Bjorner --- src/math/lp/lar_solver.cpp | 5 +++-- src/math/lp/stacked_vector.h | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/math/lp/lar_solver.cpp b/src/math/lp/lar_solver.cpp index b0f153e46..3e3d98548 100644 --- a/src/math/lp/lar_solver.cpp +++ b/src/math/lp/lar_solver.cpp @@ -1930,9 +1930,10 @@ namespace lp { default: UNREACHABLE(); } - if (m_mpq_lar_core_solver.m_r_upper_bounds[j] == m_mpq_lar_core_solver.m_r_lower_bounds[j]) { + numeric_pair const& lo = m_mpq_lar_core_solver.m_r_lower_bounds[j]; + numeric_pair const& hi = m_mpq_lar_core_solver.m_r_upper_bounds[j]; + if (lo == hi) m_mpq_lar_core_solver.m_column_types[j] = column_type::fixed; - } } void lar_solver::update_bound_with_no_ub_lb(lpvar j, lconstraint_kind kind, const mpq& right_side, u_dependency* dep) { diff --git a/src/math/lp/stacked_vector.h b/src/math/lp/stacked_vector.h index 88e79749b..791cddc85 100644 --- a/src/math/lp/stacked_vector.h +++ b/src/math/lp/stacked_vector.h @@ -62,7 +62,7 @@ public: return m_vec.m_vector[m_i] == other.m_vec.m_vector[other.m_i]; } bool operator!=(ref const& other) const { - return m_vec.m_vector[m_i] != other.m_vec.m_vectpr[other.m_i]; + return m_vec.m_vector[m_i] != other.m_vec.m_vector[other.m_i]; } @@ -90,7 +90,7 @@ public: return m_vec.m_vector[m_i] == other.m_vec.m_vector[other.m_i]; } bool operator!=(ref_const const& other) const { - return m_vec.m_vector[m_i] != other.m_vec.m_vectpr[other.m_i]; + return m_vec.m_vector[m_i] != other.m_vec.m_vector[other.m_i]; } };