mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Code Activity

add simplification with qe-lite as an option #5767

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2022-01-12 03:41:21 -08:00
parent 08294d62e5
commit 56d3718cde
8 changed files with 36 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/solver/assertions/CMakeLists.txt
View file

@ -4,4 +4,5 @@ z3_add_component(solver_assertions
COMPONENT_DEPENDENCIES
smt2parser
smt_params
qe_lite
)

2
src/solver/assertions/asserted_formulas.cpp
View file

@ -49,6 +49,7 @@ asserted_formulas::asserted_formulas(ast_manager & m, smt_params & sp, params_re
m_refine_inj_axiom(*this),
m_max_bv_sharing_fn(*this),
m_elim_term_ite(*this),
m_qe_lite(*this),
m_pull_nested_quantifiers(*this),
m_elim_bvs_from_quantifiers(*this),
m_cheap_quant_fourier_motzkin(*this),
@ -285,6 +286,7 @@ void asserted_formulas::reduce() {
m_ng_lift_ite.m_functor.set_conservative(m_smt_params.m_ng_lift_ite == lift_ite_kind::LI_CONSERVATIVE);
if (!invoke(m_ng_lift_ite)) return;
if (!invoke(m_elim_term_ite)) return;
if (!invoke(m_qe_lite)) return;
if (!invoke(m_refine_inj_axiom)) return;
if (!invoke(m_distribute_forall)) return;
if (!invoke(m_find_macros)) return;

4
src/solver/assertions/asserted_formulas.h
View file

@ -37,6 +37,7 @@ Revision History:
#include "ast/normal_forms/elim_term_ite.h"
#include "ast/pattern/pattern_inference.h"
#include "smt/params/smt_params.h"
#include "qe/lite/qe_lite.h"
class asserted_formulas {
@ -190,6 +191,8 @@ class asserted_formulas {
MK_SIMPLIFIERF(lift_ite, push_app_ite_rw, "lift-ite", af.m_smt_params.m_lift_ite != lift_ite_kind::LI_NONE, true);
MK_SIMPLIFIERF(ng_lift_ite, ng_push_app_ite_rw, "lift-ite", af.m_smt_params.m_ng_lift_ite != lift_ite_kind::LI_NONE, true);
MK_SIMPLIFIERA(qe_lite_fn, qe_lite, "qe-lite", af.m_smt_params.m_qe_lite && af.has_quantifiers(), (af.m, af.m_params), true);
reduce_asserted_formulas_fn m_reduce_asserted_formulas;
distribute_forall_fn m_distribute_forall;
@ -197,6 +200,7 @@ class asserted_formulas {
refine_inj_axiom_fn m_refine_inj_axiom;
max_bv_sharing_fn m_max_bv_sharing_fn;
elim_term_ite_fn m_elim_term_ite;
qe_lite_fn m_qe_lite;
pull_nested_quantifiers m_pull_nested_quantifiers;
elim_bvs_from_quantifiers m_elim_bvs_from_quantifiers;
cheap_quant_fourier_motzkin m_cheap_quant_fourier_motzkin;