mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-03 22:05:45 +00:00
Code Activity

move some functionality from int_solver to int_solver::imp

Browse source
This commit is contained in:
Lev Nachmanson 2024-08-14 15:18:28 -10:00 • committed by Lev Nachmanson
parent 889292472e
commit a1a01b9da6
9 changed files with 933 additions and 901 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/math/lp/gomory.cpp
View file

@ -406,7 +406,7 @@ public:
unsigned n = static_cast<unsigned>(sorted_vars.size());
while (num_cuts-- && n > 0) {
unsigned k = lia.random() % n;
unsigned k = lia.settings().random_next() % n;
double k_ratio = k / (double) n;
k_ratio *= k_ratio*k_ratio; // square k_ratio to make it smaller
@ -496,7 +496,7 @@ public:
auto _check_feasible = [&](void) {
lra.find_feasible_solution();
if (!lra.is_feasible() && !lia.settings().get_cancel_flag()) {
lra.get_infeasibility_explanation(*lia.m_ex);
lra.get_infeasibility_explanation(*(lia.explanation()));
return false;
}
return true;
@ -507,7 +507,7 @@ public:
SASSERT(is_gomory_cut_target(j));
unsigned row_index = lia.row_of_basic_column(j);
const row_strip<mpq>& row = lra.get_row(row_index);
create_cut cc(lia.m_t, lia.m_k, lia.m_ex, j, row, lia);
create_cut cc(lia.get_term(), lia.offset(), lia.explanation(), j, row, lia);
auto r = cc.cut();
if (r != lia_move::cut) {
if (r == lia_move::conflict)
@ -520,7 +520,7 @@ public:
else if (cc.m_polarity == row_polarity::MIN)
lra.update_column_type_and_bound(j, lp::lconstraint_kind::GE, ceil(lra.get_column_value(j).x), add_deps(cc.m_dep, row, j));
if (!is_small_cut(lia.m_t)) {
if (!is_small_cut(lia.get_term())) {
big_cuts.push_back({cc.m_t, cc.m_k, cc.m_dep});
continue;
}
@ -548,7 +548,7 @@ public:
if (lra.get_status() == lp_status::CANCELLED)
return lia_move::cancelled;
if (!lia.has_inf_int())
if (!lra.has_inf_int())
return lia_move::sat;
if (has_small_cut || big_cuts.size())