updatePPE! standard and bugfix

Author: Affie

src/CloudGraphsDFG/services/CloudGraphsDFG.jl

@@ -520,10 +520,11 @@ function addPPE!(dfg::CloudGraphsDFG, variablekey::Symbol, ppe::P, ppekey::Symbo
     if ppekey in listPPEs(dfg, variablekey, currentTransaction=currentTransaction)
         error("PPE '$(ppekey)' already exists")
     end
-    return updatePPE!(dfg, variablekey, ppe, ppekey, currentTransaction=currentTransaction)
+    return _matchmergePPE!(dfg, variablekey, ppe, ppekey, currentTransaction=currentTransaction)
 end
 
-function updatePPE!(dfg::CloudGraphsDFG, variablekey::Symbol, ppe::P, ppekey::Symbol=:default; currentTransaction::Union{Nothing, Neo4j.Transaction}=nothing)::P where P <: AbstractPointParametricEst
+#TODO clean this, just to match api for update
+function _matchmergePPE!(dfg::CloudGraphsDFG, variablekey::Symbol, ppe::P, ppekey::Symbol=:default; currentTransaction::Union{Nothing, Neo4j.Transaction}=nothing)::P where P <: AbstractPointParametricEst
     packed = packPPE(dfg, ppe)
     query = """
                 MATCH (var:$variablekey:$(join(_getLabelsForType(dfg, DFGVariable, parentKey=variablekey),':')))
@@ -546,10 +547,17 @@ function updatePPE!(dfg::CloudGraphsDFG, variablekey::Symbol, ppe::P, ppekey::Sy
     return unpackPPE(dfg, result.results[1]["data"][1]["row"][1])
 end
 
+function updatePPE!(dfg::CloudGraphsDFG, variablekey::Symbol, ppe::P, ppekey::Symbol=:default; currentTransaction::Union{Nothing, Neo4j.Transaction}=nothing)::P where P <: AbstractPointParametricEst
+    if !(ppekey in listPPEs(dfg, variablekey, currentTransaction=currentTransaction))
+        @warn "PPE '$(ppekey)' does not exist, adding"
+    end
+    return _matchmergePPE!(dfg, variablekey, ppe, ppekey, currentTransaction=currentTransaction)
+end
+
 function updatePPE!(dfg::CloudGraphsDFG, sourceVariables::Vector{<:DFGVariable}, ppekey::Symbol=:default; currentTransaction::Union{Nothing, Neo4j.Transaction}=nothing)
     tx = currentTransaction == nothing ? transaction(dfg.neo4jInstance.connection) : currentTransaction
     for var in sourceVariables
-        updatePPE!(dfg, var.label, getPPE(dfg, var, ppekey), ppekey, currentTransaction=tx)
+        updatePPE!(dfg, var.label, getPPE(var, ppekey), ppekey, currentTransaction=tx)
     end
     if currentTransaction == nothing
         result = commit(tx)

test/consolInterfaceDev.jl

@@ -100,9 +100,9 @@ end
     tagsTestBlock!(fg1, var1, v1_tags)
 end
 
-# @testset "Parametric Point Estimates" begin
-#     PPETestBlock!(fg1, var1)
-# end
+@testset "Parametric Point Estimates" begin
+    PPETestBlock!(fg1, var1)
+end
 
 @testset "Variable Solver Data" begin
     VSDTestBlock!(fg1, var1)

test/runtests.jl

@@ -43,13 +43,13 @@ end
 if get(ENV, "IIF_TEST", "") != "true"
     @testset "Consolidation WIP Testing Driver: CloudGraphsDFG" begin
         global decodePackedType
-        function decodePackedType(dfg::G, packeddata::GenericFunctionNodeData{PT,<:AbstractString}) where {PT, G <: AbstractDFG}
+        function decodePackedType(dfg::AbstractDFG, packeddata::GenericFunctionNodeData{PT,<:AbstractString}) where PT
           # usrtyp = convert(FunctorInferenceType, packeddata.fnc)
           # Also look at parentmodule
           usrtyp = getfield(PT.name.module, Symbol(string(PT.name.name)[7:end]))
           fulltype = DFG.FunctionNodeData{TestCCW{usrtyp}}
-          factor = convert(fulltype, packeddata)
-          return factor
+          factordata = convert(fulltype, packeddata)
+          return factordata
         end
         @info "Testing Driver: CloudGraphsDFG"
         global testDFGAPI = CloudGraphsDFG

test/testBlocks.jl

@@ -527,7 +527,11 @@ function  PPETestBlock!(fg, v1)
     @test @test_logs (:warn, r"does not exist") updatePPE!(fg, :a, ppe, :default) == ppe
     # Update update it
     @test updatePPE!(fg, :a, ppe, :default) == ppe
-    # Bulk copy PPE's for x0 and x1
+    @test deletePPE!(fg, :a, :default) == ppe
+
+    # manually add ppe to v1 for tests
+    v1.ppeDict[:default] = deepcopy(ppe)
+    # Bulk copy PPE's for :x1
     @test updatePPE!(fg, [v1], :default) == nothing
     # Delete it
     @test deletePPE!(fg, :a, :default) == ppe
@@ -551,6 +555,8 @@ function  PPETestBlock!(fg, v1)
     updatePPE!(fg, :a, ppe, :default)
     # Update update it
     updatePPE!(fg, :a, ppe, :default)
+
+    v1.ppeDict[:default] = deepcopy(ppe)
     # Bulk copy PPE's for x0 and x1
     updatePPE!(fg, [v1], :default)
     # Delete it