mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 20:18:18 +00:00
Code Activity

add control over Farkas parameter for Arie

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-07-17 00:03:38 +04:00
parent 0cd3c3364b
commit 327b2bbe9c
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/muz_qe/pdr_context.cpp
View file

@ -1562,16 +1562,18 @@ namespace pdr {
m_fparams.m_arith_auto_config_simplex = true; m_fparams.m_arith_auto_config_simplex = true;
m_fparams.m_arith_propagate_eqs = false; m_fparams.m_arith_propagate_eqs = false;
m_fparams.m_arith_eager_eq_axioms = false; m_fparams.m_arith_eager_eq_axioms = false;
if (classify.is_dl() && m_params.use_utvpi()) { if (m_params.use_utvpi() && !m_params.use_convex_hull_generalizer()) {
if (classify.is_dl()) {
m_fparams.m_arith_mode = AS_DIFF_LOGIC; m_fparams.m_arith_mode = AS_DIFF_LOGIC;
m_fparams.m_arith_expand_eqs = true; m_fparams.m_arith_expand_eqs = true;
} }
else if (classify.is_utvpi() && m_params.use_utvpi()) { else if (classify.is_utvpi()) {
IF_VERBOSE(1, verbose_stream() << "UTVPI\n";); IF_VERBOSE(1, verbose_stream() << "UTVPI\n";);
m_fparams.m_arith_mode = AS_UTVPI; m_fparams.m_arith_mode = AS_UTVPI;
m_fparams.m_arith_expand_eqs = true; m_fparams.m_arith_expand_eqs = true;
} }
} }
}
if (m_params.use_convex_hull_generalizer()) { if (m_params.use_convex_hull_generalizer()) {
m_core_generalizers.push_back(alloc(core_convex_hull_generalizer, *this)); m_core_generalizers.push_back(alloc(core_convex_hull_generalizer, *this));
} }

2
src/muz_qe/pdr_generalizers.cpp
View file

@ -158,7 +158,7 @@ namespace pdr {
} }
void core_convex_hull_generalizer::operator()(model_node& n, expr_ref_vector& core, bool& uses_level) { void core_convex_hull_generalizer::operator()(model_node& n, expr_ref_vector& core, bool& uses_level) {
method2(n, core, uses_level); method1(n, core, uses_level);
} }
// use the entire region as starting point for generalization. // use the entire region as starting point for generalization.