diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Tiago Gomes
2012-10-31 23:58:07 +00:00
parent 6877be897e
commit bfa9648067
4 changed files with 96 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/CLPBN/horus/LiftedCircuit.cpp
View File

@@ -217,23 +217,6 @@ LiftedCircuit::compile (
}
void
LiftedCircuit::propagate (
const Clause& c,
const Clause& unitClause,
Clauses& newClauses)
{
/*
Literals literals = c.literals();
for (size_t i = 0; i < literals.size(); i++) {
if (literals_[i].lid() == lid && literals[i].isPositive()) {
return true;
}
}
*/
}
bool
shatterCountedLogVars (Clauses& clauses, size_t idx1, size_t idx2)
@@ -312,14 +295,12 @@ LiftedCircuit::tryUnitPropagation (
if (clauses[i].literals()[0].isPositive()) {
if (clauses[j].containsPositiveLiteral (lid, types) == false) {
Clause newClause = clauses[j];
cout << "removing negative literals on " << newClause << endl;
newClause.removeNegativeLiterals (lid, types);
newClauses.push_back (newClause);
}
} else if (clauses[i].literals()[0].isNegative()) {
if (clauses[j].containsNegativeLiteral (lid, types) == false) {
Clause newClause = clauses[j];
cout << "removing negative literals on " << newClause << endl;
newClause.removePositiveLiterals (lid, types);
newClauses.push_back (newClause);
}
@@ -330,7 +311,6 @@ LiftedCircuit::tryUnitPropagation (
explanation << " UP on" << clauses[i].literals()[0];
AndNode* andNode = new AndNode (clauses, explanation.str());
Clauses leftClauses = {clauses[i]};
cout << "new clauses: " << newClauses << endl;
compile (andNode->leftBranch(), leftClauses);
compile (andNode->rightBranch(), newClauses);
(*follow) = andNode;