Skip to content

Commit d92b175

Browse files
AffieAffie
committed
remove unused fields in CGDFG
1 parent ed277f1 commit d92b175

File tree

8 files changed

+4
-52
lines changed

8 files changed

+4
-52
lines changed

‎src/CloudGraphsDFG/entities/CloudGraphsDFG.jl

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ mutable struct CloudGraphsDFG{T <: AbstractParams} <: AbstractDFG{T}
1111
robotId::String
1212
sessionId::String
1313
description::String
14-
encodePackedTypeFunc #TODO Is this planed to be used or deprecated?
15-
getPackedTypeFunc #TODO Is this planed to be used or deprecated?
16-
decodePackedTypeFunc #TODO Is this planed to be used or deprecated?
17-
rebuildFactorMetadata!
1814
addHistory::Vector{Symbol}
1915
solverParams::T # Solver parameters
2016
end
@@ -27,11 +23,7 @@ function CloudGraphsDFG{T}(neo4jConnection::Neo4j.Connection,
2723
userId::String,
2824
robotId::String,
2925
sessionId::String,
30-
description::String,
31-
encodePackedTypeFunc,
32-
getPackedTypeFunc,
33-
decodePackedTypeFunc,
34-
rebuildFactorMetadata!;
26+
description::String;
3527
solverParams::T=NoSolverParams(),
3628
createSessionNodes::Bool=true) where T <: AbstractParams
3729
# Validate the userId, robotId, and sessionId
@@ -41,7 +33,7 @@ function CloudGraphsDFG{T}(neo4jConnection::Neo4j.Connection,
4133

4234
graph = Neo4j.getgraph(neo4jConnection)
4335
neo4jInstance = Neo4jInstance(neo4jConnection, graph)
44-
dfg = CloudGraphsDFG{T}(neo4jInstance, userId, robotId, sessionId, description, encodePackedTypeFunc, getPackedTypeFunc, decodePackedTypeFunc, rebuildFactorMetadata!, Symbol[], solverParams)
36+
dfg = CloudGraphsDFG{T}(neo4jInstance, userId, robotId, sessionId, description, Symbol[], solverParams)
4537
# Create the session if it doesn't already exist
4638
createSessionNodes && createDfgSessionIfNotExist(dfg)
4739
return dfg
@@ -57,15 +49,11 @@ function CloudGraphsDFG{T}(host::String,
5749
userId::String,
5850
robotId::String,
5951
sessionId::String,
60-
description::String,
61-
encodePackedTypeFunc,
62-
getPackedTypeFunc,
63-
decodePackedTypeFunc,
64-
rebuildFactorMetadata!;
52+
description::String;
6553
solverParams::T=NoSolverParams(),
6654
createSessionNodes::Bool=true) where T <: AbstractParams
6755
neo4jConnection = Neo4j.Connection(host, port=port, user=dbUser, password=dbPassword);
68-
return CloudGraphsDFG{T}(neo4jConnection, userId, robotId, sessionId, description, encodePackedTypeFunc, getPackedTypeFunc, decodePackedTypeFunc, rebuildFactorMetadata!, solverParams=solverParams, createSessionNodes=createSessionNodes)
56+
return CloudGraphsDFG{T}(neo4jConnection, userId, robotId, sessionId, description, solverParams=solverParams, createSessionNodes=createSessionNodes)
6957
end
7058

7159

‎src/CloudGraphsDFG/services/CloudGraphsDFG.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ function _getDuplicatedEmptyDFG(dfg::CloudGraphsDFG)::CloudGraphsDFG
1818
dfg.robotId,
1919
sessionId,
2020
dfg.description,
21-
dfg.encodePackedTypeFunc,
22-
dfg.getPackedTypeFunc,
23-
dfg.decodePackedTypeFunc,
24-
dfg.rebuildFactorMetadata!,
2521
solverParams=deepcopy(dfg.solverParams))
2622
end
2723

‎test/CGStructureTests.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
dfg = CloudGraphsDFG{SolverParams}("localhost", 7474, "neo4j", "test",
22
"testUser", "testRobot", "testSession",
33
"Description of test session",
4-
nothing,
5-
nothing,
6-
nothing,
7-
nothing,
84
solverParams=SolverParams())
95

106
# Nuke the user

‎test/IIF4DoorsTests.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ using IncrementalInference
77

88
DistributedFactorGraphs.CloudGraphsDFG{SolverParams}() = CloudGraphsDFG{SolverParams}("localhost", 7474, "neo4j", "test",
99
"testUser", "testRobot", "testSession",
10-
nothing,
11-
nothing,
12-
nothing,
13-
nothing,
1410
solverParams=SolverParams())
1511

1612
N=100

‎test/consolInterfaceDev.jl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ function DFG.CloudGraphsDFG(; hostname="localhost",
3535
robotId,
3636
sessionId,
3737
description,
38-
nothing,
39-
nothing,
40-
nothing,
41-
nothing,
4238
solverParams=params)
4339

4440
setUserData!(cgfg, Dict{Symbol, String}())
@@ -70,10 +66,6 @@ function DFG.CloudGraphsDFG(description::String,
7066
robotId,
7167
sessionId,
7268
description,
73-
nothing,
74-
nothing,
75-
nothing,
76-
nothing,
7769
solverParams=solverParams)
7870

7971

‎test/iifInterfaceTests.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ end
3838
dfg2 = CloudGraphsDFG{SolverParams}("localhost", 7474, "neo4j", "test",
3939
"testUser", "testRobot", "testSession2",
4040
"Description of test session 2",
41-
nothing,
42-
nothing,
43-
nothing,
44-
nothing,
4541
solverParams=SolverParams())
4642
else
4743
dfg2 = T()

‎test/runtests.jl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@ if get(ENV, "IIF_TEST", "") == "true"
9090
CloudGraphsDFG{SolverParams}("localhost", 7474, "neo4j", "test",
9191
"testUser", "testRobot", "testSession",
9292
"Description of test Session",
93-
nothing,
94-
nothing,
95-
nothing,
96-
nothing,
9793
solverParams=SolverParams())
9894
]
9995
for api in apis
@@ -129,10 +125,6 @@ if get(ENV, "IIF_TEST", "") == "true"
129125
CloudGraphsDFG{SolverParams}("localhost", 7474, "neo4j", "test",
130126
"testUser", "testRobot", "simpleSolveSession",
131127
"Description of test Session",
132-
nothing,
133-
nothing,
134-
nothing,
135-
nothing,
136128
solverParams=SolverParams())
137129
]
138130
for api in apis

‎test/testFurther.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ using IncrementalInference
44
dfg = CloudGraphsDFG{SolverParams}("localhost", 7474, "neo4j", "test",
55
"testUser", "testRobot", "testSession",
66
"description of test session",
7-
nothing,
8-
nothing,
9-
nothing,
10-
nothing,
117
solverParams=SolverParams())
128

139
# Nuke the user

0 commit comments

Comments
 (0)