Skip to content

Commit cf2e7d8

Browse files
committed
add dispatch on getPPE
1 parent 52b4fb6 commit cf2e7d8

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

src/services/DFGVariable.jl

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ getPPEMean(fg::AbstractDFG, varlabel::Symbol, solveKey::Symbol=:default) =
1616

1717
"$(SIGNATURES)"
1818
getPPESuggested(est::AbstractPointParametricEst) = est.suggested
19-
getPPESuggested(fg::AbstractDFG, varlabel::Symbol, solveKey::Symbol=:default) =
20-
getPPE(fg, varlabel, solveKey) |> getPPESuggested
19+
getPPESuggested(var::DFGVariable, solveKey::Symbol=:default) = getPPE(var, solveKey) |> getPPESuggested
20+
getPPESuggested(dfg::AbstractDFG, varlabel::Symbol, solveKey::Symbol=:default) = getPPE(getVariable(dfg, varlabel), solveKey)
2121

2222
"$(SIGNATURES)"
2323
getLastUpdatedTimestamp(est::AbstractPointParametricEst) = est.lastUpdatedTimestamp
@@ -793,14 +793,13 @@ Notes
793793
- Defaults on keywords `solveKey` and `method`
794794
795795
Related
796-
getMeanPPE, getMaxPPE, getKDEMean, getKDEFit, getPPEs, getVariablePPEs
796+
[`getMeanPPE`](@ref), [`getMaxPPE`](@ref), [`updatePPE!`](@ref), getKDEMean, getKDEFit, getPPEs, getVariablePPEs
797797
"""
798-
function getPPE(dfg::AbstractDFG, variablekey::Symbol, ppekey::Symbol=:default)
799-
v = getVariable(dfg, variablekey)
800-
!haskey(v.ppeDict, ppekey) && error("PPE key '$ppekey' not found in variable '$variablekey'")
798+
function getPPE(v::DFGVariable, ppekey::Symbol=:default)
799+
!haskey(v.ppeDict, ppekey) && error("PPE key '$ppekey' not found in variable '$(getLabel(v))'")
801800
return v.ppeDict[ppekey]
802801
end
803-
802+
getPPE(dfg::AbstractDFG, variablekey::Symbol, ppekey::Symbol=:default) = getPPE(getVariable(dfg, variablekey), ppekey)
804803
# Not the most efficient call but it at least reuses above (in memory it's probably ok)
805804
getPPE(dfg::AbstractDFG, sourceVariable::VariableDataLevel1, ppekey::Symbol=:default) = getPPE(dfg, sourceVariable.label, ppekey)
806805

test/testBlocks.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,9 +598,9 @@ function PPETestBlock!(fg, v1)
598598
@test_throws ErrorException addPPE!(fg, :a, ppe)
599599

600600
@test listPPEs(fg, :a) == [:default]
601-
# Get the data back - note that this is a reference to above.
602-
@test getPPE(fg, :a, :default) == ppe
603601

602+
# Get the data back - note that this is a reference to above.
603+
@test getPPE(getVariable(fg, :a), :default) == ppe
604604
@test getPPE(fg, :a, :default) == ppe
605605
@test getPPEMean(fg, :a, :default) == ppe.mean
606606
@test getPPEMax(fg, :a, :default) == ppe.max

0 commit comments

Comments
 (0)