Skip to content

Commit 2005021

Browse files
authored
Merge pull request #150 from JuliaRobotics/hotfix/149_DFGVariableSoftype
Towards #149 - Slightly improved without breaking changes.
2 parents 5ba94d2 + 0093ae2 commit 2005021

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/entities/DFGVariable.jl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
#TODO don't know what to do if it is uninitalized
2+
#so for now defining a Singleton for the default
3+
struct SingletonInferenceVariable <: InferenceVariable end
4+
15
"""
26
$(TYPEDEF)
37
"""
4-
mutable struct VariableNodeData
8+
mutable struct VariableNodeData #TODO v0.5.0 {T<:InferenceVariable}
59
val::Array{Float64,2}
610
bw::Array{Float64,2}
711
BayesNetOutVertIDs::Array{Symbol,1}
@@ -10,15 +14,15 @@ mutable struct VariableNodeData
1014
eliminated::Bool
1115
BayesNetVertID::Symbol # Union{Nothing, }
1216
separator::Array{Symbol,1}
13-
softtype
17+
softtype::InferenceVariable #TODO v0.5.0 T
1418
initialized::Bool
1519
inferdim::Float64
1620
ismargin::Bool
1721
dontmargin::Bool
1822
# Tonio surprise TODO
1923
# frontalonly::Bool
2024
# A valid, packable default constructor is needed.
21-
VariableNodeData() = new(zeros(1,1), zeros(1,1), Symbol[], Int[], 0, false, :NOTHING, Symbol[], "", false, false, false, false)
25+
VariableNodeData() = new(zeros(1,1), zeros(1,1), Symbol[], Int[], 0, false, :NOTHING, Symbol[], SingletonInferenceVariable(), false, false, false, false)
2226
VariableNodeData(x1::Array{Float64,2},
2327
x2::Array{Float64,2},
2428
x3::Vector{Symbol},

0 commit comments

Comments
 (0)