fixed tree functions

Author: mcosovic

src/graphicalmodel.jl

@@ -481,34 +481,45 @@ function isTree(gbp::Union{GraphicalModel, GraphicalModelTree})
 
     ## Pilling the factor graph
     hasSingleVariable = true; hasSingleFactor = true;
-    @inbounds while hasSingleVariable || hasSingleFactor
-        for i in iterateVariable
-            for (k, j) in enumerate(rowptr[colptr[i][1]])
-                if i == j
-                    deleteat!(rowptr[colptr[i][1]], k)
-                    deleteat!(colptr[i], 1)
+    @inbounds while hasSingleFactor || hasSingleVariable
+        for variable in iterateVariable
+            factor = colptr[variable][1]
+            for (k, variables) in enumerate(rowptr[factor])
+                if variable == variables
+                    deleteat!(rowptr[factor], k)
+                    deleteat!(colptr[variable], 1)
                 end
             end
-            if length(rowptr[colptr[i][1]]) == 1
-                push!(iterateFactor, colptr[i][1])
+            if length(rowptr[factor]) == 1
+                push!(iterateFactor, factor)
             end
         end
         if isempty(iterateFactor)
             hasSingleFactor = false
         end
         iterateVariable = Int64[]
 
-        for i in iterateFactor
-            for (k, j) in enumerate(colptr[rowptr[i][1]])
-                if i == j
-                    deleteat!(colptr[rowptr[i][1]], k)
-                    deleteat!(rowptr[i], 1)
+        for factor in iterateFactor
+            variable = rowptr[factor][1]
+            for (k, factors) in enumerate(colptr[variable])
+                if factor == factors
+                    deleteat!(colptr[variable], k)
+                    deleteat!(rowptr[factor], 1)
                 end
             end
-            if length(colptr[rowptr[i][1]]) == 1
-                push!(iterateVariable, rowptr[i][1])
+            if length(colptr[variable]) == 1
+                push!(iterateVariable, variable)
             end
         end
+
+        flag = true
+        for i in colptr[iterateVariable]
+            if !isempty(i)
+                flag = false
+            end
+        end
+        if flag break end
+
         if isempty(iterateVariable)
             hasSingleVariable = false
         end

src/inferencetree.jl

@@ -19,7 +19,6 @@ function forwardVariableFactor(gbp::GraphicalModelTree)
         for (k, variables) in enumerate(gbp.graph.rowForward[factor])
             if variable == variables
                 deleteat!(gbp.graph.rowForward[factor], k)
-                deleteat!(gbp.graph.colForward[variable], 1)
             end
         end
         if length(gbp.graph.rowForward[factor]) == 1
@@ -51,7 +50,6 @@ function forwardFactorVariable(gbp::GraphicalModelTree)
         for (k, factors) in enumerate(gbp.graph.colForward[variable])
             if factor == factors
                 deleteat!(gbp.graph.colForward[variable], k)
-                deleteat!(gbp.graph.rowForward[factor], 1)
             end
         end
         if length(gbp.graph.colForward[variable]) == 1 && variable != gbp.graph.root