Skip to content

Commit 7add0af

Browse files
committed
moving functor definitions to dfg
1 parent 5af96b0 commit 7add0af

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

src/Common.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11

22
export sortVarNested
3+
export isPrior, lsfPriors
4+
export getData
5+
export getVariableType, getSofttype
6+
export getFactorType, getfnctype
7+
38

49
"""
510
$(SIGNATURES)
@@ -175,7 +180,7 @@ end
175180
176181
Return the DFGVariable softtype in factor graph `dfg<:AbstractDFG` and label `::Symbol`.
177182
"""
178-
getVariableType(var::DFGVariable; solveKey::Symbol=:default) = getSofttype(var, solvekey=solvekey)
183+
getVariableType(var::DFGVariable; solveKey::Symbol=:default) = getSofttype(var, solvekey=solveKey)
179184
function getVariableType(dfg::G, lbl::Symbol; solveKey::Symbol=:default) where G <: AbstractDFG
180185
getVariableType(getVariable(dfg, lbl), solveKey=solveKey)
181186
end

src/DistributedFactorGraphs.jl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ export DFGNode
2020
export DFGFactor
2121
export InferenceType, PackedInferenceType, FunctorInferenceType, InferenceVariable, ConvolutionObject
2222

23+
export FunctorSingleton, FunctorPairwise, FunctorPairwiseMinimize
24+
2325
export DFGVariable
2426
export label, timestamp, tags, estimates, estimate, solverData, solverDataDict, id, smallData, bigData
2527
export setSolverData
@@ -31,11 +33,6 @@ export GenericFunctionNodeData#, FunctionNodeData
3133
export getSerializationModule, setSerializationModule!
3234
export pack, unpack
3335

34-
export isPrior, lsfPriors
35-
export getData
36-
export getVariableType, getSofttype
37-
export getFactorType, getfnctype
38-
3936
include("services/AbstractDFG.jl")
4037
include("services/DFGVariable.jl")
4138

src/entities/DFGFactor.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ abstract type FunctorInferenceType <: Function end
99
abstract type InferenceVariable end
1010
abstract type ConvolutionObject <: Function end
1111

12+
abstract type FunctorSingleton <: FunctorInferenceType end
13+
abstract type FunctorPairwise <: FunctorInferenceType end
14+
abstract type FunctorPairwiseMinimize <: FunctorInferenceType end
15+
1216
"""
1317
$(TYPEDEF)
1418
"""

0 commit comments

Comments
 (0)