mirror of
https://github.com/Z3Prover/z3
synced 2025-04-05 17:14:07 +00:00
fixing the default parameters of dio and rename m_gomory_cuts to m_cuts
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
parent
957b177c64
commit
e920291393
|
@ -105,7 +105,7 @@ namespace lp_api {
|
|||
unsigned m_bound_propagations2;
|
||||
unsigned m_assert_diseq;
|
||||
unsigned m_assert_eq;
|
||||
unsigned m_gomory_cuts;
|
||||
unsigned m_cuts;
|
||||
unsigned m_assume_eqs;
|
||||
unsigned m_branch;
|
||||
unsigned m_bv_axioms;
|
||||
|
@ -126,7 +126,7 @@ namespace lp_api {
|
|||
st.update("arith-bound-propagations-cheap", m_bound_propagations2);
|
||||
st.update("arith-diseq", m_assert_diseq);
|
||||
st.update("arith-eq", m_assert_eq);
|
||||
st.update("arith-gomory-cuts", m_gomory_cuts);
|
||||
st.update("arith-cuts", m_cuts);
|
||||
st.update("arith-assume-eqs", m_assume_eqs);
|
||||
st.update("arith-branch", m_branch);
|
||||
st.update("arith-bv-axioms", m_bv_axioms);
|
||||
|
|
|
@ -33,5 +33,6 @@ void lp::lp_settings::updt_params(params_ref const& _p) {
|
|||
m_simplex_strategy = static_cast<lp::simplex_strategy_enum>(p.arith_simplex_strategy());
|
||||
m_nlsat_delay = p.arith_nl_delay();
|
||||
m_dio_eqs = p.arith_lp_dio_eqs();
|
||||
m_dio_enable_gomory_cuts = p.arith_lp_dio_cuts_enable_gomory();
|
||||
m_dio_branching_period = p.arith_lp_dio_branching_period();
|
||||
}
|
||||
|
|
|
@ -251,7 +251,7 @@ private:
|
|||
bool m_print_external_var_name = false;
|
||||
bool m_propagate_eqs = false;
|
||||
bool m_dio_eqs = false;
|
||||
bool m_dio_enable_gomory_cuts = true;
|
||||
bool m_dio_enable_gomory_cuts = false;
|
||||
bool m_dio_enable_hnf_cuts = true;
|
||||
unsigned m_dio_branching_period = 100; // do branching rarere
|
||||
|
||||
|
|
|
@ -1192,7 +1192,7 @@ namespace arith {
|
|||
}
|
||||
case lp::lia_move::cut: {
|
||||
TRACE("arith", tout << "cut\n";);
|
||||
++m_stats.m_gomory_cuts;
|
||||
++m_stats.m_cuts;
|
||||
// m_explanation implies term <= k
|
||||
reset_evidence();
|
||||
for (auto ev : m_explanation)
|
||||
|
|
|
@ -1911,7 +1911,6 @@ public:
|
|||
if (ctx().get_fparams().m_arith_ignore_int)
|
||||
return FC_GIVEUP;
|
||||
TRACE("arith", tout << "cut\n";);
|
||||
++m_stats.m_gomory_cuts;
|
||||
// m_explanation implies term <= k
|
||||
reset_evidence();
|
||||
for (auto ev : m_explanation) {
|
||||
|
|
Loading…
Reference in a new issue