show weights in dot file and add support for smoothing set-and nodes

2012-10-29 15:39:56 +00:00
parent fbc44ba17d
commit c2b1434969
2 changed files with 76 additions and 41 deletions
--- a/packages/CLPBN/horus/LiftedCircuit.h
+++ b/packages/CLPBN/horus/LiftedCircuit.h
@@ -108,13 +108,15 @@ class SetOrNode	: public CircuitNode
 class SetAndNode : public CircuitNode
 {
  public:
-    SetAndNode (const Clauses& clauses, string explanation = "")
-        : CircuitNode (clauses, explanation), follow_(0) { }
+    SetAndNode (unsigned nrGroundings, const Clauses& clauses)
+        : CircuitNode (clauses, ""), nrGroundings_(nrGroundings), 
+          follow_(0) { }
        
    double weight (void) const;
                    
    CircuitNode** follow (void) { return &follow_; }
  private:
+    unsigned nrGroundings_;
    CircuitNode* follow_;
 };