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

tweaking local search

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-03-02 10:18:12 -08:00
parent a37dfd3ab9
commit 40df1949f5
5 changed files with 74 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/sat/sat_parallel.cpp
View file

@ -141,6 +141,7 @@ namespace sat {
limit = m_units.size();
_get_phase(s);
_set_phase(s);
}
}
@ -207,9 +208,8 @@ namespace sat {
return (c.size() <= 40 && c.glue() <= 8) || c.glue() <= 2;
}
void parallel::set_phase(solver& s) {
#pragma omp critical (par_solver)
{
void parallel::_set_phase(solver& s) {
if (!m_phase.empty()) {
m_phase.reserve(s.num_vars(), 0);
for (unsigned i = 0; i < s.num_vars(); ++i) {
if (s.value(i) != l_undef) {
@ -230,6 +230,13 @@ namespace sat {
}
}
void parallel::set_phase(solver& s) {
#pragma omp critical (par_solver)
{
_set_phase(s);
}
}
void parallel::get_phase(solver& s) {
#pragma omp critical (par_solver)
{
@ -254,8 +261,7 @@ namespace sat {
void parallel::set_phase(local_search& s) {
#pragma omp critical (par_solver)
{
m_phase.reserve(s.num_vars(), 0);
for (unsigned i = 0; i < s.num_vars(); ++i) {
for (unsigned i = 0; i < m_phase.size(); ++i) {
if (m_phase[i] < 0) {
s.set_phase(i, false);
}
@ -263,6 +269,7 @@ namespace sat {
s.set_phase(i, true);
}
}
m_phase.reserve(s.num_vars(), 0);
}
}