Skip to content

Commit 77e03f1

Browse files
authored
Merge pull request #175 from JuliaRobotics/hotfix/getData_solverData
Hotfix cherry pick getData->solverData
2 parents 4e7cabe + 41a481f commit 77e03f1

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/CloudGraphsDFG/services/CloudGraphsDFG.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ function getFactor(dfg::CloudGraphsDFG, factorId::Int64)::DFGFactor
258258
factor = dfg.rebuildFactorMetadata!(dfg, factor)
259259
# GUARANTEED never to bite us in the future...
260260
# ... TODO: refactor if changed: https://github.com/JuliaRobotics/IncrementalInference.jl/issues/350
261-
getData(factor).fncargvID = _variableOrderSymbols
261+
solverData(factor).fncargvID = _variableOrderSymbols
262262

263263
# Add to cache
264264
push!(dfg.factorCache, factor.label=>factor)

src/FileDFG/services/FileDFG.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function loadDFG(folder::String, iifModule, dfgLoadInto::G=GraphsDFG{NoSolverPar
7171
# PATCH - To update the fncargvID for factors, it's being cleared somewhere in rebuildFactorMetadata.
7272
# TEMPORARY
7373
# TODO: Remove
74-
map(f->getData(f).fncargvID = f._variableOrderSymbols, getFactors(dfgLoadInto))
74+
map(f->solverData(f).fncargvID = f._variableOrderSymbols, getFactors(dfgLoadInto))
7575

7676

7777
return dfgLoadInto

src/services/AbstractDFG.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ isFactor(dfg::G, sym::Symbol) where G <: AbstractDFG = hasFactor(dfg, sym)
547547
Return reference to the user factor in `<:AbstractDFG` identified by `::Symbol`.
548548
"""
549549
getFactorFunction(fcd::GenericFunctionNodeData) = fcd.fnc.usrfnc!
550-
getFactorFunction(fc::DFGFactor) = getFactorFunction(getData(fc))
550+
getFactorFunction(fc::DFGFactor) = getFactorFunction(solverData(fc))
551551
function getFactorFunction(dfg::G, fsym::Symbol) where G <: AbstractDFG
552552
getFactorFunction(getFactor(dfg, fsym))
553553
end

0 commit comments

Comments
 (0)