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

InxExc: improve the code

Browse Source
This commit is contained in:
Tiago Gomes 2012-11-07 23:45:43 +00:00
parent 6db4d37684
commit f7db522c6c
3 changed files with 100 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,7 +341,7 @@ LiftedCircuit::tryIndependence (
while (finish == false) {
finish = true;
for (size_t i = 0; i < indepClauses.size(); i++) {
if (isIndependentClause (indepClauses[i], depClauses) == false) {
if (independentClause (indepClauses[i], depClauses) == false) {
depClauses.push_back (indepClauses[i]);
indepClauses.erase (indepClauses.begin() + i);
finish = false;
@ -402,27 +402,40 @@ LiftedCircuit::tryInclusionExclusion (
CircuitNode** follow,
Clauses& clauses)
{
// TODO compare all subsets with all subsets
for (size_t i = 0; i < clauses.size(); i++) {
const Literals& literals = clauses[i].literals();
for (size_t j = 0; j < literals.size(); j++) {
bool indep = true;
for (size_t k = 0; k < literals.size(); k++) {
LogVarSet intersect = literals[j].logVarSet()
& literals[k].logVarSet();
if (j != k && intersect.empty() == false) {
indep = false;
Literals depLits = { clauses[i].literals().front() };
Literals indepLits (clauses[i].literals().begin() + 1,
clauses[i].literals().end());
bool finish = false;
while (finish == false) {
finish = true;
for (size_t j = 0; j < indepLits.size(); j++) {
if (independentLiteral (indepLits[j], depLits) == false) {
depLits.push_back (indepLits[j]);
indepLits.erase (indepLits.begin() + j);
finish = false;
break;
}
}
if (indep) {
}
if (indepLits.empty() == false) {
// TODO this should be have to be count normalized too
ConstraintTree really = clauses[i].constr();
Clause c1 (really.projectedCopy (
literals[j].logVars()));
c1.addLiteral (literals[j]);
Clause c2 = clauses[i];
c2.removeLiteral (j);
LogVarSet lvs1;
for (size_t j = 0; j < depLits.size(); j++) {
lvs1 |= depLits[j].logVarSet();
}
LogVarSet lvs2;
for (size_t j = 0; j < indepLits.size(); j++) {
lvs2 |= indepLits[j].logVarSet();
}
Clause c1 (clauses[i].constr().projectedCopy (lvs1));
for (size_t j = 0; j < depLits.size(); j++) {
c1.addLiteral (depLits[j]);
}
Clause c2 (clauses[i].constr().projectedCopy (lvs2));
for (size_t j = 0; j < indepLits.size(); j++) {
c2.addLiteral (indepLits[j]);
}
Clauses plus1Clauses = clauses;
Clauses plus2Clauses = clauses;
Clauses minusClauses = clauses;
@ -433,7 +446,9 @@ LiftedCircuit::tryInclusionExclusion (
plus2Clauses.push_back (c2);
minusClauses.push_back (c1);
minusClauses.push_back (c2);
IncExcNode* ieNode = new IncExcNode (clauses);
stringstream explanation;
explanation << " IncExc on clause nº " << i + 1;
IncExcNode* ieNode = new IncExcNode (clauses, explanation.str());
compile (ieNode->plus1Branch(), plus1Clauses);
compile (ieNode->plus2Branch(), plus2Clauses);
compile (ieNode->minusBranch(), minusClauses);
@ -441,7 +456,6 @@ LiftedCircuit::tryInclusionExclusion (
return true;
}
}
}
return false;
}
@ -651,7 +665,7 @@ LiftedCircuit::shatterCountedLogVarsAux (
bool
LiftedCircuit::isIndependentClause (
LiftedCircuit::independentClause (
Clause& clause,
Clauses& otherClauses) const
{
@ -665,6 +679,22 @@ LiftedCircuit::isIndependentClause (
bool
LiftedCircuit::independentLiteral (
const Literal& lit,
const Literals& otherLits) const
{
for (size_t i = 0; i < otherLits.size(); i++) {
if (lit.lid() == otherLits[i].lid()
|| (lit.logVarSet() & otherLits[i].logVarSet()).empty() == false) {
return false;
}
}
return true;
}
LitLvTypesSet
LiftedCircuit::smoothCircuit (CircuitNode* node)
{
@ -882,7 +912,7 @@ LiftedCircuit::exportToGraphViz (CircuitNode* node, ofstream& os)
ss << "n" << nrAuxNodes;
string auxNode = ss.str();
nrAuxNodes ++;
string opStyle = "shape=circle,width=0.7,margin=\"0.0,0.0\"," ;
switch (getCircuitNodeType (node)) {
@ -890,7 +920,7 @@ LiftedCircuit::exportToGraphViz (CircuitNode* node, ofstream& os)
OrNode* casted = dynamic_cast<OrNode*>(node);
printClauses (casted, os);
os << auxNode << " [label=\"∨\"]" << endl;
os << auxNode << " [" << opStyle << "label=\"∨\"]" << endl;
os << escapeNode (node) << " -> " << auxNode;
os << " [label=\"" << node->explanation() << "\"]" ;
os << endl;
@ -914,7 +944,7 @@ LiftedCircuit::exportToGraphViz (CircuitNode* node, ofstream& os)
AndNode* casted = dynamic_cast<AndNode*>(node);
printClauses (casted, os);
os << auxNode << " [label=\"∧\"]" << endl;
os << auxNode << " [" << opStyle << "label=\"∧\"]" << endl;
os << escapeNode (node) << " -> " << auxNode;
os << " [label=\"" << node->explanation() << "\"]" ;
os << endl;
@ -938,7 +968,7 @@ LiftedCircuit::exportToGraphViz (CircuitNode* node, ofstream& os)
SetOrNode* casted = dynamic_cast<SetOrNode*>(node);
printClauses (casted, os);
os << auxNode << " [label=\"∨(X)\"]" << endl;
os << auxNode << " [" << opStyle << "label=\"∨(X)\"]" << endl;
os << escapeNode (node) << " -> " << auxNode;
os << " [label=\"" << node->explanation() << "\"]" ;
os << endl;
@ -956,7 +986,7 @@ LiftedCircuit::exportToGraphViz (CircuitNode* node, ofstream& os)
SetAndNode* casted = dynamic_cast<SetAndNode*>(node);
printClauses (casted, os);
os << auxNode << " [label=\"∧(X)\"]" << endl;
os << auxNode << " [" << opStyle << "label=\"∧(X)\"]" << endl;
os << escapeNode (node) << " -> " << auxNode;
os << " [label=\"" << node->explanation() << "\"]" ;
os << endl;
@ -974,7 +1004,8 @@ LiftedCircuit::exportToGraphViz (CircuitNode* node, ofstream& os)
IncExcNode* casted = dynamic_cast<IncExcNode*>(node);
printClauses (casted, os);
os << auxNode << " [label=\"IncExc\"]" << endl;
os << auxNode << " [" << opStyle << "label=\"+ - +\"]" ;
os << endl;
os << escapeNode (node) << " -> " << auxNode;
os << " [label=\"" << node->explanation() << "\"]" ;
os << endl;
@ -985,13 +1016,13 @@ LiftedCircuit::exportToGraphViz (CircuitNode* node, ofstream& os)
os << endl;
os << auxNode << " -> " ;
os << escapeNode (*casted->plus2Branch());
os << " [label=\" " << (*casted->plus2Branch())->weight() << "\"]" ;
os << escapeNode (*casted->minusBranch()) << endl;
os << " [label=\" " << (*casted->minusBranch())->weight() << "\"]" ;
os << endl;
os << auxNode << " -> " ;
os << escapeNode (*casted->minusBranch()) << endl;
os << " [label=\" " << (*casted->minusBranch())->weight() << "\"]" ;
os << escapeNode (*casted->plus2Branch());
os << " [label=\" " << (*casted->plus2Branch())->weight() << "\"]" ;
os << endl;
exportToGraphViz (*casted->plus1Branch(), os);

12
packages/CLPBN/horus/LiftedCircuit.h
View File

@ -139,8 +139,8 @@ class SetAndNode : public CircuitNode
class IncExcNode : public CircuitNode
{
public:
IncExcNode (const Clauses& clauses)
: CircuitNode (clauses), plus1Branch_(0),
IncExcNode (const Clauses& clauses, string explanation)
: CircuitNode (clauses, explanation), plus1Branch_(0),
plus2Branch_(0), minusBranch_(0) { }
CircuitNode** plus1Branch (void) { return &plus1Branch_; }
@ -198,7 +198,8 @@ class TrueNode : public CircuitNode
class CompilationFailedNode : public CircuitNode
{
public:
CompilationFailedNode (const Clauses& clauses) : CircuitNode (clauses) { }
CompilationFailedNode (const Clauses& clauses)
: CircuitNode (clauses) { }
double weight (void) const;
};
@ -243,7 +244,10 @@ class LiftedCircuit
bool shatterCountedLogVarsAux (Clauses& clauses, size_t idx1, size_t idx2);
bool isIndependentClause (Clause& clause, Clauses& otherClauses) const;
bool independentClause (Clause& clause, Clauses& otherClauses) const;
bool independentLiteral (const Literal& lit,
const Literals& otherLits) const;
LitLvTypesSet smoothCircuit (CircuitNode* node);

14
packages/CLPBN/horus/LiftedWCNF.cpp
View File

@ -377,22 +377,24 @@ LiftedWCNF::LiftedWCNF (const ParfactorList& pfList)
*/
Literal lit1 (0, {0});
Literal lit2 (1, {});
Literal lit3 (2, {});
Literal lit4 (3, {});
Literal lit2 (1, {0});
Literal lit3 (2, {1});
Literal lit4 (3, {1});
vector<vector<string>> names = {{"p1"},{"p2"}};
vector<vector<string>> names = {{"p1","p2"},{"p3","p4"}};
Clause c1 (names);
c1.addLiteral (lit1);
c1.addLiteral (lit2);
c1.addPosCountedLogVar (0);
c1.addLiteral (lit3);
c1.addLiteral (lit4);
//c1.addPosCountedLogVar (0);
clauses_.push_back (c1);
Clause c2 (names);
c2.addLiteral (lit1);
c2.addLiteral (lit3);
c2.addNegCountedLogVar (0);
clauses_.push_back (c2);
//clauses_.push_back (c2);
/*
Clause c3;
c3.addLiteral (lit3);