mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-07 03:31:23 +00:00
Code Activity

move towards theory phase selection, implement getitem on lambda

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-08-13 13:49:21 -07:00
parent 0eafeb9342
commit 520ea65f32
3 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/smt/smt_context.cpp
View file

@ -3873,7 +3873,9 @@ namespace smt {
default:
break;
}
if (m_fparams.m_phase_selection == PS_CACHING_CONSERVATIVE || m_fparams.m_phase_selection == PS_CACHING_CONSERVATIVE2)
if (m_fparams.m_phase_selection == PS_THEORY ||
m_fparams.m_phase_selection == PS_CACHING_CONSERVATIVE ||
m_fparams.m_phase_selection == PS_CACHING_CONSERVATIVE2)
forget_phase_of_vars_in_current_level();
m_atom_propagation_queue.reset();
m_eq_propagation_queue.reset();

9
src/smt/smt_setup.cpp
View file

@ -317,6 +317,7 @@ namespace smt {
// }
// else {
TRACE("rdl_bug", tout << "using theory_mi_arith\n";);
//setup_lra_arith();
m_context.register_plugin(alloc(smt::theory_mi_arith, m_manager, m_params));
// }
}
@ -477,13 +478,10 @@ namespace smt {
m_params.m_relevancy_lvl = 2;
m_params.m_relevancy_lemma = false;
}
if (st.m_cnf) {
m_params.m_phase_selection = PS_CACHING_CONSERVATIVE2;
}
else {
m_params.m_phase_selection = PS_THEORY;
if (!st.m_cnf) {
m_params.m_restart_strategy = RS_GEOMETRIC;
m_params.m_arith_stronger_lemmas = false;
m_params.m_phase_selection = PS_ALWAYS_FALSE;
m_params.m_restart_adaptive = false;
}
m_params.m_arith_small_lemma_size = 32;
@ -533,7 +531,6 @@ namespace smt {
}
else {
m_params.m_eliminate_term_ite = true;
m_params.m_phase_selection = PS_CACHING;
m_params.m_restart_adaptive = false;
m_params.m_restart_strategy = RS_GEOMETRIC;
m_params.m_restart_factor = 1.5;