Skip to content

Commit 86e4bb0

Browse files
committed
drop helper constructor for CCW
1 parent 037c0c4 commit 86e4bb0

File tree

3 files changed

+56
-44
lines changed

3 files changed

+56
-44
lines changed

src/Deprecated.jl

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,50 @@ end
116116
## Deprecate code below before v0.34
117117
##==============================================================================
118118

119+
# function CommonConvWrapper(
120+
# usrfnc::T,
121+
# fullvariables, #::Tuple ::Vector{<:DFGVariable};
122+
# varValsAll::Tuple,
123+
# X::AbstractVector{P}; #TODO remove X completely
124+
# # xDim::Int = size(X, 1),
125+
# userCache::CT = nothing,
126+
# manifold = getManifold(usrfnc),
127+
# partialDims::AbstractVector{<:Integer} = 1:length(X),
128+
# partial::Bool = false,
129+
# nullhypo::Real = 0,
130+
# inflation::Real = 3.0,
131+
# hypotheses::H = nothing,
132+
# certainhypo = nothing,
133+
# activehypo = collect(1:length(varValsAll)),
134+
# measurement::AbstractVector = Vector(Vector{Float64}()),
135+
# varidx::Int = 1,
136+
# particleidx::Int = 1,
137+
# res::AbstractVector{<:Real} = zeros(manifold_dimension(manifold)), # zDim
138+
# gradients = nothing,
139+
# ) where {T <: AbstractFactor, P, H, CT}
140+
# #
141+
# return CommonConvWrapper(
142+
# usrfnc,
143+
# tuple(fullvariables...),
144+
# varValsAll,
145+
# userCache,
146+
# manifold,
147+
# partialDims,
148+
# partial,
149+
# # xDim,
150+
# float(nullhypo),
151+
# float(inflation),
152+
# hypotheses,
153+
# certainhypo,
154+
# activehypo,
155+
# measurement,
156+
# Ref(varidx),
157+
# Ref(particleidx),
158+
# res,
159+
# gradients,
160+
# )
161+
# end
162+
119163
# function approxConvOnElements!(
120164
# ccwl::Union{CommonConvWrapper{F}, CommonConvWrapper{Mixture{N_, F, S, T}}},
121165
# elements::Union{Vector{Int}, UnitRange{Int}},

src/entities/FactorOperationalMemory.jl

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -137,48 +137,4 @@ Base.@kwdef struct CommonConvWrapper{
137137
end
138138

139139

140-
function CommonConvWrapper(
141-
usrfnc::T,
142-
fullvariables, #::Tuple ::Vector{<:DFGVariable};
143-
varValsAll::Tuple,
144-
X::AbstractVector{P}; #TODO remove X completely
145-
# xDim::Int = size(X, 1),
146-
userCache::CT = nothing,
147-
manifold = getManifold(usrfnc),
148-
partialDims::AbstractVector{<:Integer} = 1:length(X),
149-
partial::Bool = false,
150-
nullhypo::Real = 0,
151-
inflation::Real = 3.0,
152-
hypotheses::H = nothing,
153-
certainhypo = nothing,
154-
activehypo = collect(1:length(varValsAll)),
155-
measurement::AbstractVector = Vector(Vector{Float64}()),
156-
varidx::Int = 1,
157-
particleidx::Int = 1,
158-
res::AbstractVector{<:Real} = zeros(manifold_dimension(manifold)), # zDim
159-
gradients = nothing,
160-
) where {T <: AbstractFactor, P, H, CT}
161-
#
162-
return CommonConvWrapper(
163-
usrfnc,
164-
tuple(fullvariables...),
165-
varValsAll,
166-
userCache,
167-
manifold,
168-
partialDims,
169-
partial,
170-
# xDim,
171-
float(nullhypo),
172-
float(inflation),
173-
hypotheses,
174-
certainhypo,
175-
activehypo,
176-
measurement,
177-
Ref(varidx),
178-
Ref(particleidx),
179-
res,
180-
gradients,
181-
)
182-
end
183-
184140
#

test/testGradientUtils.jl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,16 @@ coord_2 = IIF._evalFactorTemporary!(fct, varTypes, 2, measurement, pts )
135135
end
136136

137137

138+
@testset "Enable SolverParams.attemptGradients" begin
139+
##
140+
141+
fg = generateGraph_LineStep(;
142+
solverParams = SolverParams(;
143+
attemptGradients=true
144+
)
145+
)
146+
147+
##
148+
end
149+
138150
#

0 commit comments

Comments
 (0)