mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-22 19:17:53 +00:00
Code Activity

enable exposing internal solver state on interrupted solvers

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-05-30 17:33:27 -07:00
parent e0a86ccc1a
commit 7d245be4e1
15 changed files with 215 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,6 @@ Notes:
#include"qffp_tactic.h"
#include"qfaufbv_tactic.h"
#include"qfauflia_tactic.h"
#include"qfufnra_tactic.h"
tactic * mk_default_tactic(ast_manager & m, params_ref const & p) {
tactic * st = using_params(and_then(mk_simplify_tactic(m),
@ -44,7 +43,6 @@ tactic * mk_default_tactic(ast_manager & m, params_ref const & p) {
cond(mk_is_nra_probe(), mk_nra_tactic(m),
cond(mk_is_lira_probe(), mk_lira_tactic(m, p),
cond(mk_is_qffp_probe(), mk_qffp_tactic(m, p),
//cond(mk_is_qfufnra_probe(), mk_qfufnra_tactic(m, p),
mk_smt_tactic()))))))))))),
p);
return st;

6
src/tactic/portfolio/fd_solver.cpp
View file

@ -18,11 +18,13 @@ Notes:
--*/
#include "fd_solver.h"
#include "fd_tactic.h"
#include "tactic.h"
#include "inc_sat_solver.h"
#include "enum2bv_solver.h"
#include "pb2bv_solver.h"
#include "bounded_int2bv_solver.h"
#include "solver/solver2tactic.h"
solver * mk_fd_solver(ast_manager & m, params_ref const & p) {
solver* s = mk_inc_sat_solver(m, p);
@ -31,3 +33,7 @@ solver * mk_fd_solver(ast_manager & m, params_ref const & p) {
s = mk_bounded_int2bv_solver(m, p, s);
return s;
}
tactic * mk_fd_tactic(ast_manager & m, params_ref const& p) {
return mk_solver2tactic(mk_fd_solver(m, p));
}

1
src/tactic/portfolio/fd_solver.h
View file

@ -26,4 +26,5 @@ class solver;
solver * mk_fd_solver(ast_manager & m, params_ref const & p);
#endif

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

@ -34,11 +34,11 @@ Notes:
#include"default_tactic.h"
#include"ufbv_tactic.h"
#include"qffp_tactic.h"
#include"qfufnra_tactic.h"
#include"horn_tactic.h"
#include"smt_solver.h"
#include"inc_sat_solver.h"
#include"fd_solver.h"
#include"fd_tactic.h"
#include"bv_rewriter.h"
#include"solver2tactic.h"
@ -91,9 +91,7 @@ tactic * mk_tactic_for_logic(ast_manager & m, params_ref const & p, symbol const
else if (logic=="HORN")
return mk_horn_tactic(m, p);
else if (logic == "QF_FD")
return mk_solver2tactic(mk_fd_solver(m, p));
//else if (logic=="QF_UFNRA")
// return mk_qfufnra_tactic(m, p);
return mk_fd_tactic(m, p);
else
return mk_default_tactic(m, p);
}