Skip to content

Commit e56eda7

Browse files
committed
Shuffling code
1 parent 9e084ca commit e56eda7

File tree

7 files changed

+25
-66
lines changed

7 files changed

+25
-66
lines changed

src/DistributedFactorGraphs.jl

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,18 @@ using LinearAlgebra
1111
using SparseArrays
1212

1313
# Entities
14-
include("entities/AbstractTypes.jl")
14+
include("entities/AbstractDFG.jl")
1515
include("entities/DFGFactor.jl")
1616
include("entities/DFGVariable.jl")
17+
include("entities/AbstractDFGSummary.jl")
1718

1819
export AbstractDFG
1920
export AbstractParams, NoSolverParams
20-
export DFGNode
21-
22-
export DFGFactor
21+
export DFGNode, DFGVariable, DFGFactor
2322
export InferenceType, PackedInferenceType, FunctorInferenceType, InferenceVariable, ConvolutionObject
24-
2523
export FunctorSingleton, FunctorPairwise, FunctorPairwiseMinimize
26-
27-
export DFGVariable
28-
export label, timestamp, tags, estimates, estimate, solverData, getData, solverDataDict, internalId, smallData, bigData
29-
export setSolverData
30-
export label, data, id
24+
export label, timestamp, tags, estimates, estimate, data, solverData, getData, solverDataDict, setSolverData, internalId, smallData, bigData
25+
export DFGVariableSummary, DFGFactorSummary, AbstractDFGSummary
3126

3227
# Services/AbstractDFG Exports
3328
export hasFactor, hasVariable, isInitialized, getFactorFunction, isVariable, isFactor

src/GraphsDFG/services/GraphsDFG.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,3 @@ function toDotFile(dfg::GraphsDFG, fileName::String="/tmp/dfg.dot")::Nothing
431431
end
432432
return nothing
433433
end
434-
435-
function getSummary()
436-
error("TODO")
437-
end
File renamed without changes.

src/entities/AbstractDFGSummary.jl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
"""
2+
$(SIGNATURES)
3+
Structure for a graph summary.
4+
"""
5+
struct AbstractDFGSummary
6+
variables::Dict{Symbol, DFGVariableSummary}
7+
factors::Dict{Symbol, DFGFactorSummary}
8+
userId::String
9+
robotId::String
10+
sessionId::String
11+
end

src/entities/DFGAPI.jl

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/services/AbstractDFG.jl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,3 +525,11 @@ function toDotFile(dfg::AbstractDFG, fileName::String="/tmp/dfg.dot")::Nothing
525525
end
526526
return nothing
527527
end
528+
529+
function getSummary(dfg::G)::AbstractDFGSummary where {G <: AbstractDFG}
530+
error("getSummary not implemented for $(typeof(dfg))")
531+
end
532+
533+
function getSummaryGraph(dfg::G) where {G <: AbstractDFG}
534+
error("getSummaryGraph not implemented for $(typeof(dfg))")
535+
end

test/interfaceTests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ end
8686

8787
# Accessors
8888
@test label(v1) == v1.label
89-
@test tags(v1) = v1.tags
89+
@test tags(v1) == v1.tags
9090
@test timestamp(v1) == v1.timestamp
9191
@test estimates(v1) == v1.estimateDict
9292
@test estimate(v1, :notfound) == nothing

0 commit comments

Comments
 (0)