Skip to content

Removing static viewed_lits in implicitBCP #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
agreatnate wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removing static viewed_lits in implicitBCP #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/sharpSAT/instance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ class Instance {
//! Literal-related data, indexed by LiteralID.
LiteralIndexedVector<Literal> literals_;

//! Used in implicitBCP...
LiteralIndexedVector<unsigned char> viewed_lits_;

/*!
* Non-unit non-binary clauses, in which a literal appears.
*
Expand Down
5 changes: 5 additions & 0 deletions src/instance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ void Instance::compactVariables() {
occurrence_lists_.resize(variables_.size());
literals_.clear();
literals_.resize(variables_.size());
viewed_lits_.clear();
viewed_lits_.resize(variables_.size(),0);
literal_values_.clear();
literal_values_.resize(variables_.size(), TriValue::X_TRI);

Expand Down Expand Up @@ -305,6 +307,9 @@ void Instance::initialize(

literals_.clear();
literals_.resize(nVars + 1);

viewed_lits_.clear();
viewed_lits_.resize(nVars + 1,0);
}


Expand Down
10 changes: 4 additions & 6 deletions src/solver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,9 +492,7 @@ bool Solver::BCP(size_t start_at_stack_ofs) {

// this is IBCP 30.08
bool Solver::implicitBCP() {
static vector<LiteralID> test_lits(num_variables());
static LiteralIndexedVector<unsigned char> viewed_lits(num_variables() + 1,
0);
vector<LiteralID> test_lits;

unsigned stack_ofs = stack_.top().literal_stack_ofs();
unsigned num_curr_lits = 0;
Expand All @@ -505,17 +503,17 @@ bool Solver::implicitBCP() {
for (auto cl_ofs : occurrence_lists_[it->neg()])
if (!isSatisfied(cl_ofs)) {
for (auto lt = beginOf(cl_ofs); *lt != SENTINEL_LIT; lt++)
if (isActive(*lt) && !viewed_lits[lt->neg()]) {
if (isActive(*lt) && !viewed_lits_[lt->neg()]) {
test_lits.push_back(lt->neg());
viewed_lits[lt->neg()] = true;
viewed_lits_[lt->neg()] = true;

}
}
}
num_curr_lits = literal_stack_.size() - stack_ofs;
stack_ofs = literal_stack_.size();
for (auto jt = test_lits.begin(); jt != test_lits.end(); jt++)
viewed_lits[*jt] = false;
viewed_lits_[*jt] = false;

vector<float> scores;
scores.clear();
Expand Down