1
1
"""
2
2
$(TYPEDEF)
3
3
"""
4
- mutable struct VariableNodeData
4
+ mutable struct VariableNodeData{T <: Any }
5
5
val:: Array{Float64,2}
6
6
bw:: Array{Float64,2}
7
7
BayesNetOutVertIDs:: Array{Symbol,1}
@@ -10,31 +10,17 @@ mutable struct VariableNodeData
10
10
eliminated:: Bool
11
11
BayesNetVertID:: Symbol # Union{Nothing, }
12
12
separator:: Array{Symbol,1}
13
- softtype
13
+ softtype:: T
14
14
initialized:: Bool
15
15
inferdim:: Float64
16
16
ismargin:: Bool
17
17
dontmargin:: Bool
18
18
# Tonio surprise TODO
19
19
# frontalonly::Bool
20
20
# 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 )
22
- VariableNodeData (x1:: Array{Float64,2} ,
23
- x2:: Array{Float64,2} ,
24
- x3:: Vector{Symbol} ,
25
- x4:: Vector{Int} ,
26
- x5:: Int ,
27
- x6:: Bool ,
28
- x7:: Symbol ,
29
- x8:: Vector{Symbol} ,
30
- # x9::Dict{ Tuple{Symbol, Vector{Float64}} }, # Union{Nothing, },
31
- x10,
32
- x11:: Bool ,
33
- x12:: Float64 ,
34
- x13:: Bool ,
35
- x14:: Bool ) =
36
- new (x1,x2,x3,x4,x5,x6,x7,x8,x10,x11,x12,x13,x14)
21
+
37
22
end
23
+ VariableNodeData () = VariableNodeData (zeros (1 ,1 ), zeros (1 ,1 ), Symbol[], Int[], 0 , false , :NOTHING , Symbol[], " " , false , 0.0 , false , false )
38
24
39
25
"""
40
26
$(TYPEDEF)
@@ -78,8 +64,8 @@ struct VariableEstimate
78
64
type:: Symbol
79
65
estimate:: Vector{Float64}
80
66
lastUpdatedTimestamp:: DateTime
81
- VariableEstimate (solverKey:: Symbol , type:: Symbol , estimate:: Vector{Float64} , lastUpdatedTimestamp:: DateTime = now ()) = new (solverKey, type, estimate, lastUpdatedTimestamp)
82
67
end
68
+ VariableEstimate (solverKey:: Symbol , type:: Symbol , estimate:: Vector{Float64} ) = VariableEstimate (solverKey, type, estimate, now ())
83
69
84
70
"""
85
71
$(TYPEDEF)
@@ -127,7 +113,12 @@ solverData(v::DFGVariable, key::Symbol=:default) = haskey(v.solverDataDict, key)
127
113
Retrieve data structure stored in a variable.
128
114
"""
129
115
function getData (v:: DFGVariable ; solveKey:: Symbol = :default ):: VariableNodeData
130
- @warn " getData is deprecated, please use solverData()"
116
+ # FIXME but back in later, it just slows everything down
117
+ if ! (@isdefined getDataWarnOnce)
118
+ @warn " getData is deprecated, please use solverData(), future warnings in getData is suppressed"
119
+ global getDataWarnOnce = true
120
+ end
121
+ # @warn "getData is deprecated, please use solverData()"
131
122
return v. solverDataDict[solveKey]
132
123
end
133
124
"""
0 commit comments