mirror of
https://github.com/Z3Prover/z3
synced 2025-04-23 17:15:31 +00:00
merge again
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
commit
172d0ea685
4 changed files with 19 additions and 29 deletions
|
@ -202,7 +202,12 @@ namespace lp {
|
|||
if (r == lia_move::undef && should_gomory_cut()) r = local_cut(2, gomory_fn);
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue