support smoothing in inclusion-exclusion nodes

2012-10-30 15:48:19 +00:00
parent b31a047635
commit 77ef7b87cd
2 changed files with 47 additions and 40 deletions
--- a/packages/CLPBN/horus/LiftedCircuit.h
+++ b/packages/CLPBN/horus/LiftedCircuit.h
@@ -209,14 +209,17 @@ class LiftedCircuit
        
    TinySet<LiteralId> smoothCircuit (CircuitNode* node);
    
-    CircuitNodeType getCircuitNodeType (const CircuitNode* node) const;
-     
-    string escapeNode (const CircuitNode* node) const;
+    void createSmoothNode (const TinySet<LiteralId>& lids,
+        CircuitNode** prev);
    
+    CircuitNodeType getCircuitNodeType (const CircuitNode* node) const;
+         
    void exportToGraphViz (CircuitNode* node, ofstream&);
    
    void printClauses (const CircuitNode* node, ofstream&,
        string extraOptions = "");
+        
+    string escapeNode (const CircuitNode* node) const;

    CircuitNode*       root_;
    const LiftedWCNF*  lwcnf_;