mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-07 00:11:55 +00:00
Code Activity

branch on a free variable before trying Gomory cuts

Browse source 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
This commit is contained in:
Lev Nachmanson 2017-07-11 16:44:04 -07:00
parent bac16bac85
commit 2056404ed4
4 changed files with 54 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/smt/theory_arith_int.h
View file

@ -1387,7 +1387,7 @@ namespace smt {
m_branch_cut_counter++;
// TODO: add giveup code
if (m_branch_cut_counter % m_params.m_arith_branch_cut_ratio == 0) {
if (true || m_branch_cut_counter % m_params.m_arith_branch_cut_ratio == 0) { // remove true :todo
TRACE("opt_verbose", display(tout););
move_non_base_vars_to_bounds();
if (!make_feasible()) {

5
src/smt/theory_lra.cpp
View file

@ -1252,11 +1252,6 @@ namespace smt {
// SAT core assigns a value to
return l_false;
}
case lp::lia_move::bound: {
// todo nikolaj
// Need to set a bound x[j] >= k where j is the only var from the term
return l_false;
}
case lp::lia_move::cut: {
// m_explanation implies term <= k
app_ref b = mk_bound(term, k);