Made linesearch_nan_max_iterations and linesearch_nan_factor part of the Options.

Author: benedict-96

src/base/options.jl

@@ -101,6 +101,9 @@ const EXTENDED_TRACE::Bool = false
 const SHOW_EVERY::Int = 1
 const VERBOSITY::Int = 1
 
+const LINESEARCH_NAN_MAX_ITERATIONS = 10
+const LINESEARCH_NAN_FACTOR = 0.5
+
 """
     Options
 
@@ -129,6 +132,8 @@ Configurable options with defaults (values 0 and NaN indicate unlimited):
 - `extended_trace = $(EXTENDED_TRACE)`,
 - `show_every = $(SHOW_EVERY)`,
 - `verbosity = $(VERBOSITY)`
+- `linesearch_nan_max_iterations = $(LINESEARCH_NAN_MAX_ITERATIONS)`
+- `linesearch_nan_factor = $(LINESEARCH_NAN_FACTOR)`
 
 Some of the constants are defined by the functions [`default_tolerance`](@ref) and [`absolute_tolerance`](@ref).
 """
@@ -155,6 +160,8 @@ struct Options{T}
     extended_trace::Bool
     show_every::Int
     verbosity::Int
+    linesearch_nan_max_iterations::Int
+    linesearch_nan_factor::T
 end
 
 function Options(T = Float64;
@@ -179,7 +186,9 @@ function Options(T = Float64;
         store_trace::Bool = STORE_TRACE,
         extended_trace::Bool = EXTENDED_TRACE,
         show_every::Integer = SHOW_EVERY,
-        verbosity::Integer = VERBOSITY)
+        verbosity::Integer = VERBOSITY,
+        linesearch_nan_max_iterations::Integer = LINESEARCH_NAN_MAX_ITERATIONS,
+        linesearch_nan_factor::AbstractFloat = LINESEARCH_NAN_FACTOR)
 
     show_every = show_every > 0 ? show_every : 1
 
@@ -204,7 +213,9 @@ function Options(T = Float64;
                         store_trace, 
                         extended_trace, 
                         show_every, 
-                        verbosity)
+                        verbosity,
+                        linesearch_nan_max_iterations,
+                        linesearch_nan_factor)
 end
 
 function Base.show(io::IO, o::SimpleSolvers.Options)

src/nonlinear/nonlinear_solver.jl

@@ -1,8 +1,5 @@
 using Printf
 
-const LINESEARCH_NAN_MAX_ITERATIONS = 10
-const LINESEARCH_NAN_FACTOR = 0.5
-
 """
     NonlinearSolver
 
@@ -128,12 +125,12 @@ function solver_step!(x::AbstractVector{T}, s::NonlinearSolver{T}, state::Nonlin
     # The following loop checks if the RHS contains any NaNs.
     # If so, the direction vector is reduced by a factor of LINESEARCH_NAN_FACTOR.
     update!(state, x, value!(value(state), nonlinearproblem(s), x, params), iteration_number(s))
-    for _ in 1:LINESEARCH_NAN_MAX_ITERATIONS
+    for _ in 1:linesearch(s).config.linesearch_nan_max_iterations
         solution(cache(s)) .= solution(state) .+ direction(cache(s))
         value!(value(cache(s)), nonlinearproblem(s), solution(cache(s)), params)
         if any(isnan, value(cache(s)))
             (s.config.verbosity ≥ 2 && @warn "NaN detected in nonlinear solver. Reducing length of direction vector.")
-            direction(cache(s)) .*= T(LINESEARCH_NAN_FACTOR)
+            direction(cache(s)) .*= T(linesearch(s).config.linesearch_nan_factor)
         else
             break
         end