Skip to content

Commit

Permalink
Merge pull request #163 from JuliaRobotics/maintenance/2019Q1
Browse files Browse the repository at this point in the history
Maintenance/2019 q1
  • Loading branch information
dehann committed Mar 11, 2019
2 parents 59457cb + a119047 commit 90d5b28
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 14 deletions.
6 changes: 3 additions & 3 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
julia 0.7 1.1
IncrementalInference 0.5.2
Graphs 0.10.1
IncrementalInference 0.5.4 0.6.0
Graphs 0.10.2
TransformUtils 0.2.2
CoordinateTransformations 0.5.0
Rotations 0.9.1
KernelDensityEstimate 0.4.3
KernelDensityEstimate 0.5.0
ApproxManifoldProducts 0.0.3
Distributions 0.16.4
JLD2 0.1.2
Expand Down
5 changes: 3 additions & 2 deletions src/RoME.jl
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ import IncrementalInference: convert, getSample, reshapeVec2Mat, extractdistribu
const AMP = ApproxManifoldProducts

export
IIF,
IIF, # Aliases for various packages
KDE,
TU,
AMP,
initfg, # RoME specific functions
# initfg,
# RoME specific functions
measureMeanDist,
predictBodyBR,
getLastPose,
Expand Down
29 changes: 21 additions & 8 deletions src/RobotUtils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -246,14 +246,27 @@ function addOdoFG!(
return vnext, fact
end


function initfg(;sessionname="NA")
fgl = IIF.FactorGraph()
fgl.sessionname=sessionname
# fgl.robotname = ?
# registerCallback!(fgl, RoME.getSample) # RoME.evalPotention
return fgl
end
# """
# $SIGNATURES
#
# Initialize an empty `::FactorGraph` object while initializing `sessionname`, `robotname`, and `cloudgraph`.
# """
# function initfg(;sessionname="NA",robotname="",username="",cloudgraph=nothing)
# # fgl = RoME.initfg(sessionname=sessionname)
# fgl = IIF.FactorGraph()
# fgl.sessionname = sessionname
# fgl.robotname = robotname
# fgl.username = username
# fgl.cg = cloudgraph
# return fgl
# end
# function initfg(;sessionname="NA")
# fgl = IIF.FactorGraph()
# fgl.sessionname=sessionname
# # fgl.robotname = ?
# # registerCallback!(fgl, RoME.getSample) # RoME.evalPotention
# return fgl
# end

"""
$(SIGNATURES)
Expand Down
2 changes: 1 addition & 1 deletion test/testManifoldsPose2Equivalent.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ using RoME, Distributions
# using RoMEPlotting

using ApproxManifoldProducts
const AMP = ApproxManifoldProducts
# const AMP = ApproxManifoldProducts

##

Expand Down

0 comments on commit 90d5b28

Please sign in to comment.