Skip to content

Commit ea91992

Browse files
authored
Merge pull request #1678 from JuliaRobotics/23Q1/api/dfg19solve
Merging my fix branch into your v0.19 feature branch
2 parents 6e3df8b + 5b6f726 commit ea91992

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

src/services/FGOSUtils.jl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,7 @@ function calcPPE(
235235
varType::InferenceVariable = getVariableType(var);
236236
ppeType::Type{<:MeanMaxPPE} = MeanMaxPPE,
237237
solveKey::Symbol = :default,
238-
ppeKey::Symbol = solveKey,
239-
timestamp = now(),
238+
ppeKey::Symbol = solveKey
240239
)
241240
#
242241
P = getBelief(var, solveKey)
@@ -268,7 +267,6 @@ function calcPPE(
268267
suggested=Pme_,
269268
max=Pma,
270269
mean=Pme_,
271-
createdTimestamp=ZonedDateTime(timestamp, localzone())
272270
)
273271
end
274272

src/services/FactorGraph.jl

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -613,9 +613,7 @@ function addVariable!(
613613
(:parametric in initsolvekeys) &&
614614
setDefaultNodeDataParametric!(v, varType; initialized = false, dontmargin = dontmargin)
615615

616-
DFG.addVariable!(dfg, v)
617-
618-
return v
616+
return DFG.addVariable!(dfg, v)
619617
end
620618

621619
function parseusermultihypo(multihypo::Nothing, nullhypo::Float64)
@@ -849,12 +847,12 @@ function DFG.addFactor!(
849847
)
850848
#
851849

852-
success = addFactor!(dfg, newFactor)
850+
factor = addFactor!(dfg, newFactor)
853851

854852
# TODO: change this operation to update a conditioning variable
855853
graphinit && doautoinit!(dfg, Xi; singles = false)
856854

857-
return newFactor
855+
return factor
858856
end
859857

860858
function _checkFactorAdd(usrfnc, xisyms)

src/services/JunctionTreeUtils.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ function prepBatchTreeOLD!(
847847
end
848848
end
849849

850-
tree = buildTreeFromOrdering!(dfg, p; drawbayesnet = false) # drawbayesnet
850+
tree = buildTreeFromOrdering!(dfg, Symbol.(p); drawbayesnet = false) # drawbayesnet
851851

852852
@info "Bayes Tree Complete"
853853
if drawpdf

0 commit comments

Comments
 (0)