Skip to content

Commit 35a9acc

Browse files
committed
Update to LeastSquaresOptim
1 parent 78232eb commit 35a9acc

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ CategoricalArrays
44
DataFrames 0.11.0
55
StatsModels 0.2.4
66
Reexport
7-
LeastSquaresOptim 0.5.0
7+
LeastSquaresOptim 0.7.0
88
FixedEffectModels 0.6.1

src/methods/ls.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ function fit!(t::Union{Type{Val{:levenberg_marquardt}}, Type{Val{:dogleg}}},
3434
fg,
3535
g!)
3636
if t == Val{:levenberg_marquardt}
37-
optimizer = LeastSquaresOptim.LevenbergMarquardt()
37+
optimizer = LeastSquaresOptim.LevenbergMarquardt(LeastSquaresOptim.LSMR())
3838
else
39-
optimizer = LeastSquaresOptim.Dogleg()
39+
optimizer = LeastSquaresOptim.Dogleg(LeastSquaresOptim.LSMR())
4040
end
41-
full = LeastSquaresOptim.LeastSquaresProblemAllocated(nls, optimizer, LeastSquaresOptim.LSMR())
41+
full = LeastSquaresOptim.LeastSquaresProblemAllocated(nls, optimizer)
4242
for r in 1:fullrank
4343
fsr = view(fs, :, r)
4444
full.x = fsr
@@ -75,11 +75,11 @@ function fit!(t::Union{Type{Val{:levenberg_marquardt}}, Type{Val{:dogleg}}},
7575
InteractiveFixedEffectsSolutionT(scaleb, similar(fsT.idpool), similar(fsT.timepool)))
7676
nls = LeastSquaresOptim.LeastSquaresProblem(fsT, similar(fp.y), (y, x) -> f!(y, x, fp), fg, g!)
7777
if t == Val{:levenberg_marquardt}
78-
optimizer = LeastSquaresOptim.LevenbergMarquardt()
78+
optimizer = LeastSquaresOptim.LevenbergMarquardt(LeastSquaresOptim.LSMR())
7979
else
80-
optimizer = LeastSquaresOptim.Dogleg()
80+
optimizer = LeastSquaresOptim.Dogleg(LeastSquaresOptim.LSMR())
8181
end
82-
full = LeastSquaresOptim.LeastSquaresProblemAllocated(nls, optimizer, LeastSquaresOptim.LSMR())
82+
full = LeastSquaresOptim.LeastSquaresProblemAllocated(nls, optimizer)
8383
temp = similar(fp.y)
8484
result = LeastSquaresOptim.optimize!(full;
8585
x_tol = 1e-32, g_tol = 1e-32, f_tol = tol, iterations = maxiter)

0 commit comments

Comments
 (0)