mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Code Activity

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

Browse source
This commit is contained in:
Leonardo de Moura 2012-11-18 00:14:08 -08:00
commit 8f2a17e20b
63 changed files with 1756 additions and 1444 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,7 @@ Notes:
#include"default_tactic.h"
#include"ufbv_tactic.h"
#include"qffpa_tactic.h"
#include"pdr_tactic.h"
#include"smt_solver.h"
MK_SIMPLE_TACTIC_FACTORY(qfuf_fct, mk_qfuf_tactic(m, p));
@ -54,6 +55,7 @@ MK_SIMPLE_TACTIC_FACTORY(qfnia_fct, mk_qfnia_tactic(m, p));
MK_SIMPLE_TACTIC_FACTORY(qfnra_fct, mk_qfnra_tactic(m, p));
MK_SIMPLE_TACTIC_FACTORY(qffpa_fct, mk_qffpa_tactic(m, p));
MK_SIMPLE_TACTIC_FACTORY(ufbv_fct, mk_ufbv_tactic(m, p));
MK_SIMPLE_TACTIC_FACTORY(horn_fct, mk_pdr_tactic(m, p));
static void init(strategic_solver * s) {
s->set_default_tactic(alloc(default_fct));
@ -77,6 +79,7 @@ static void init(strategic_solver * s) {
s->set_tactic_for(symbol("UFBV"), alloc(ufbv_fct));
s->set_tactic_for(symbol("BV"), alloc(ufbv_fct));
s->set_tactic_for(symbol("QF_FPA"), alloc(qffpa_fct));
s->set_tactic_for(symbol("HORN"), alloc(horn_fct));
}
solver * mk_smt_strategic_solver(bool force_tactic) {

4
src/tactic/tactical.cpp
View file

@ -549,7 +549,7 @@ public:
#ifdef _NO_OMP_
use_seq = true;
#else
use_seq = omp_in_parallel();
use_seq = 0 != omp_in_parallel();
#endif
if (use_seq) {
// execute tasks sequentially
@ -677,7 +677,7 @@ public:
#ifdef _NO_OMP_
use_seq = true;
#else
use_seq = omp_in_parallel();
use_seq = 0 != omp_in_parallel();
#endif
if (use_seq) {
// execute tasks sequentially