mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-19 10:52:02 +00:00
Code Activity

bypass combined solver when logic is set to QF_BV or QF_FD

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-02-01 08:02:24 -08:00
parent f015e3e4cc
commit 4d8d705b3f
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,13 +98,19 @@ tactic * mk_tactic_for_logic(ast_manager & m, params_ref const & p, symbol const
return mk_default_tactic(m, p); return mk_default_tactic(m, p);
} }
static solver* mk_solver_for_logic(ast_manager & m, params_ref const & p, symbol const& logic) { static solver* mk_special_solver_for_logic(ast_manager & m, params_ref const & p, symbol const& logic) {
bv_rewriter rw(m); bv_rewriter rw(m);
if (logic == "QF_BV" && rw.hi_div0()) if (logic == "QF_BV" && rw.hi_div0())
return mk_inc_sat_solver(m, p); return mk_inc_sat_solver(m, p);
if (logic == "QF_FD") if (logic == "QF_FD")
return mk_fd_solver(m, p); return mk_fd_solver(m, p);
return mk_smt_solver(m, p, logic); return 0;
}
static solver* mk_solver_for_logic(ast_manager & m, params_ref const & p, symbol const& logic) {
solver* s = mk_special_solver_for_logic(m, p, logic);
if (!s) s = mk_smt_solver(m, p, logic);
return s;
} }
class smt_strategic_solver_factory : public solver_factory { class smt_strategic_solver_factory : public solver_factory {
@ -119,6 +125,8 @@ public:
l = m_logic; l = m_logic;
else else
l = logic; l = logic;
solver* s = mk_special_solver_for_logic(m, p, l);
if (s) return s;
tactic * t = mk_tactic_for_logic(m, p, l); tactic * t = mk_tactic_for_logic(m, p, l);
return mk_combined_solver(mk_tactic2solver(m, t, p, proofs_enabled, models_enabled, unsat_core_enabled, l), return mk_combined_solver(mk_tactic2solver(m, t, p, proofs_enabled, models_enabled, unsat_core_enabled, l),
mk_solver_for_logic(m, p, l), mk_solver_for_logic(m, p, l),