extract gomory cut functionality in one method

Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work on hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work in hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work in hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work in hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work in hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work on hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work on hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> prepare calculate U in hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> naive algorithm for HNF and m <= n Signed-off-by: Lev Nachmanson <levnach@hotmail.com> naive algorithm for HNF Signed-off-by: Lev Nachmanson <levnach@hotmail.com> introduces reverse matrix into Hermite Normal Form calculation Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work on more efficient hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work on hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> use smarter templates in lu.h Signed-off-by: Lev Nachmanson <levnach@hotmail.com> the new lu scheme compiles Signed-off-by: Lev Nachmanson <levnach@hotmail.com> simple test passes with the modified lu Signed-off-by: Lev Nachmanson <levnach@hotmail.com> fix the build on windows Signed-off-by: Lev Nachmanson <levnach@hotmail.com> playing with the example from cutting the mix Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work on hnf, add extended_gcd_minimal_uv() Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work on extended_gcd_minimal_uv Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work on hnf, add extended_gcd_minimal_uv() Signed-off-by: Lev Nachmanson <levnach@hotmail.com> more tests and bug fixes in hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work on hnf modulo version Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work on hnf modulo version, more tests pass Signed-off-by: Lev Nachmanson <levnach@hotmail.com> a rough version of hnf passed the tests Signed-off-by: Lev Nachmanson <levnach@hotmail.com> fix build in release Signed-off-by: Lev Nachmanson <levnach@hotmail.com> fixes in determinant calculations Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work on hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work on hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work on hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> work on hnf Signed-off-by: Lev Nachmanson <levnach@hotmail.com> create a stub for hnf_cuts Signed-off-by: Lev Nachmanson <levnach@hotmail.com> create a stub for hnf_cuts Signed-off-by: Lev Nachmanson <levnach@hotmail.com> create a stub for hnf_cuts Signed-off-by: Lev Nachmanson <levnach@hotmail.com> general_matrix etc. Signed-off-by: Lev Nachmanson <levnach@hotmail.com> general_matrix etc. Signed-off-by: Lev Nachmanson <levnach@hotmail.com> rename cut_solver to chase_cut_solver Signed-off-by: Lev Nachmanson <levnach@hotmail.com> rename cut_solver to chase_cut_solver Signed-off-by: Lev Nachmanson <levnach@hotmail.com> hnf_cutter Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2025-05-08 08:15:47 +00:00 · 2018-04-20 11:24:20 -07:00 · 2018-04-20 11:24:20 -07:00 · 3b5337823a
commit 3b5337823a
parent c04bcb411d
35 changed files with 2178 additions and 760 deletions
--- a/src/util/lp/lar_solver.cpp
+++ b/src/util/lp/lar_solver.cpp
@ -1478,7 +1478,7 @@ bool lar_solver::strategy_is_undecided() const {

 void lar_solver::catch_up_in_updating_int_solver() {
    for (unsigned i = 0; i < constraints().size(); i++) {
-        m_int_solver->add_constraint_to_cut_solver(i, constraints()[i]);
+        m_int_solver->add_constraint_to_chase_cut_solver(i, constraints()[i]);
    }
 }

@ -2217,6 +2217,40 @@ void lar_solver::round_to_integer_solution() {
    }
 }

+bool lar_solver::get_equality_for_term_on_corrent_x(unsigned term_index, mpq & rs) const {
+    unsigned tj = term_index + m_terms_start_index;
+    auto it = m_ext_vars_to_columns.find(tj);
+    if (it == m_ext_vars_to_columns.end())
+        return false;
+    unsigned j = it->second.internal_j();
+    auto & slv = m_mpq_lar_core_solver.m_r_solver;
+    impq term_val;
+    bool term_val_ready = false;
+    if (slv.column_has_upper_bound(j)) {
+        const impq & b = slv.m_upper_bounds[j];
+        lp_assert(is_zero(b.y) && is_int(b.x));
+        term_val = terms()[term_index]->apply(m_mpq_lar_core_solver.m_r_x);
+        term_val_ready = true;
+        if (term_val == b) {
+            rs = b.x;
+            return true;
+        }
+    }
+    if (slv.column_has_lower_bound(j)) {
+        if (!term_val_ready)
+            term_val = terms()[term_index]->apply(m_mpq_lar_core_solver.m_r_x);
+        const impq & b = slv.m_lower_bounds[j];
+        lp_assert(is_zero(b.y) && is_int(b.x));
+        
+        if (term_val == b) {
+            rs = b.x;
+            return true;
+        }
+    }
+    return false;    
+}
+
+
 } // namespace lp