Skip to content

Commit

Permalink
Merge pull request #1458 from JuliaRobotics/21Q4/depr/gengraph
Browse files Browse the repository at this point in the history
depr api and comments to new gen
  • Loading branch information
dehann authored Nov 19, 2021
2 parents bed9801 + 54c257f commit a22c1a3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/SolverUtilities.jl
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ end
# the point is that only the (0,20) values in newFactor are needed, all calculations are abstracted away.
```
See also: [`RoME.generateCanonicalFG_Honeycomb!`](@ref), [`accumulateFactorMeans`](@ref), [`getPPE`](@ref)
See also: [`RoME.generateGraph_Honeycomb!`](@ref), [`accumulateFactorMeans`](@ref), [`getPPE`](@ref)
"""
function _checkVariableByReference( fg::AbstractDFG,
srcLabel::Symbol,
Expand Down
16 changes: 8 additions & 8 deletions test/testEuclidDistance.jl
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ end

N=100
points = [[100.0;0.0],[0.0;100.0]]
fg = IIF.generateCanonicalFG_EuclidDistance(points)
fg = IIF.generateGraph_EuclidDistance(points)

eo = [:x2; :x1; :l1]

Expand Down Expand Up @@ -110,7 +110,7 @@ L1_[2,:] .-= 100

N=100
points = [[100.0;0.0],[0.0;100.0]]
fg = IIF.generateCanonicalFG_EuclidDistance(points)
fg = IIF.generateGraph_EuclidDistance(points)

# initManual!(fg, :l1, [1000.0.*randn(2) for _ in 1:100])

Expand Down Expand Up @@ -149,7 +149,7 @@ end
# N=100
##
points = [[100.0],]
fg = IIF.generateCanonicalFG_EuclidDistance(points)
fg = IIF.generateGraph_EuclidDistance(points)
solveTree!(fg)

@test isapprox(getPPE(fg, :x1).suggested[1], 100, atol=1)
Expand Down Expand Up @@ -182,28 +182,28 @@ initManual!(fg, :l1, pts_)

## Test zero with x-axis
points = [[100.0;0.0],]
fg = IIF.generateCanonicalFG_EuclidDistance(points)
fg = IIF.generateGraph_EuclidDistance(points)
solveTree!(fg)

## Test zero with y-axis
points = [[0.0;100.0],]
fg = IIF.generateCanonicalFG_EuclidDistance(points)
fg = IIF.generateGraph_EuclidDistance(points)
solveTree!(fg)

## Test zero with xy-axis 2 points
points = [[0.0;100.0],[100.0;0.0]]
fg = IIF.generateCanonicalFG_EuclidDistance(points)
fg = IIF.generateGraph_EuclidDistance(points)
solveTree!(fg)

## Test offsett with xy-axis 2 points
points = [[50.0;100.0],[100.0;50.0]]
fg = IIF.generateCanonicalFG_EuclidDistance(points; dist=50.0)
fg = IIF.generateGraph_EuclidDistance(points; dist=50.0)
solveTree!(fg)
# plotKDE(fg, ls(fg))

## Manual init
points = [[0.0;100.0],[100.0;0.0]]
fg = IIF.generateCanonicalFG_EuclidDistance(points)
fg = IIF.generateGraph_EuclidDistance(points)
getSolverParams(fg).inflation=3.0

initManual!(fg, :x1, [rand(MvNormal([100.,0], [1.,1])) for _ in 1:N])
Expand Down
2 changes: 1 addition & 1 deletion test/testJunctionTreeConstruction.jl
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ end

@testset "Test tree formation and consistent APIs" begin

fg = generateCanonicalFG_TestSymbolic()
fg = generateGraph_TestSymbolic()

#writeGraphPdf(fg, show=true)

Expand Down

0 comments on commit a22c1a3

Please sign in to comment.