mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-10 17:58:06 +00:00
Code Activity

updates

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-02-27 23:19:58 -08:00
parent c205b59a21
commit 31c68b6e23
6 changed files with 170 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/sat/sat_solver.cpp
View file

@ -864,7 +864,7 @@ namespace sat {
lbool solver::check_par(unsigned num_lits, literal const* lits) {
int num_threads = static_cast<int>(m_config.m_num_threads);
int num_extra_solvers = num_threads - 1 + (m_local_search ? 1 : 0);
int num_extra_solvers = num_threads - 1 - (m_local_search ? 1 : 0);
sat::parallel par(*this);
par.reserve(num_threads, 1 << 12);
par.init_solvers(*this, num_extra_solvers);
@ -878,7 +878,7 @@ namespace sat {
for (int i = 0; i < num_threads; ++i) {
try {
lbool r = l_undef;
if (m_local_search && i + 1 == num_extra_solvers) {
if (m_local_search && i == num_extra_solvers) {
r = m_local_search->check(num_lits, lits);
}
else if (i < num_extra_solvers) {
@ -898,7 +898,7 @@ namespace sat {
}
if (first) {
if (m_local_search) {
m_local_search->cancel();
m_local_search->rlimit().cancel();
}
for (int j = 0; j < num_extra_solvers; ++j) {
if (i != j) {