Skip to content

Commit 21cddbe

Browse files
committed
bug fix, restore tests
1 parent a3fa4ca commit 21cddbe

File tree

5 files changed

+20
-21
lines changed

5 files changed

+20
-21
lines changed

src/entities/ExtFactors.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ DevNotes
1919
- FIXME Lots of consolidation and standardization to do, see RoME.jl #244 regarding Manifolds.jl.
2020
- TODO does not yet handle case where a factor spans across two timezones.
2121
"""
22-
struct DERelative{T <: InferenceVariable, P, D} <: AbstractRelativeMinimize
22+
struct DERelative{T <: InferenceVariable, P, D} <: AbstractManifoldMinimize # AbstractRelativeMinimize
2323
domain::Type{T}
2424
forwardProblem::P
2525
backwardProblem::P

src/services/GraphInit.jl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,11 @@ Notes:
123123
- Special carve out for multihypo cases, see issue 427.
124124
125125
Development Notes:
126-
> Target factor is first (singletons) or second (dim 2 pairwise) variable vertex in `xi`.
127-
* TODO use DFG properly with local operations and DB update at end.
128-
* TODO get faster version of `isInitialized` for database version.
129-
* TODO: Persist this back if we want to here.
126+
- Target factor is first (singletons) or second (dim 2 pairwise) variable vertex in `xi`.
127+
- TODO use DFG properly with local operations and DB update at end.
128+
- TODO get faster version of `isInitialized` for database version.
129+
- TODO: Persist this back if we want to here.
130+
- TODO: init from just partials
130131
"""
131132
function doautoinit!(
132133
dfg::AbstractDFG,

test/runtests.jl

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ TEST_GROUP = get(ENV, "IIF_TEST_GROUP", "all")
55
# temporarily moved to start (for debugging)
66
#...
77
if TEST_GROUP in ["all", "tmp_debug_group"]
8-
# include("testSpecialOrthogonalMani.jl")
9-
# include("testDERelative.jl")
10-
include("testpartialconstraint.jl")
11-
8+
include("testSpecialOrthogonalMani.jl")
129
include("testMultiHypo3Door.jl")
1310
include("priorusetest.jl")
1411
end
@@ -20,17 +17,18 @@ include("manifolds/factordiff.jl")
2017
include("testSpecialEuclidean2Mani.jl")
2118
include("testEuclidDistance.jl")
2219

23-
# regular testing
24-
include("testSphereMani.jl")
25-
include("testBasicManifolds.jl")
26-
2720
# start as basic as possible and build from there
2821
include("typeReturnMemRef.jl")
2922
include("testDistributionsGeneric.jl")
30-
include("testHeatmapGridDensity.jl")
3123
include("testCliqSolveDbgUtils.jl")
3224
include("basicGraphsOperations.jl")
3325

26+
# regular testing
27+
include("testSphereMani.jl")
28+
include("testBasicManifolds.jl")
29+
include("testDERelative.jl")
30+
include("testHeatmapGridDensity.jl")
31+
3432
# include("TestModuleFunctions.jl")
3533
include("testCompareVariablesFactors.jl")
3634
include("saveconvertertypes.jl")
@@ -59,7 +57,7 @@ include("testDefaultDeconv.jl")
5957

6058
include("testPartialFactors.jl")
6159
include("testPartialPrior.jl")
62-
60+
include("testpartialconstraint.jl")
6361
include("testPartialNH.jl")
6462
include("testMixturePrior.jl")
6563

test/testDERelative.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,10 @@ val0 = getPPESuggested( hists[1][12][4].cliqSubFg[:x0] )
252252

253253
##
254254

255-
@test getPPE(fg, :x0).suggested - x0_val_ref |> norm < 0.1
256-
@test getPPE(fg, :x1).suggested - x1_val_ref |> norm < 0.1
257-
@test getPPE(fg, :x2).suggested - x2_val_ref |> norm < 0.1
258-
@test getPPE(fg, :x3).suggested - x3_val_ref |> norm < 0.1
255+
@test isapprox( getPPE(fg, :x0).suggested, x0_val_ref; atol = 0.1)
256+
@test isapprox( getPPE(fg, :x1).suggested, x1_val_ref; atol = 0.1)
257+
@test isapprox( getPPE(fg, :x2).suggested, x2_val_ref; atol = 0.1)
258+
@test isapprox( getPPE(fg, :x3).suggested, x3_val_ref; atol = 0.1)
259259

260260
##
261261

test/testSpecialEuclidean2Mani.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ function (cf::CalcFactor{<:ManifoldFactorSE2})(X, p, q)
158158
vee!(M, Xc, q, log(M, q, q̂))
159159
return Xc
160160
end
161-
161+
162162
##
163163

164164
@testset "Test Pose2 like hex as SpecialEuclidean2" begin
@@ -314,7 +314,7 @@ doautoinit!(fg, :x1)
314314
vnd = getVariableSolverData(fg, :x1)
315315
@test all(isapprox.(mean(vnd.val), [1.0,2.0], atol=0.1))
316316

317-
# ##
317+
##
318318
smtasks = Task[]
319319
solveTree!(fg; smtasks, verbose=true, recordcliqs=ls(fg))
320320
# # hists = fetchCliqHistoryAll!(smtasks);

0 commit comments

Comments
 (0)