@@ -119,9 +119,13 @@ function solveGraphParametric2(
119
119
return d, result, flatvar. idx, Σ
120
120
end
121
121
122
+ # #==============================================================================
123
+ # # Deprecate code below before v0.37
124
+ # #==============================================================================
125
+
122
126
123
127
# #==============================================================================
124
- # # Deprecate code below before v0.35
128
+ # # Deprecate code below before v0.36
125
129
# #==============================================================================
126
130
127
131
# exportimg(pl) = error("Please do `using Gadfly` to allow image export.")
@@ -193,123 +197,6 @@ predictbelief(w...;asPartial::Bool=false,kw...) = begin
193
197
getPoints (bel), ipc
194
198
end
195
199
196
- # """
197
- # $SIGNATURES
198
-
199
- # This is an old function name that will be replaced by [`propagateBelief`](@ref).
200
- # """
201
- # function predictbelief(
202
- # dfg::AbstractDFG,
203
- # destvert::DFGVariable,
204
- # factors::AbstractVector; #{<:DFGFactor};
205
- # asPartial::Bool = false,
206
- # kw...,
207
- # )
208
- # #
209
- # # new
210
- # mkd, ifd = propagateBelief(dfg, destvert, factors; kw...)
211
-
212
- # # legacy interface
213
- # return getPoints(mkd, asPartial), ifd
214
- # end
215
-
216
- # function predictbelief(
217
- # dfg::AbstractDFG,
218
- # destlbl::Symbol,
219
- # fctlbls::AbstractVector{Symbol};
220
- # kw...,
221
- # )
222
- # return predictbelief(
223
- # dfg,
224
- # getVariable(dfg, destlbl),
225
- # map(x -> getFactor(dfg, x), fctlbls);
226
- # kw...,
227
- # )
228
- # end
229
- # #
230
-
231
- # function predictbelief(dfg::AbstractDFG, destlbl::Symbol, ::Colon; kw...)
232
- # return predictbelief(dfg, destlbl, getNeighbors(dfg, destlbl); kw...)
233
- # end
234
- #
235
-
236
- # #==============================================================================
237
- # # Deprecate code below before v0.34
238
- # #==============================================================================
239
-
240
-
241
- # function CommonConvWrapper(
242
- # usrfnc::T,
243
- # fullvariables, #::Tuple ::Vector{<:DFGVariable};
244
- # varValsAll::Tuple,
245
- # X::AbstractVector{P}; #TODO remove X completely
246
- # # xDim::Int = size(X, 1),
247
- # userCache::CT = nothing,
248
- # manifold = getManifold(usrfnc),
249
- # partialDims::AbstractVector{<:Integer} = 1:length(X),
250
- # partial::Bool = false,
251
- # nullhypo::Real = 0,
252
- # inflation::Real = 3.0,
253
- # hypotheses::H = nothing,
254
- # certainhypo = nothing,
255
- # activehypo = collect(1:length(varValsAll)),
256
- # measurement::AbstractVector = Vector(Vector{Float64}()),
257
- # varidx::Int = 1,
258
- # particleidx::Int = 1,
259
- # res::AbstractVector{<:Real} = zeros(manifold_dimension(manifold)), # zDim
260
- # gradients = nothing,
261
- # ) where {T <: AbstractFactor, P, H, CT}
262
- # #
263
- # return CommonConvWrapper(
264
- # usrfnc,
265
- # tuple(fullvariables...),
266
- # varValsAll,
267
- # userCache,
268
- # manifold,
269
- # partialDims,
270
- # partial,
271
- # # xDim,
272
- # float(nullhypo),
273
- # float(inflation),
274
- # hypotheses,
275
- # certainhypo,
276
- # activehypo,
277
- # measurement,
278
- # Ref(varidx),
279
- # Ref(particleidx),
280
- # res,
281
- # gradients,
282
- # )
283
- # end
284
-
285
- # function approxConvOnElements!(
286
- # ccwl::Union{CommonConvWrapper{F}, CommonConvWrapper{Mixture{N_, F, S, T}}},
287
- # elements::Union{Vector{Int}, UnitRange{Int}},
288
- # ::Type{<:MultiThreaded},
289
- # _slack = nothing,
290
- # ) where {N_, F <: AbstractRelative, S, T}
291
- # #
292
- # return error(
293
- # "MultiThreaded `approxConvOnElements!` is deprecated and will soon be replaced",
294
- # )
295
- # # Threads.@threads for n in elements
296
- # # # ccwl.thrid_ = Threads.threadid()
297
- # # ccwl.cpt[Threads.threadid()].particleidx = n
298
-
299
- # # # ccall(:jl_, Nothing, (Any,), "starting loop, thrid_=$(Threads.threadid()), partidx=$(ccwl.cpt[Threads.threadid()].particleidx)")
300
- # # _solveCCWNumeric!( ccwl, _slack=_slack)
301
- # # end
302
- # # nothing
303
- # end
304
-
305
- # function approxConvOnElements!(
306
- # ccwl::Union{CommonConvWrapper{F}, CommonConvWrapper{Mixture{N_, F, S, T}}},
307
- # elements::Union{Vector{Int}, UnitRange{Int}},
308
- # _slack = nothing,
309
- # ) where {N_, F <: AbstractRelative, S, T}
310
- # #
311
- # return approxConvOnElements!(ccwl, elements, ccwl.threadmodel, _slack)
312
- # end
313
200
314
201
# more legacy, dont delete yet
315
202
function Base. getproperty (ccw:: CommonConvWrapper , f:: Symbol )
@@ -337,10 +224,26 @@ function Base.getproperty(ccw::CommonConvWrapper, f::Symbol)
337
224
end
338
225
339
226
227
+ # function __init__()
228
+ # # @require InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" include(
229
+ # # "services/RequireInteractiveUtils.jl",
230
+ # # )
231
+ # # @require Gadfly = "c91e804a-d5a3-530f-b6f0-dfbca275c004" include(
232
+ # # "services/EmbeddedPlottingUtils.jl",
233
+ # # )
234
+ # # @require DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa" include(
235
+ # # "ODE/DERelative.jl",
236
+ # # )
237
+ # # @require Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" include(
238
+ # # "services/HeatmapSampler.jl",
239
+ # # )
240
+
241
+ # # # combining neural networks natively into the non-Gaussian factor graph object
242
+ # # @require Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c" begin
243
+ # # # include("Flux/FluxModelsDistribution.jl")
244
+ # # include("Serialization/services/FluxModelsSerialization.jl") # uses BSON
245
+ # # end
246
+ # end
340
247
341
248
342
- # #==============================================================================
343
- # # Deprecate code below before v0.35
344
- # #==============================================================================
345
-
346
249
# #
0 commit comments