From e2514a2b19088b29a26a5e93183fb7d3a6d76c36 Mon Sep 17 00:00:00 2001 From: Lev Nachmanson Date: Mon, 10 Feb 2020 10:22:05 -0800 Subject: [PATCH] make nla_solver the default Signed-off-by: Lev Nachmanson --- src/math/lp/lp_params.pyg | 2 +- src/smt/params/smt_params_helper.pyg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/math/lp/lp_params.pyg b/src/math/lp/lp_params.pyg index 074d6310d..c1ebcada8 100644 --- a/src/math/lp/lp_params.pyg +++ b/src/math/lp/lp_params.pyg @@ -8,7 +8,7 @@ def_module_params('lp', ('simplex_strategy', UINT, 0, 'simplex strategy for the solver'), ('enable_hnf', BOOL, True, 'enable hnf (Hermite Normal Form) cuts'), ('bprop_on_pivoted_rows', BOOL, True, 'propagate bounds on rows changed by the pivot operation'), - ('nla', BOOL, False, 'call nonlinear integer solver with incremental linearization'), + ('nla', BOOL, True, 'call nonlinear integer solver with incremental linearization'), ('print_ext_var_names', BOOL, False, 'print external variable names') )) diff --git a/src/smt/params/smt_params_helper.pyg b/src/smt/params/smt_params_helper.pyg index 11ebf2fbc..cc9b44321 100644 --- a/src/smt/params/smt_params_helper.pyg +++ b/src/smt/params/smt_params_helper.pyg @@ -40,7 +40,7 @@ def_module_params(module_name='smt', ('bv.reflect', BOOL, True, 'create enode for every bit-vector term'), ('bv.enable_int2bv', BOOL, True, 'enable support for int2bv and bv2int operators'), ('arith.random_initial_value', BOOL, False, 'use random initial values in the simplex-based procedure for linear arithmetic'), - ('arith.solver', UINT, 2, 'arithmetic solver: 0 - no solver, 1 - bellman-ford based solver (diff. logic only), 2 - simplex based solver, 3 - floyd-warshall based solver (diff. logic only) and no theory combination 4 - utvpi, 5 - infinitary lra, 6 - lra solver'), + ('arith.solver', UINT, 6, 'arithmetic solver: 0 - no solver, 1 - bellman-ford based solver (diff. logic only), 2 - simplex based solver, 3 - floyd-warshall based solver (diff. logic only) and no theory combination 4 - utvpi, 5 - infinitary lra, 6 - lra solver'), ('arith.nl', BOOL, True, '(incomplete) nonlinear arithmetic support based on Groebner basis and interval propagation'), ('arith.nl.gb', BOOL, True, 'groebner Basis computation, this option is ignored when arith.nl=false'), ('arith.nl.branching', BOOL, True, 'branching on integer variables in non linear clusters'),