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

Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2013-03-08 13:22:06 +00:00
commit a9c7517275
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/muz_qe/pdr_context.cpp
View file

@ -955,11 +955,11 @@ namespace pdr {
and predicates that are satisfied from facts to the query. and predicates that are satisfied from facts to the query.
The resulting trace The resulting trace
*/ */
expr_ref model_search::get_trace(context const& ctx) const { expr_ref model_search::get_trace(context const& ctx) const {
pred_transformer& pt = get_root().pt(); pred_transformer& pt = get_root().pt();
ast_manager& m = pt.get_manager(); ast_manager& m = pt.get_manager();
manager& pm = pt.get_pdr_manager(); manager& pm = pt.get_pdr_manager();
datalog::context& dctx = ctx.get_context(); datalog::context& dctx = ctx.get_context();
datalog::rule_manager& rm = dctx.get_rule_manager(); datalog::rule_manager& rm = dctx.get_rule_manager();
expr_ref_vector constraints(m), predicates(m); expr_ref_vector constraints(m), predicates(m);

2
src/muz_qe/qe_sat_tactic.h
View file

@ -26,7 +26,7 @@ Revision History:
namespace qe { namespace qe {
tactic * mk_sat_tactic(ast_manager& m, params_ref const& p); tactic * mk_sat_tactic(ast_manager& m, params_ref const& p = params_ref());
}; };
/* /*

8
src/tactic/smtlogics/quant_tactics.cpp
View file

@ -22,6 +22,7 @@ Revision History:
#include"solve_eqs_tactic.h" #include"solve_eqs_tactic.h"
#include"elim_uncnstr_tactic.h" #include"elim_uncnstr_tactic.h"
#include"qe_tactic.h" #include"qe_tactic.h"
#include"qe_sat_tactic.h"
#include"ctx_simplify_tactic.h" #include"ctx_simplify_tactic.h"
#include"smt_tactic.h" #include"smt_tactic.h"
@ -98,8 +99,11 @@ tactic * mk_aufnira_tactic(ast_manager & m, params_ref const & p) {
tactic * mk_lra_tactic(ast_manager & m, params_ref const & p) { tactic * mk_lra_tactic(ast_manager & m, params_ref const & p) {
tactic * st = and_then(mk_quant_preprocessor(m), tactic * st = and_then(mk_quant_preprocessor(m),
mk_qe_tactic(m), or_else(try_for(mk_smt_tactic(), 100),
mk_smt_tactic()); try_for(qe::mk_sat_tactic(m), 1000),
try_for(mk_smt_tactic(), 1000),
and_then(mk_qe_tactic(m), mk_smt_tactic())));
st->updt_params(p); st->updt_params(p);
return st; return st;
} }