mirror of
https://github.com/Z3Prover/z3
synced 2025-08-20 10:10:21 +00:00
bad merge?
This commit is contained in:
parent
183e911a79
commit
af017d0906
1 changed files with 1 additions and 6 deletions
|
@ -201,12 +201,7 @@ namespace lp {
|
||||||
if (r == lia_move::undef && should_gomory_cut()) r = gomory(*this).get_gomory_cuts(2);
|
if (r == lia_move::undef && should_gomory_cut()) r = gomory(*this).get_gomory_cuts(2);
|
||||||
|
|
||||||
if (r == lia_move::undef) r = int_branch(*this)();
|
if (r == lia_move::undef) r = int_branch(*this)();
|
||||||
|
if (settings().get_cancel_flag()) r = lia_move::undef;
|
||||||
m_cut_vars.reset();
|
|
||||||
if (settings().get_cancel_flag())
|
|
||||||
return lia_move::undef;
|
|
||||||
if (r == lia_move::undef)
|
|
||||||
r = int_branch(*this)();
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue