Merge pull request #9 from slimgroup/ls-e

Linesearch fix

Author: mloubout

.github/workflows/CI.yml

@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
 
       matrix:
-        version: ['1.6', '1.7', '1.8', '1.9', '1']
+        version: ['1.6', '1.7', '1.8', '1.9', '1.10', '1']
         os: [ubuntu-latest]
         arch: [x64]
 

Project.toml

@@ -1,7 +1,7 @@
 name = "SlimOptim"
 uuid = "e4c7bc62-5b23-4522-a1b9-71c2be45f1df"
 authors = ["Mathias Louboutin <[email protected]>"]
-version = "0.2.3"
+version = "0.2.5"
 
 [deps]
 LineSearches = "d3d80556-e9d4-5f37-9878-2ab0fcc64255"

src/linesearches.jl

@@ -44,7 +44,11 @@ function linesearch(ls, sol::result, d::AbstractArray{T}, f::Function, g!::Funct
     try
         return ls(ϕ, dϕ, ϕdϕ, t, funRef, gtd)
     catch e
-        @info "Line search failed"
-        return 0, funRef
+        if isa(e, LineSearchException)
+            @info "Line search failed"
+            return 0, funRef
+        else
+            throw(e)
+        end
     end
 end

test/runtests.jl

@@ -1,7 +1,7 @@
 # Author: Mathias Louboutin, [email protected]
 # Date: December 2020
 
-using SlimOptim, Test
+using SlimOptim, Test, LineSearches
 
 @testset "SPG" begin
     include("test_spg.jl")
@@ -17,4 +17,15 @@ end
 
 @testset "Rosenbrock accuracy" begin
     include("test_rosen.jl")
-end
+end
+
+
+# Test linesearch error
+
+sol = result([1])
+ls = BackTracking(;iterations=5)
+
+f(x) = x[]
+@test linesearch(ls, sol, [1.0], f, x->-x, x->-x, 1.0, 1.0, 1.0, [1.0])[1] == 0.0
+fs(x) = sqrt(-1)
+@test_throws DomainError linesearch(ls, sol, [1.0], fs, x->x, x->x, 1.0, 1.0, 1.0, [1.0])