diff --git a/src/sat/sat_params.pyg b/src/sat/sat_params.pyg index 5e68d2f42..97497a220 100644 --- a/src/sat/sat_params.pyg +++ b/src/sat/sat_params.pyg @@ -26,6 +26,6 @@ def_module_params('sat', ('dimacs.core', BOOL, False, 'extract core from DIMACS benchmarks'), ('drat.file', SYMBOL, '', 'file to dump DRAT proofs'), ('drat.check', BOOL, False, 'build up internal proof and check'), - ('cardinality.solver', BOOL, False, 'use cardinality/xor solver'), - ('cliff', UINT, 0, 'my favorite parameter'), + ('cardinality.solver', BOOL, False, 'use cardinality solver'), + ('xor.solver', BOOL, False, 'use xor solver'), )) diff --git a/src/sat/sat_solver/inc_sat_solver.cpp b/src/sat/sat_solver/inc_sat_solver.cpp index 83b8362cf..0c0f82537 100644 --- a/src/sat/sat_solver/inc_sat_solver.cpp +++ b/src/sat/sat_solver/inc_sat_solver.cpp @@ -217,7 +217,7 @@ public: sat_params p1(p); m_params.set_bool("elim_vars", false); m_params.set_bool("keep_cardinality_constraints", p1.cardinality_solver()); - m_params.set_bool("cardinality_solver", p1.cardinality_solver()); + m_params.set_bool("xor_solver", p1.xor_solver()); m_solver.updt_params(m_params); m_optimize_model = m_params.get_bool("optimize_model", false); diff --git a/src/sat/tactic/goal2sat.cpp b/src/sat/tactic/goal2sat.cpp index 8530a9d76..5e5625049 100644 --- a/src/sat/tactic/goal2sat.cpp +++ b/src/sat/tactic/goal2sat.cpp @@ -65,7 +65,7 @@ struct goal2sat::imp { expr_ref_vector m_trail; expr_ref_vector m_interpreted_atoms; bool m_default_external; - bool m_cardinality_solver; + bool m_xor_solver; imp(ast_manager & _m, params_ref const & p, sat::solver & s, atom2bool_var & map, dep2asm_map& dep2asm, bool default_external): m(_m), @@ -82,9 +82,9 @@ struct goal2sat::imp { } void updt_params(params_ref const & p) { - m_ite_extra = p.get_bool("ite_extra", true); - m_max_memory = megabytes_to_bytes(p.get_uint("max_memory", UINT_MAX)); - m_cardinality_solver = p.get_bool("cardinality_solver", false); + m_ite_extra = p.get_bool("ite_extra", true); + m_max_memory = megabytes_to_bytes(p.get_uint("max_memory", UINT_MAX)); + m_xor_solver = p.get_bool("xor_solver", false); } void throw_op_not_handled(std::string const& s) { @@ -560,7 +560,7 @@ struct goal2sat::imp { unsigned get_num_args(app* t) { - if (m.is_iff(t) && m_cardinality_solver) { + if (m.is_iff(t) && m_xor_solver) { unsigned n = 2; while (m.is_iff(t->get_arg(1))) { ++n; @@ -574,7 +574,7 @@ struct goal2sat::imp { } expr* get_arg(app* t, unsigned idx) { - if (m.is_iff(t) && m_cardinality_solver) { + if (m.is_iff(t) && m_xor_solver) { while (idx >= 1) { SASSERT(m.is_iff(t)); t = to_app(t->get_arg(1));