Working on factorgraphfactory

primo/reasoning/factorelemination/Factor.py

@@ -4,6 +4,7 @@ from primo.core import Node
 class Factor(object):
 
     evidence = ""
+    cluster = set()
     
     
     def __init__(self,node):
@@ -13,5 +14,19 @@ class Factor(object):
     def __str__(self):
         return self.node.name
         
+    def set_evidence(self,evd):
+        self.evidence = evd
+        
+    def clear_evidence(self):
+        self.evidence = ""
+        
+    def set_cluster(self,cluster):
+        self.cluster = cluster
+        
+    def add_to_cluster(self,node):
+        self.cluster.add(node)
+        
+    def get_variables(self):
+        return self.node.get_cpd().variables
     
     

primo/reasoning/factorelemination/FactorTreeFactory.py

 
 import networkx as nx
+import copy
 from primo.core import Node
 from primo.reasoning.factorelemination import Factor
 from primo.reasoning.factorelemination import FactorTree
@@ -30,6 +31,55 @@ class FactorTreeFactory(object):
             
             
         return FactorTree(graph,rootFactor)
+        
+    def calculate_seperators_pull(self,factor,graph):
+        
+        s = set()  
+        pullSet = set()
+        
+        #find all variables in outgoing edges for factor
+        for child in graph.neighbors(factor):
+            s = self.calculate_seperators_pull(child,graph)
+            # add s to incoming vars from child
+            if graph[factor][child]['inVars'] == None:
+                graph[factor][child]['inVars'] = copy.copy(s)                    
+            else:
+                tmp = graph[factor][child]['inVars']
+                graph[factor][child]['inVars'] = tmp | s
+                
+            
+            for c2 in graph.children(factor):
+                if child != c2:
+                    #TODO: add s to outgoing vars from c2
+                    if graph[factor][child]['outVars'] == None:
+                        graph[factor][child]['outVars'] = copy.copy(s)                    
+                    else:
+                        tmp = graph[factor][child]['outVars']
+                        graph[factor][child]['outVars'] = tmp | s
+                    
+                    #self.calculate_seperators_push(child,graph,s)
+                    
+            pullSet =  s | pullSet
+            
+        pullSet =  s | set(factor.get_variables())    
+        return pullSet
+        
+    def calculate_seperators_push(self,factor,graph,setOut):
+
+        #TODO: add local vars to set
+        #setOut = 
+        
+        localSet = copy.copy(setOut)
+        setOut.add(localVars)
+
+        for child in graph.children(factor):
+            #add setOut to outgoing vars from child
+            child.calculate_seperators_push(child,graph,setOut)
+            
+            
+                        
+        
+