Skip to content

Commit 456a35a

Browse files
committed
add getVariablePPE and deprecated
1 parent 0b9fc6f commit 456a35a

File tree

5 files changed

+29
-9
lines changed

5 files changed

+29
-9
lines changed

src/DistributedFactorGraphs.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ export AbstractParams, NoSolverParams
2121
export DFGNode, DFGVariable, DFGFactor, AbstractDFGVariable, AbstractDFGFactor
2222
export InferenceType, PackedInferenceType, FunctorInferenceType, InferenceVariable, ConvolutionObject
2323
export FunctorSingleton, FunctorPairwise, FunctorPairwiseMinimize
24-
export getMaxPPE, getMeanPPE, getSuggestedPPE
24+
export getMaxPPE, getMeanPPE, getSuggestedPPE, getEstimates
25+
export getVariablePPE
2526
export timestamp # DEPRECATED
2627
export label, getTimestamp, setTimestamp!, tags, setTags!, estimates, estimate, data, softtype, solverData, getData, solverDataDict, setSolverData, setSolverData!, internalId, smallData, setSmallData!, bigData
2728
export DFGVariableSummary, DFGFactorSummary, AbstractDFGSummary

src/LightDFG/entities/LightDFG.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ Base.propertynames(x::LightDFG, private::Bool=false) =
5858

5959
Base.getproperty(x::LightDFG,f::Symbol) = begin
6060
if f == :nodeCounter
61-
@error "Field nodeCounter depreciated. returning number of nodes"
61+
@error "Field nodeCounter deprecated. returning number of nodes"
6262
nv(x.g)
6363
elseif f == :labelDict
64-
@error "Field labelDict depreciated. Consider using exists(dfg,label) or getLabelDict(dfg) instead. Returning internals copy"
64+
@error "Field labelDict deprecated. Consider using exists(dfg,label) or getLabelDict(dfg) instead. Returning internals copy"
6565
#TODO: https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/issues/111
6666
copy(x.g.labels.sym_int)
6767
else

src/SymbolDFG/entities/SymbolDFG.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ Base.propertynames(x::SymbolDFG, private::Bool=false) =
3838

3939
Base.getproperty(x::SymbolDFG,f::Symbol) = begin
4040
if f == :nodeCounter
41-
@error "Field nodeCounter depreciated. returning number of nodes"
41+
@error "Field nodeCounter deprecated. returning number of nodes"
4242
nv(x.g)
4343
elseif f == :labelDict
44-
@error "Field labelDict depreciated. Consider using exists(dfg,label) or getLabelDict(dfg) instead. Returning internals copy"
44+
@error "Field labelDict deprecated. Consider using exists(dfg,label) or getLabelDict(dfg) instead. Returning internals copy"
4545
copy(x.g.fadjdict)
4646
else
4747
getfield(x,f)

src/attic/MetaGraphsDFG/entities/MetaGraphsDFG.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ Base.propertynames(x::MetaGraphsDFG, private::Bool=false) =
5151

5252
Base.getproperty(x::MetaGraphsDFG,f::Symbol) = begin
5353
if f == :nodeCounter
54-
@warn "Field nodeCounter depreciated. returning number of nodes"
54+
@warn "Field nodeCounter deprecated. returning number of nodes"
5555
nv(x.g)
5656
elseif f == :labelDict
57-
@warn "Field labelDict depreciated. Consider using exists(dfg,label) or getLabelDict(dfg) instead. Returning internals copy"
57+
@warn "Field labelDict deprecated. Consider using exists(dfg,label) or getLabelDict(dfg) instead. Returning internals copy"
5858
copy(x.g.metaindex[:label])
5959
else
6060
getfield(x,f)

src/entities/DFGVariable.jl

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ getSuggestedPPE(est::AbstractPointParametricEst) = est.suggested
117117
getLastUpdatedTimestamp(est::AbstractPointParametricEst) = est.lastUpdatedTimestamp
118118

119119

120-
VariableEstimate(params...) = errror("VariableEstimate is depreciated, please use MeanMaxPPE")
120+
VariableEstimate(params...) = error("VariableEstimate is deprecated, please use MeanMaxPPE")
121121

122122

123123
"""
@@ -142,7 +142,7 @@ DFGVariable constructors.
142142
"""
143143
function DFGVariable(label::Symbol, _internalId::Int64 = 0) #where {T <:InferenceVariable}
144144
st = stacktrace()
145-
@warn "DFGVariable(label::Symbol, _internalId::Int64 = 0) is depreciated please use DFGVariable(label::Symbol, softtype::T, _internalId::Int64 = 0) where T <: InferenceVariable. Enable DEBUG logging for the stack trace."
145+
@warn "DFGVariable(label::Symbol, _internalId::Int64 = 0) is deprecated please use DFGVariable(label::Symbol, softtype::T, _internalId::Int64 = 0) where T <: InferenceVariable. Enable DEBUG logging for the stack trace."
146146
@debug st
147147
T = InferenceVariable
148148
DFGVariable(label, now(), Symbol[],
@@ -228,6 +228,25 @@ function estimate(v::VariableDataLevel1, key::Symbol=:default)
228228
getEstimate(v, key)
229229
end
230230

231+
232+
"""
233+
$SIGNATURES
234+
235+
Get the parametric point estimate (PPE) for a variable in the factor graph.
236+
237+
Notes
238+
- Defaults on keywords `solveKey` and `method`
239+
240+
Related
241+
242+
getMeanPPE, getMaxPPE, getKDEMean, getKDEFit
243+
"""
244+
function getVariablePPE(vari::DFGVariable; solveKey::Symbol=:default, method::Function=getSuggestedPPE)
245+
getEstimates(vari)[solveKey] |> getSuggestedPPE
246+
end
247+
248+
getVariablePPE(dfg::AbstractDFG, vsym::Symbol; solveKey::Symbol=:default, method::Function=getSuggestedPPE) = getVariablePPE(getVariable(dfg,vsym), solveKey=solveKey, method=method)
249+
231250
"""
232251
$(SIGNATURES)
233252

0 commit comments

Comments
 (0)