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

BV-SLS Cosmetics

Browse source 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
This commit is contained in:
Christoph M. Wintersteiger 2015-01-12 17:43:56 +00:00
parent 58bf80f113
commit f1a00da401
4 changed files with 1 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/sat/tactic/sat_tactic.cpp
View file

@ -66,8 +66,6 @@ class sat_tactic : public tactic {
CASSERT("sat_solver", m_solver.check_invariant()); CASSERT("sat_solver", m_solver.check_invariant());
IF_VERBOSE(TACTIC_VERBOSITY_LVL, m_solver.display_status(verbose_stream());); IF_VERBOSE(TACTIC_VERBOSITY_LVL, m_solver.display_status(verbose_stream()););
TRACE("sat_dimacs", m_solver.display_dimacs(tout);); TRACE("sat_dimacs", m_solver.display_dimacs(tout););
//m_solver.display_dimacs(std::cerr);
//exit(0);
lbool r = m_solver.check(); lbool r = m_solver.check();
if (r == l_false) { if (r == l_false) {

1
src/tactic/portfolio/default_tactic.cpp
View file

@ -28,7 +28,6 @@ Notes:
#include"probe_arith.h" #include"probe_arith.h"
#include"quant_tactics.h" #include"quant_tactics.h"
#include"qffpa_tactic.h" #include"qffpa_tactic.h"
#include"sls_tactic.h"
tactic * mk_default_tactic(ast_manager & m, params_ref const & p) { tactic * mk_default_tactic(ast_manager & m, params_ref const & p) {
tactic * st = using_params(and_then(mk_simplify_tactic(m), tactic * st = using_params(and_then(mk_simplify_tactic(m),

5
src/tactic/portfolio/smt_strategic_solver.cpp
View file

@ -37,14 +37,11 @@ Notes:
#include"horn_tactic.h" #include"horn_tactic.h"
#include"smt_solver.h" #include"smt_solver.h"
#include"sls_tactic.h"
tactic * mk_tactic_for_logic(ast_manager & m, params_ref const & p, symbol const & logic) { tactic * mk_tactic_for_logic(ast_manager & m, params_ref const & p, symbol const & logic) {
if (logic=="QF_UF") if (logic=="QF_UF")
return mk_qfuf_tactic(m, p); return mk_qfuf_tactic(m, p);
else if (logic=="QF_BV") else if (logic=="QF_BV")
// return mk_qfbv_tactic(m, p); return mk_qfbv_tactic(m, p);
return mk_qfbv_sls_tactic(m, p);
else if (logic=="QF_IDL") else if (logic=="QF_IDL")
return mk_qfidl_tactic(m, p); return mk_qfidl_tactic(m, p);
else if (logic=="QF_LIA") else if (logic=="QF_LIA")

26
src/tactic/smtlogics/qfbv_tactic.cpp
View file

@ -93,32 +93,6 @@ tactic * mk_qfbv_tactic(ast_manager & m, params_ref const & p) {
mk_sat_tactic(m)); mk_sat_tactic(m));
#endif #endif
/* use full sls
tactic * st = using_params(and_then(preamble_st,
cond(mk_is_qfbv_probe(),
cond(mk_is_qfbv_eq_probe(),
and_then(mk_bv1_blaster_tactic(m),
using_params(mk_smt_tactic(), solver_p)),
and_then(mk_nnf_tactic(m, p), mk_sls_tactic(m))),
mk_smt_tactic())),
main_p);*/
/* use pure dpll
tactic * st = using_params(and_then(mk_simplify_tactic(m),
cond(mk_is_qfbv_probe(),
and_then(mk_bit_blaster_tactic(m),
when(mk_lt(mk_memory_probe(), mk_const_probe(MEMLIMIT)),
and_then(using_params(and_then(mk_simplify_tactic(m),
mk_solve_eqs_tactic(m)),
local_ctx_p),
if_no_proofs(cond(mk_produce_unsat_cores_probe(),
mk_aig_tactic(),
using_params(mk_aig_tactic(),
big_aig_p))))),
new_sat),
mk_smt_tactic())),
main_p);*/
tactic * st = using_params(and_then(preamble_st, tactic * st = using_params(and_then(preamble_st,
// If the user sets HI_DIV0=false, then the formula may contain uninterpreted function // If the user sets HI_DIV0=false, then the formula may contain uninterpreted function
// symbols. In this case, we should not use // symbols. In this case, we should not use