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

add initial independent partial grounding support

Browse Source
This commit is contained in:
Tiago Gomes
2012-10-27 00:13:11 +01:00
parent 68ef63207f
commit d074ca9a8f
4 changed files with 273 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ class OrNode : public CircuitNode
: CircuitNode (clauses, explanation),
leftBranch_(0), rightBranch_(0) { }
double weight (void) const;
double weight (void) const;
CircuitNode** leftBranch (void) { return &leftBranch_; }
CircuitNode** rightBranch (void) { return &rightBranch_; }
@@ -90,18 +90,30 @@ class AndNode : public CircuitNode
class SetAndNode : public CircuitNode
class SetOrNode : public CircuitNode
{
public:
SetOrNode (const Clauses& clauses, string explanation = "")
: CircuitNode (clauses, explanation), follow_(0) { }
double weight (void) const;
CircuitNode** follow (void) { return &follow_; }
private:
CircuitNode* follow_;
};
class SetOrNode : public CircuitNode
class SetAndNode : public CircuitNode
{
public:
SetAndNode (const Clauses& clauses, string explanation = "")
: CircuitNode (clauses, explanation), follow_(0) { }
double weight (void) const;
CircuitNode** follow (void) { return &follow_; }
private:
CircuitNode* follow_;
};
@@ -171,11 +183,13 @@ class LiftedCircuit
private:
void compile (CircuitNode** follow, const Clauses& clauses);
void compile (CircuitNode** follow, Clauses& clauses);
bool tryUnitPropagation (CircuitNode** follow, const Clauses& clauses);
bool tryIndependence (CircuitNode** follow, const Clauses& clauses);
bool tryShannonDecomp (CircuitNode** follow, const Clauses& clauses);
bool tryUnitPropagation (CircuitNode** follow, Clauses& clauses);
bool tryIndependence (CircuitNode** follow, Clauses& clauses);
bool tryShannonDecomp (CircuitNode** follow, Clauses& clauses);
bool tryIndepPartialGrounding (CircuitNode** follow, Clauses& clauses);
bool tryGrounding (CircuitNode** follow, Clauses& clauses);
TinySet<LiteralId> smoothCircuit (CircuitNode* node);