Skip to content

Commit 7d3d2b5

Browse files
dehanndehann
committed
rm depr pre-v0.19
1 parent 22d328d commit 7d3d2b5

File tree

1 file changed

+63
-66
lines changed

1 file changed

+63
-66
lines changed

‎src/Deprecated.jl

Lines changed: 63 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -60,95 +60,92 @@ function getTypeFromSerializationModule(dfg::G, moduleType::Symbol) where G <: A
6060
end
6161

6262
## ================================================================================
63-
## Deprecate before v0.19 - Kept longer with error
63+
## Deprecate before v0.20
6464
##=================================================================================
6565

66-
Base.getproperty(x::VariableNodeData,f::Symbol) = begin
67-
if f == :inferdim
68-
error("vnd.inferdim::Float64 was deprecated and is now obsolete, use vnd.infoPerCoord::Vector{Float64} instead")
69-
else
70-
getfield(x,f)
71-
end
72-
end
73-
74-
function Base.setproperty!(x::VariableNodeData, f::Symbol, val)
75-
if f == :inferdim
76-
error("vnd.inferdim::Float64 was deprecated and is now obsolete, use vnd.infoPerCoord::Vector{Float64} instead")
77-
end
78-
return setfield!(x, f, convert(fieldtype(typeof(x), f), val))
79-
end
80-
81-
Base.getproperty(x::PackedVariableNodeData,f::Symbol) = begin
82-
if f == :inferdim
83-
error("pvnd.inferdim::Float64 was deprecated and is now obsolete, use vnd.infoPerCoord::Vector{Float64} instead")
84-
else
85-
getfield(x,f)
86-
end
87-
end
88-
89-
function Base.setproperty!(x::PackedVariableNodeData, f::Symbol, val)
90-
if f == :inferdim
91-
error("pvnd.inferdim::Float64 was deprecated and is now obsolete, use vnd.infoPerCoord::Vector{Float64} instead")
92-
end
93-
return setfield!(x, f, convert(fieldtype(typeof(x), f), val))
94-
end
66+
export DefaultDFG
9567

68+
const DefaultDFG = GraphsDFG
9669

70+
export LightDFG
71+
LightDFG(args...; kwargs...) = error("LightDFG is deprecated and replaced with GraphsDFG")
9772

98-
function VariableNodeData(val::Vector,
99-
bw::AbstractMatrix{<:Real},
100-
BayesNetOutVertIDs::AbstractVector{Symbol},
101-
dimIDs::AbstractVector{Int},
102-
dims::Int,
103-
eliminated::Bool,
104-
BayesNetVertID::Symbol,
105-
separator::AbstractVector{Symbol},
106-
variableType,
107-
initialized::Bool,
108-
inferdim::Real,
109-
w...; kw...)
110-
error("VariableNodeData field inferdim was deprecated and is now obsolete, use infoPerCoord instead")
111-
end
11273

74+
# better deprecation cycle from before v0.19
75+
@deprecate deepcopySupersolve!(w...;kw...) cloneSolveKey!(w...;kw...)
76+
@deprecate deepcopySolvekeys!(w...;kw...) cloneSolveKey!(w...;kw...)
11377

11478

11579
## ================================================================================
116-
## Deprecate before v0.19
80+
## Deprecate before v0.19 - Kept longer with error
11781
##=================================================================================
11882

119-
# FIXME, change this to a deprecation in v0.19
120-
export deepcopySupersolve!, deepcopySolvekeys!
121-
const deepcopySupersolve! = cloneSolveKey!
122-
# @deprecate deepcopySupersolve!(w...;kw...) cloneSolveKey!(w...;kw...)
123-
const deepcopySolvekeys! = cloneSolveKey!
124-
# @deprecate deepcopySolvekeys!(w...;kw...) cloneSolveKey!(w...;kw...)
83+
# Base.getproperty(x::VariableNodeData,f::Symbol) = begin
84+
# if f == :inferdim
85+
# error("vnd.inferdim::Float64 was deprecated and is now obsolete, use vnd.infoPerCoord::Vector{Float64} instead")
86+
# else
87+
# getfield(x,f)
88+
# end
89+
# end
12590

126-
@deprecate dfgplot(w...;kw...) plotDFG(w...;kw...)
91+
# function Base.setproperty!(x::VariableNodeData, f::Symbol, val)
92+
# if f == :inferdim
93+
# error("vnd.inferdim::Float64 was deprecated and is now obsolete, use vnd.infoPerCoord::Vector{Float64} instead")
94+
# end
95+
# return setfield!(x, f, convert(fieldtype(typeof(x), f), val))
96+
# end
12797

128-
export FunctorInferenceType, PackedInferenceType
98+
# Base.getproperty(x::PackedVariableNodeData,f::Symbol) = begin
99+
# if f == :inferdim
100+
# error("pvnd.inferdim::Float64 was deprecated and is now obsolete, use vnd.infoPerCoord::Vector{Float64} instead")
101+
# else
102+
# getfield(x,f)
103+
# end
104+
# end
129105

130-
const FunctorInferenceType = AbstractFactor # will eventually deprecate
131-
const PackedInferenceType = AbstractPackedFactor # will eventually deprecate
106+
# function Base.setproperty!(x::PackedVariableNodeData, f::Symbol, val)
107+
# if f == :inferdim
108+
# error("pvnd.inferdim::Float64 was deprecated and is now obsolete, use vnd.infoPerCoord::Vector{Float64} instead")
109+
# end
110+
# return setfield!(x, f, convert(fieldtype(typeof(x), f), val))
111+
# end
132112

133-
## ================================================================================
134-
## Deprecate before v0.20
135-
##=================================================================================
136113

137-
export DefaultDFG
138114

139-
const DefaultDFG = GraphsDFG
115+
# function VariableNodeData(val::Vector,
116+
# bw::AbstractMatrix{<:Real},
117+
# BayesNetOutVertIDs::AbstractVector{Symbol},
118+
# dimIDs::AbstractVector{Int},
119+
# dims::Int,
120+
# eliminated::Bool,
121+
# BayesNetVertID::Symbol,
122+
# separator::AbstractVector{Symbol},
123+
# variableType,
124+
# initialized::Bool,
125+
# inferdim::Real,
126+
# w...; kw...)
127+
# error("VariableNodeData field inferdim was deprecated and is now obsolete, use infoPerCoord instead")
128+
# end
140129

141-
export LightDFG
142-
LightDFG(args...; kwargs...) = error("LightDFG is deprecated and replaced with GraphsDFG")
143130

144131

145132
## ================================================================================
146-
## Deprecate before v0.20
133+
## Deprecate before v0.19
147134
##=================================================================================
148135

149-
# FIXME uncomment before start of v0.19
150-
# @deprecate deepcopySupersolve!(w...;kw...) cloneSolveKey!(w...;kw...)
151-
# @deprecate deepcopySolvekeys!(w...;kw...) cloneSolveKey!(w...;kw...)
136+
# # FIXME, change this to a deprecation in v0.19
137+
# export deepcopySupersolve!, deepcopySolvekeys!
138+
# const deepcopySupersolve! = cloneSolveKey!
139+
# # @deprecate deepcopySupersolve!(w...;kw...) cloneSolveKey!(w...;kw...)
140+
# const deepcopySolvekeys! = cloneSolveKey!
141+
# # @deprecate deepcopySolvekeys!(w...;kw...) cloneSolveKey!(w...;kw...)
142+
143+
# @deprecate dfgplot(w...;kw...) plotDFG(w...;kw...)
144+
145+
# export FunctorInferenceType, PackedInferenceType
146+
147+
# const FunctorInferenceType = AbstractFactor # will eventually deprecate
148+
# const PackedInferenceType = AbstractPackedFactor # will eventually deprecate
152149

153150

154151
#

0 commit comments

Comments
 (0)