Relax signature

matthieugomez · Dec 3, 2018 · ed00ea2 · ed00ea2
1 parent c3d1cdc
commit ed00ea2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/optimizer/dogleg.jl b/src/optimizer/dogleg.jl
@@ -46,7 +46,7 @@ const INCREASE_THRESHOLD = 0.75
 function optimize!(
     anls::LeastSquaresProblemAllocated{Tx, Ty, Tf, TJ, Tg, Toptimizer, Tsolver};
     x_tol::Number = 1e-8, f_tol::Number = 1e-8, g_tol::Number = 1e-8,
-    iterations::Integer = 1_000, Δ::Number = 1.0, store_trace = false, show_trace = false, show_every = 1, lower::Tx = Array{eltype(Tx)}(undef, 0), upper::Tx = Array{eltype(Tx)}(undef, 0)) where {Tx, Ty, Tf, TJ, Tg, Toptimizer <: AllocatedDogleg, Tsolver}
+    iterations::Integer = 1_000, Δ::Number = 1.0, store_trace = false, show_trace = false, show_every = 1, lower = Vector{eltype(Tx)}(undef, 0), upper = Vector{eltype(Tx)}(undef, 0)) where {Tx, Ty, Tf, TJ, Tg, Toptimizer <: AllocatedDogleg, Tsolver}
 
      δgn, δgr, δx, dtd = anls.optimizer.δgn, anls.optimizer.δgr, anls.optimizer.δx, anls.optimizer.dtd
      ftrial, fpredict = anls.optimizer.ftrial, anls.optimizer.fpredict

diff --git a/src/optimizer/levenberg_marquardt.jl b/src/optimizer/levenberg_marquardt.jl
@@ -44,7 +44,7 @@ const MAX_DIAGONAL = 1e32
 function optimize!(
     anls::LeastSquaresProblemAllocated{Tx, Ty, Tf, TJ, Tg, Toptimizer, Tsolver};
             x_tol::Number = 1e-8, f_tol::Number = 1e-8, g_tol::Number = 1e-8,
-            iterations::Integer = 1_000, Δ::Number = 10.0, store_trace = false, show_trace = false, show_every = 1, lower::Tx = Array{eltype(Tx)}(undef, 0), upper::Tx = Array{eltype(Tx)}(undef, 0)) where {Tx, Ty, Tf, TJ, Tg, Toptimizer <: AllocatedLevenbergMarquardt, Tsolver}
+            iterations::Integer = 1_000, Δ::Number = 10.0, store_trace = false, show_trace = false, show_every = 1, lower = Vector{eltype(Tx)}(undef, 0), upper = Vector{eltype(Tx)}(undef, 0)) where {Tx, Ty, Tf, TJ, Tg, Toptimizer <: AllocatedLevenbergMarquardt, Tsolver}
 
     δx, dtd = anls.optimizer.δx, anls.optimizer.dtd
     ftrial, fpredict = anls.optimizer.ftrial, anls.optimizer.fpredict

diff --git a/test/bounds.jl b/test/bounds.jl
@@ -5,3 +5,4 @@ function rosenbrock(x)
 end
 x0 = zeros(2)
 optimize(rosenbrock, x0, Dogleg(), lower = fill(0.0, length(x0)))
+optimize(rosenbrock, x0, LevenbergMarquardt(), lower = fill(0.0, length(x0)))