mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-22 16:45:31 +00:00
Code Activity

enable incremental sat for QF_BV

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-06-21 02:23:56 -07:00 • committed by Christoph M. Wintersteiger
parent 0518e69d2a
commit 5aee077d55
5 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/sat/sat_solver/inc_sat_solver.cpp
View file

@ -427,7 +427,7 @@ private:
};
solver* mk_inc_sat_solver(ast_manager& m, params_ref& p) {
solver* mk_inc_sat_solver(ast_manager& m, params_ref const& p) {
return alloc(inc_sat_solver, m, p);
}

2
src/sat/sat_solver/inc_sat_solver.h
View file

@ -22,7 +22,7 @@ Notes:
#include "solver.h"
solver* mk_inc_sat_solver(ast_manager& m, params_ref& p);
solver* mk_inc_sat_solver(ast_manager& m, params_ref const& p);
void set_soft_inc_sat(solver* s, unsigned sz, expr*const* soft, rational const* weights);

1
src/solver/combined_solver.h
View file

@ -29,4 +29,5 @@ class solver_factory;
solver * mk_combined_solver(solver * s1, solver * s2, params_ref const & p);
solver_factory * mk_combined_solver_factory(solver_factory * f1, solver_factory * f2);
#endif

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

@ -37,6 +37,7 @@ Notes:
#include"qfufnra_tactic.h"
#include"horn_tactic.h"
#include"smt_solver.h"
#include"inc_sat_solver.h"
tactic * mk_tactic_for_logic(ast_manager & m, params_ref const & p, symbol const & logic) {
if (logic=="QF_UF")
@ -91,6 +92,12 @@ tactic * mk_tactic_for_logic(ast_manager & m, params_ref const & p, symbol const
return mk_default_tactic(m, p);
}
solver* mk_solver_for_logic(ast_manager & m, params_ref const & p, symbol const& logic) {
if (logic == "QF_BV")
return mk_inc_sat_solver(m, p);
return mk_smt_solver(m, p, logic);
}
class smt_strategic_solver_factory : public solver_factory {
symbol m_logic;
public:
@ -105,7 +112,8 @@ public:
l = logic;
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),
mk_smt_solver(m, p, l),
mk_solver_for_logic(m, p, l),
//mk_smt_solver(m, p, l),
p);
}
};