Merge pull request #189 from JuliaRobotics/feature/4Q19/ppe_suggested

Additional field in MeanMaxPPE

Author: GearsAD

src/entities/DFGVariable.jl

@@ -72,11 +72,12 @@ Data container to store Parameteric Point Estimate (PPE) for mean and max.
 """
 struct MeanMaxPPE <: AbstractPointParametricEst
     solverKey::Symbol #repeated because of Sam's request
+	suggested::Vector{Float64}
     max::Vector{Float64}
     mean::Vector{Float64}
     lastUpdatedTimestamp::DateTime
 end
-MeanMaxPPE(solverKey::Symbol,max::Vector{Float64},mean::Vector{Float64}) = MeanMaxPPE(solverKey, max, mean, now())
+MeanMaxPPE(solverKey::Symbol, suggested::Vector{Float64}, max::Vector{Float64},mean::Vector{Float64}) = MeanMaxPPE(solverKey, suggested, max, mean, now())
 
 getMaxPPE(est::AbstractPointParametricEst) = est.max
 getMeanPPE(est::AbstractPointParametricEst) = est.mean

test/LightDFGSummaryTypes.jl

@@ -129,7 +129,7 @@ end
         var = getVariable(dfg, :a)
         #make a copy and simulate external changes
         newvar = deepcopy(var)
-        estimates(newvar)[:default] = MeanMaxPPE(:default, [100.0], [50.0])
+        estimates(newvar)[:default] = MeanMaxPPE(:default, [150.0], [100.0], [50.0])
         #update
         mergeUpdateVariableSolverData!(dfg, newvar)
         #For now spot check
@@ -138,7 +138,7 @@ end
 
         # Delete :default and replace to see if new ones can be added
         delete!(estimates(newvar), :default)
-        estimates(newvar)[:second] = MeanMaxPPE(:second, [10.0], [5.0])
+        estimates(newvar)[:second] = MeanMaxPPE(:second, [15.0], [10.0], [5.0])
 
         # Persist to the original variable.
         mergeUpdateVariableSolverData!(dfg, newvar)

test/iifInterfaceTests.jl

@@ -235,7 +235,7 @@ end
     var = getVariable(dfg, :a)
     #make a copy and simulate external changes
     newvar = deepcopy(var)
-    estimates(newvar)[:default] = MeanMaxPPE(:default, [100.0], [50.0])
+    estimates(newvar)[:default] = MeanMaxPPE(:default, [150.0], [100.0], [50.0])
     #update
     mergeUpdateVariableSolverData!(dfg, newvar)
 
@@ -244,7 +244,7 @@ end
     @test estimates(newvar) == estimates(var)
 
     # Add a new estimate.
-    estimates(newvar)[:second] = MeanMaxPPE(:second, [10.0], [5.0])
+    estimates(newvar)[:second] = MeanMaxPPE(:second, [15.0], [10.0], [5.0])
 
     # Confirm they're different
     @test estimates(newvar) != estimates(var)

test/interfaceTests.jl

@@ -208,7 +208,7 @@ end
     var = getVariable(dfg, :a)
     #make a copy and simulate external changes
     newvar = deepcopy(var)
-    estimates(newvar)[:default] = MeanMaxPPE(:default, [100.0], [50.0])
+    estimates(newvar)[:default] = MeanMaxPPE(:default, [150.0], [100.0], [50.0])
     #update
     mergeUpdateVariableSolverData!(dfg, newvar)
 
@@ -218,7 +218,7 @@ end
 
     # Delete :default and replace to see if new ones can be added
     delete!(estimates(newvar), :default)
-    estimates(newvar)[:second] = MeanMaxPPE(:second, [10.0], [5.0])
+    estimates(newvar)[:second] = MeanMaxPPE(:second, [15.0], [10.0], [5.0])
 
     # Persist to the original variable.
     mergeUpdateVariableSolverData!(dfg, newvar)