Skip to content

Commit 1197c7c

Browse files
committed
test (except some compare and CGFG) pass
1 parent 5f53602 commit 1197c7c

File tree

6 files changed

+22
-20
lines changed

6 files changed

+22
-20
lines changed

src/BigData/BigData.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ include("services/FileDataStore.jl")
1010

1111
export AbstractDataStore
1212

13-
export GeneralBigDataEntry, MongodbBigDataEntry, FileBigDataEntry
13+
export AbstractBigDataEntry, GeneralBigDataEntry, MongodbBigDataEntry, FileBigDataEntry
1414
export InMemoryDataStore, FileDataStore
1515

1616
export getBigData, addBigData!, updateBigData!, deleteBigData!, listStoreEntries

src/CommonAccessors.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,6 @@ $SIGNATURES
5858
5959
Return the internal ID for a variable.
6060
"""
61-
getInternalId(v::DataLevel1) = v._dfgNodeParams._internalId
61+
getInternalId(v::DataLevel2) = v._dfgNodeParams._internalId
62+
63+
getInternalId(v::Union{DFGVariableSummary, DFGFactorSummary}) = v._internalId

src/entities/SkeletonDFGFactor.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ struct SkeletonDFGFactor <: AbstractDFGFactor
1919
end
2020

2121
#NOTE I feel like a want to force a variableOrderSymbols
22-
SkeletonDFGFactor(label::Symbol, variableOrderSymbols::Vector{Symbol} = Symbol[]) = SkeletonDFGFactor(label, Symbol[], variableOrderSymbols)
22+
SkeletonDFGFactor(label::Symbol, variableOrderSymbols::Vector{Symbol} = Symbol[]) = SkeletonDFGFactor(label, Set{Symbol}(), variableOrderSymbols)

src/entities/SkeletonDFGVariable.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ struct SkeletonDFGVariable <: AbstractDFGVariable
1616
tags::Set{Symbol}
1717
end
1818

19-
SkeletonDFGVariable(label::Symbol) = SkeletonDFGVariable(label, Symbol[])
19+
SkeletonDFGVariable(label::Symbol) = SkeletonDFGVariable(label, Set{Symbol}())

test/DataStoreTests.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ v1 = DFGVariable(:a, TestInferenceVariable1())
1010
v2 = DFGVariable(:b, TestInferenceVariable1())
1111
f1 = DFGFactor{Int, :Symbol}(:f1)
1212
#add tags for filters
13-
append!(v1.tags, [:VARIABLE, :POSE])
14-
append!(v2.tags, [:VARIABLE, :LANDMARK])
15-
append!(f1.tags, [:FACTOR])
13+
union!(v1.tags, [:VARIABLE, :POSE])
14+
union!(v2.tags, [:VARIABLE, :LANDMARK])
15+
union!(f1.tags, [:FACTOR])
1616
# @testset "Creating Graphs" begin
1717
addVariable!(dfg, v1)
1818
addVariable!(dfg, v2)

test/LightDFGSummaryTypes.jl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11

22
dfg = LightDFG{NoSolverParams, VARTYPE, FACTYPE}()
3-
DistributedFactorGraphs.DFGVariableSummary(label::Symbol) = DFGVariableSummary(label, DistributedFactorGraphs.now(), Symbol[], Dict{Symbol, MeanMaxPPE}(), :NA, 0)
4-
DistributedFactorGraphs.DFGFactorSummary(label::Symbol) = DFGFactorSummary(label, Symbol[], 0, Symbol[])
3+
DistributedFactorGraphs.DFGVariableSummary(label::Symbol) = DFGVariableSummary(label, DistributedFactorGraphs.now(), Set{Symbol}(), Dict{Symbol, MeanMaxPPE}(), :Pose2, Dict{Symbol,AbstractBigDataEntry}(), 0)
4+
DistributedFactorGraphs.DFGFactorSummary(label::Symbol) = DFGFactorSummary(label, DistributedFactorGraphs.now(), Set{Symbol}(), 0, Symbol[])
55

66
v1 = VARTYPE(:a)
77
v2 = VARTYPE(:b)
88
f1 = FACTYPE(:f1)
99

1010
#add tags for filters
11-
append!(v1.tags, [:VARIABLE, :POSE])
12-
append!(v2.tags, [:VARIABLE, :LANDMARK])
13-
append!(f1.tags, [:FACTOR])
11+
union!(v1.tags, [:VARIABLE, :POSE])
12+
union!(v2.tags, [:VARIABLE, :LANDMARK])
13+
union!(f1.tags, [:FACTOR])
1414

1515
#Force softtypename
16-
isa(v1, DFGVariableSummary) && (v1.softtypename = :Pose2)
16+
# isa(v1, DFGVariableSummary) && (v1.softtypename = :Pose2)
1717

1818
# @testset "Creating Graphs" begin
1919
global dfg,v1,v2,f1
@@ -102,7 +102,7 @@ end
102102
@test getVariablePPEs(v1) == v1.ppeDict
103103
@test getVariablePPE(v1, :notfound) == nothing
104104
@test getSofttype(v1) == :Pose2
105-
@test internalId(v1) == v1._internalId
105+
@test getInternalId(v1) == v1._internalId
106106
end
107107
# @test solverData(v1) === v1.solverDataDict[:default]
108108
# @test getData(v1) === v1.solverDataDict[:default]
@@ -117,7 +117,7 @@ end
117117
# @test getData(f1) == f1.data
118118
# Internal function
119119
if FACTYPE == DFGFactorSummary
120-
@test internalId(f1) == f1._internalId
120+
@test getInternalId(f1) == f1._internalId
121121
end
122122

123123
end
@@ -164,12 +164,12 @@ end
164164
@testset "Adjacency Matrices" begin
165165
global dfg,v1,v2,f1
166166
# Normal
167-
adjMat = getAdjacencyMatrix(dfg)
168-
@test size(adjMat) == (2,4)
169-
@test symdiff(adjMat[1, :], [nothing, :a, :b, :orphan]) == Symbol[]
170-
@test symdiff(adjMat[2, :], [:f1, :f1, :f1, nothing]) == Symbol[]
167+
@test_throws ErrorException getAdjacencyMatrix(dfg)
168+
# @test size(adjMat) == (2,4)
169+
# @test symdiff(adjMat[1, :], [nothing, :a, :b, :orphan]) == Symbol[]
170+
# @test symdiff(adjMat[2, :], [:f1, :f1, :f1, nothing]) == Symbol[]
171171
#sparse
172-
adjMat, v_ll, f_ll = getAdjacencyMatrixSparse(dfg)
172+
adjMat, v_ll, f_ll = getBiadjacencyMatrix(dfg)
173173
@test size(adjMat) == (1,3)
174174

175175
# Checking the elements of adjacency, its not sorted so need indexing function

0 commit comments

Comments
 (0)