mirror of
https://github.com/Z3Prover/z3
synced 2025-05-04 06:15:46 +00:00
merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
338d7b3283
commit
d04807e8c3
8 changed files with 122 additions and 85 deletions
|
@ -172,7 +172,8 @@ namespace lp {
|
|||
|
||||
lia_move int_solver::check(lp::explanation * e) {
|
||||
SASSERT(lra.ax_is_correct());
|
||||
if (!has_inf_int()) return lia_move::sat;
|
||||
if (!has_inf_int())
|
||||
return lia_move::sat;
|
||||
|
||||
m_t.clear();
|
||||
m_k.reset();
|
||||
|
@ -181,7 +182,8 @@ namespace lp {
|
|||
m_upper = false;
|
||||
lia_move r = lia_move::undef;
|
||||
|
||||
if (m_gcd.should_apply()) r = m_gcd();
|
||||
if (m_gcd.should_apply())
|
||||
r = m_gcd();
|
||||
|
||||
check_return_helper pc(lra);
|
||||
|
||||
|
@ -298,7 +300,6 @@ namespace lp {
|
|||
return m_number_of_calls % settings().m_int_find_cube_period == 0;
|
||||
}
|
||||
|
||||
|
||||
bool int_solver::should_gomory_cut() {
|
||||
return m_number_of_calls % settings().m_int_gomory_cut_period == 0;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue