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

Fixed bugs in static features and smt setup

Browse source 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
This commit is contained in:
Christoph M. Wintersteiger 2015-02-08 16:53:08 +00:00
parent 72345026be
commit 4792c5fb7c
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ast/static_features.cpp
View file

@ -23,6 +23,7 @@ static_features::static_features(ast_manager & m):
m_manager(m), m_manager(m),
m_autil(m), m_autil(m),
m_bvutil(m), m_bvutil(m),
m_arrayutil(m),
m_fpautil(m), m_fpautil(m),
m_bfid(m.get_basic_family_id()), m_bfid(m.get_basic_family_id()),
m_afid(m.mk_family_id("arith")), m_afid(m.mk_family_id("arith")),
@ -72,7 +73,10 @@ void static_features::reset() {
m_num_eqs = 0; m_num_eqs = 0;
m_has_rational = false; m_has_rational = false;
m_has_int = false; m_has_int = false;
m_has_real = false; m_has_real = false;
m_has_bv = false;
m_has_fpa = false;
m_has_arrays = false;
m_arith_k_sum .reset(); m_arith_k_sum .reset();
m_num_arith_terms = 0; m_num_arith_terms = 0;
m_num_arith_eqs = 0; m_num_arith_eqs = 0;
@ -272,6 +276,8 @@ void static_features::update_core(expr * e) {
m_has_bv = true; m_has_bv = true;
if (!m_has_fpa && (m_fpautil.is_float(e) || m_fpautil.is_rm(e))) if (!m_has_fpa && (m_fpautil.is_float(e) || m_fpautil.is_rm(e)))
m_has_fpa = true; m_has_fpa = true;
if (!m_has_arrays && m_arrayutil.is_array(e))
m_has_arrays = true;
if (is_app(e)) { if (is_app(e)) {
family_id fid = to_app(e)->get_family_id(); family_id fid = to_app(e)->get_family_id();
mark_theory(fid); mark_theory(fid);

7
src/ast/static_features.h
View file

@ -22,6 +22,7 @@ Revision History:
#include"ast.h" #include"ast.h"
#include"arith_decl_plugin.h" #include"arith_decl_plugin.h"
#include"bv_decl_plugin.h" #include"bv_decl_plugin.h"
#include"array_decl_plugin.h"
#include"fpa_decl_plugin.h" #include"fpa_decl_plugin.h"
#include"map.h" #include"map.h"
@ -29,6 +30,7 @@ struct static_features {
ast_manager & m_manager; ast_manager & m_manager;
arith_util m_autil; arith_util m_autil;
bv_util m_bvutil; bv_util m_bvutil;
array_util m_arrayutil;
fpa_util m_fpautil; fpa_util m_fpautil;
family_id m_bfid; family_id m_bfid;
family_id m_afid; family_id m_afid;
@ -72,8 +74,9 @@ struct static_features {
bool m_has_rational; // bool m_has_rational; //
bool m_has_int; // bool m_has_int; //
bool m_has_real; // bool m_has_real; //
bool m_has_bv; // bool m_has_bv; //
bool m_has_fpa; // bool m_has_fpa; //
bool m_has_arrays; //
rational m_arith_k_sum; // sum of the numerals in arith atoms. rational m_arith_k_sum; // sum of the numerals in arith atoms.
unsigned m_num_arith_terms; unsigned m_num_arith_terms;
unsigned m_num_arith_eqs; // equalities of the form t = k where k is a numeral unsigned m_num_arith_eqs; // equalities of the form t = k where k is a numeral

10
src/smt/smt_setup.cpp
View file

@ -888,7 +888,15 @@ namespace smt {
return; return;
} }
// TODO QF_AUFBV, QF_AUFLIA if (st.num_theories() == 1 && st.m_has_arrays)
setup_QF_AX();
if (st.num_theories() == 2 && st.has_uf() && st.m_has_arrays && st.m_has_bv)
setup_QF_AUFBV();
if (st.num_theories() == 2 && st.has_uf() && st.m_has_arrays && st.m_has_int)
setup_QF_AUFLIA();
setup_unknown(); setup_unknown();
} }