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

make independent partial ground suck less

Browse Source
This commit is contained in:
Tiago Gomes
2012-10-29 20:49:21 +00:00
parent c2b1434969
commit 324ea1a96c
4 changed files with 73 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,15 +109,15 @@ class SetAndNode : public CircuitNode
{
public:
SetAndNode (unsigned nrGroundings, const Clauses& clauses)
: CircuitNode (clauses, ""), nrGroundings_(nrGroundings),
: CircuitNode (clauses, "IPG"), nrGroundings_(nrGroundings),
follow_(0) { }
double weight (void) const;
CircuitNode** follow (void) { return &follow_; }
private:
unsigned nrGroundings_;
CircuitNode* follow_;
unsigned nrGroundings_;
CircuitNode* follow_;
};
@@ -191,6 +191,8 @@ class LiftedCircuit
bool tryIndependence (CircuitNode** follow, Clauses& clauses);
bool tryShannonDecomp (CircuitNode** follow, Clauses& clauses);
bool tryIndepPartialGrounding (CircuitNode** follow, Clauses& clauses);
bool tryIndepPartialGroundingAux (Clauses& clauses, ConstraintTree& ct,
vector<unsigned>& indices);
bool tryGrounding (CircuitNode** follow, Clauses& clauses);
TinySet<LiteralId> smoothCircuit (CircuitNode* node);