Skip to content

Commit a567b27

Browse files
Up Manifolds compat (#1186)
* Bump compat for ManifoldsBase to 2 and rm Manifolds dependancy (#1175) * rm DataStructures dependancy * use IIFType develop branch * bump to v0.28.1 --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Johannes Terblanche <[email protected]>
1 parent db55752 commit a567b27

File tree

5 files changed

+10
-24
lines changed

5 files changed

+10
-24
lines changed

Project.toml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "DistributedFactorGraphs"
22
uuid = "b5cc3c7e-6572-11e9-2517-99fb8daf2f04"
3-
version = "0.28.0"
3+
version = "0.28.1"
44

55
[deps]
66
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -46,7 +46,6 @@ Base64 = "1.10"
4646
CSV = "0.10"
4747
CodecZlib = "0.7"
4848
Colors = "0.10, 0.11, 0.12, 0.13"
49-
DataStructures = "0.18"
5049
Dates = "1.10"
5150
Distributions = "0.23, 0.24, 0.25"
5251
DocStringExtensions = "0.8, 0.9"
@@ -55,9 +54,9 @@ GraphMakie = "0.5.14, 0.6"
5554
Graphs = "1.4"
5655
InteractiveUtils = "1.10"
5756
JSON3 = "1"
57+
LieGroups = "0.1"
5858
LinearAlgebra = "1.10"
59-
Manifolds = "0.9, 0.10"
60-
ManifoldsBase = "0.14, 0.15, 1"
59+
ManifoldsBase = "1, 2"
6160
OrderedCollections = "1.4"
6261
Pkg = "1.4, 1.5"
6362
ProgressMeter = "1"
@@ -75,18 +74,15 @@ Test = "1.10"
7574
TimeZones = "1.3.1"
7675
UUIDs = "1.10"
7776
julia = "1.10"
78-
LieGroups = "0.1"
7977

8078
[extras]
8179
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
82-
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
8380
GraphMakie = "1ecd5474-83a3-4783-bb4f-06765db800d2"
8481
LieGroups = "6774de46-80ba-43f8-ba42-e41071ccfc5f"
8582
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
86-
Manifolds = "1cead3c2-87b3-11e9-0ccd-23c62b72b94e"
8783
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
8884
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
8985
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
9086

9187
[targets]
92-
test = ["Aqua", "Test", "DataStructures", "GraphMakie", "LinearAlgebra", "Manifolds", "Pkg", "Statistics", "LieGroups"]
88+
test = ["Aqua", "Test", "GraphMakie", "LinearAlgebra", "Pkg", "Statistics", "LieGroups"]

test/plottingTest.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ using GraphMakie
22
using DistributedFactorGraphs
33
# using DistributedFactorGraphs.DFGPlots
44
using Test
5-
using Manifolds
6-
5+
using LieGroups
76
##
87

98
# struct TestInferenceVariable1 <: StateType end
10-
@defStateType TestInferenceVariable1 Euclidean(1) [0.0;]
9+
@defStateType TestInferenceVariable1 TranslationGroup(1) [0.0;]
1110

1211
# Now make a complex graph for connectivity tests
1312
numNodes = 10

test/runtests.jl

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,7 @@ if get(ENV, "IIF_TEST", "true") == "true"
6969
Pkg.add(PackageSpec(; name = "ApproxManifoldProducts", rev = "develop"))
7070
#FIXME This is a temporary fix to use the develop branch of IIF.
7171
# Pkg.add(PackageSpec(; name = "IncrementalInference", rev = "upstream/dfg_integration_test"))
72-
# Pkg.add(PackageSpec(; name = "IncrementalInference", rev = "develop"))
73-
Pkg.add(
74-
PackageSpec(;
75-
url = "https://github.com/JuliaRobotics/IncrementalInference.jl.git",
76-
subdir = "IncrementalInferenceTypes",
77-
rev = "develop",
78-
),
79-
)
72+
Pkg.add(PackageSpec(; name = "IncrementalInferenceTypes", rev = "develop"))
8073
Pkg.add(
8174
PackageSpec(;
8275
url = "https://github.com/JuliaRobotics/IncrementalInference.jl.git",

test/testBlocks.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ using Test
33
using Dates
44
using LieGroups
55
using LieGroups: TranslationGroup
6-
# using Manifolds
76

87
using DistributedFactorGraphs:
98
LabelExistsError,

test/test_defVariable.jl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using LieGroups
2-
using Manifolds
32
using Test
43
using LinearAlgebra
54

@@ -12,7 +11,7 @@ using LinearAlgebra
1211

1312
##
1413

15-
@defStateType(TestVarType1, Euclidean(3), zeros(3))
14+
@defStateType(TestVarType1, TranslationGroup(3), zeros(3))
1615
@defStateType(
1716
TestVarType2,
1817
SpecialEuclideanGroup(3),
@@ -21,7 +20,7 @@ using LinearAlgebra
2120

2221
##
2322

24-
@test getManifold(TestVarType1) == Euclidean(3)
23+
@test getManifold(TestVarType1) == TranslationGroup(3)
2524
@test getManifold(TestVarType2) == SpecialEuclideanGroup(3)
2625

2726
@test getDimension(TestVarType1) === 3
@@ -39,7 +38,7 @@ using LinearAlgebra
3938

4039
##
4140

42-
@test getManifold(TestVarType1()) == Euclidean(3)
41+
@test getManifold(TestVarType1()) == TranslationGroup(3)
4342
@test getManifold(TestVarType2()) == SpecialEuclideanGroup(3)
4443

4544
@test getDimension(TestVarType1()) === 3

0 commit comments

Comments
 (0)