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

more work to support inference with lifted knowledge compilation

Browse Source
This commit is contained in:
Tiago Gomes
2012-11-09 18:42:21 +00:00
parent c53220aa61
commit 8ab622e0aa
6 changed files with 127 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -352,8 +352,8 @@ Clause::getLogVarSetExcluding (size_t idx) const
LiftedWCNF::LiftedWCNF (const ParfactorList& pfList)
: freeLiteralId_(0), pfList_(pfList)
{
//addIndicatorClauses (pfList);
//addParameterClauses (pfList);
addIndicatorClauses (pfList);
addParameterClauses (pfList);
/*
vector<vector<string>> names = {
@@ -377,25 +377,25 @@ LiftedWCNF::LiftedWCNF (const ParfactorList& pfList)
freeLiteralId_ = 2;
*/
Literal lit1 (0, {0});
Literal lit2 (1, {0});
Literal lit3 (2, {1});
Literal lit4 (3, {1});
vector<vector<string>> names = {{"p1","p2"},{"p3","p4"}};
Clause c1 (names);
c1.addLiteral (lit1);
c1.addLiteral (lit2);
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);
//Literal lit1 (0, {0});
//Literal lit2 (1, {0});
//Literal lit3 (2, {1});
//Literal lit4 (3, {1});
//vector<vector<string>> names = {{"p1","p2"},{"p3","p4"}};
//Clause c1 (names);
//c1.addLiteral (lit1);
//c1.addLiteral (lit2);
//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);
/*
Clause c3;
@@ -408,17 +408,18 @@ LiftedWCNF::LiftedWCNF (const ParfactorList& pfList)
c4.addLiteral (lit3);
clauses_.push_back (c4);
*/
freeLiteralId_ = 4;
//freeLiteralId_ = 4;
cout << "FORMULA INDICATORS:" << endl;
// printFormulaIndicators();
printFormulaIndicators();
cout << endl;
cout << "WEIGHTS:" << endl;
printWeights();
cout << endl;
cout << "CLAUSES:" << endl;
printClauses();
// abort();
cout << endl;
}
@@ -431,6 +432,14 @@ LiftedWCNF::~LiftedWCNF (void)
void
LiftedWCNF::addWeight (LiteralId lid, double posW, double negW)
{
weights_[lid] = make_pair (posW, negW);
}
double
LiftedWCNF::posWeight (LiteralId lid) const
{
@@ -451,6 +460,15 @@ LiftedWCNF::negWeight (LiteralId lid) const
vector<LiteralId>
LiftedWCNF::prvGroupLiterals (PrvGroup prvGroup)
{
assert (Util::contains (map_, prvGroup));
return map_[prvGroup];
}
Clause
LiftedWCNF::createClause (LiteralId lid) const
{
@@ -481,14 +499,6 @@ LiftedWCNF::getLiteralId (PrvGroup prvGroup, unsigned range)
void
LiftedWCNF::addWeight (LiteralId lid, double posW, double negW)
{
weights_[lid] = make_pair (posW, negW);
}
void
LiftedWCNF::addIndicatorClauses (const ParfactorList& pfList)
{