Fix for updateVariabeSolverData and changes to HexagonalCloud example.

Author: GearsAD

src/GraphsDFG/services/GraphsDFG.jl

@@ -172,8 +172,8 @@ function updateVariableSolverData!(dfg::GraphsDFG, sourceVariable::DFGVariable):
     if !haskey(dfg.labelDict, sourceVariable.label)
         error("Source variable '$(sourceVariable.label)' doesn't exist in the graph.")
     end
-	dfg.g.vertices[dfg.labelDict[variable.label]].dfgNode.estimateDict = deepcopy(variable.estimateDict)
-	dfg.g.vertices[dfg.labelDict[variable.label]].dfgNode.solverDataDict = deepcopy(variable.solverDataDict)
+	dfg.g.vertices[dfg.labelDict[sourceVariable.label]].dfgNode.estimateDict = deepcopy(sourceVariable.estimateDict)
+	dfg.g.vertices[dfg.labelDict[sourceVariable.label]].dfgNode.solverDataDict = deepcopy(sourceVariable.solverDataDict)
     return sourceVariable
 end
 

test/HexagonalCloud.jl

@@ -1,9 +1,8 @@
-# using Revise
+using Revise
 using Neo4j # So that DFG initializes the database driver.
 using RoME
 using DistributedFactorGraphs
 using Test, Dates
-
 # start with an empty factor graph object
 # fg = initfg()
 cloudFg = CloudGraphsDFG{SolverParams}("localhost", 7474, "neo4j", "test",
@@ -34,22 +33,34 @@ end
 # Right, let's copy it into local memory for solving...
 localFg = GraphsDFG{SolverParams}(params=SolverParams())
 DistributedFactorGraphs._copyIntoGraph!(cloudFg, localFg, union(getVariableIds(cloudFg), getFactorIds(cloudFg)), true)
+# Duplicate for later
+localFgCopy = deepcopy(localFg)
+
 # Some checks
 @test symdiff(getVariableIds(localFg), getVariableIds(cloudFg)) == []
 @test symdiff(getFactorIds(localFg), getFactorIds(cloudFg)) == []
 @test isFullyConnected(localFg)
 # Show it
 toDotFile(localFg, "/tmp/localfg.dot")
 
-tree, smtasks = batchSolve!(localFg, treeinit=true, drawpdf=false, show=false,
-                            returntasks=true, limititers=50,
-                            upsolve=true, downsolve=true  )
+tree, smtasks = solveTree!(localFg)
+
+# solveTree!(cloudFg)
 
-# Testing writing estimates
+# Checking estimates
 for variable in getVariables(localFg)
-    means = mean(getData(variable).val, dims=2)[:]
-    variable.estimateDict[:default] = Dict{Symbol, VariableEstimate}(:Mean => VariableEstimate(:default, :Mean, means, now()))
+    @show variable.label
+    @show variable.estimateDict
+
+    # means = mean(getData(variable).val, dims=2)[:]
+    # variable.estimateDict[:default] = Dict{Symbol, VariableEstimate}(:Mean => VariableEstimate(:default, :Mean, means, now()))
 end
 
+bel = getKDE(getVariable(localFg, :x0))
+bel
+
 # Push updates back to cloud.
 updateGraphSolverData!(localFg, cloudFg, ls(localFg))
+
+# Pull back to local
+updateGraphSolverData!(cloudFg, localFgCopy, ls(cloudFg))