@@ -34,11 +34,11 @@ function fit!(t::Union{Type{Val{:levenberg_marquardt}}, Type{Val{:dogleg}}},
34
34
fg,
35
35
g!)
36
36
if t == Val{:levenberg_marquardt }
37
- optimizer = LeastSquaresOptim. LevenbergMarquardt ()
37
+ optimizer = LeastSquaresOptim. LevenbergMarquardt (LeastSquaresOptim . LSMR () )
38
38
else
39
- optimizer = LeastSquaresOptim. Dogleg ()
39
+ optimizer = LeastSquaresOptim. Dogleg (LeastSquaresOptim . LSMR () )
40
40
end
41
- full = LeastSquaresOptim. LeastSquaresProblemAllocated (nls, optimizer, LeastSquaresOptim . LSMR () )
41
+ full = LeastSquaresOptim. LeastSquaresProblemAllocated (nls, optimizer)
42
42
for r in 1 : fullrank
43
43
fsr = view (fs, :, r)
44
44
full. x = fsr
@@ -75,11 +75,11 @@ function fit!(t::Union{Type{Val{:levenberg_marquardt}}, Type{Val{:dogleg}}},
75
75
InteractiveFixedEffectsSolutionT (scaleb, similar (fsT. idpool), similar (fsT. timepool)))
76
76
nls = LeastSquaresOptim. LeastSquaresProblem (fsT, similar (fp. y), (y, x) -> f! (y, x, fp), fg, g!)
77
77
if t == Val{:levenberg_marquardt }
78
- optimizer = LeastSquaresOptim. LevenbergMarquardt ()
78
+ optimizer = LeastSquaresOptim. LevenbergMarquardt (LeastSquaresOptim . LSMR () )
79
79
else
80
- optimizer = LeastSquaresOptim. Dogleg ()
80
+ optimizer = LeastSquaresOptim. Dogleg (LeastSquaresOptim . LSMR () )
81
81
end
82
- full = LeastSquaresOptim. LeastSquaresProblemAllocated (nls, optimizer, LeastSquaresOptim . LSMR () )
82
+ full = LeastSquaresOptim. LeastSquaresProblemAllocated (nls, optimizer)
83
83
temp = similar (fp. y)
84
84
result = LeastSquaresOptim. optimize! (full;
85
85
x_tol = 1e-32 , g_tol = 1e-32 , f_tol = tol, iterations = maxiter)
0 commit comments