Account for linesearch parameter

Author: avik-pal

src/raphson.jl

@@ -110,7 +110,7 @@ function perform_step!(cache::NewtonRaphsonCache{true})
     _axpy!(-α, du, u)
     f(cache.fu1, u, p)
 
-    update_trace!(cache.trace, cache.stats.nsteps + 1, u, cache.fu1, J, du)
+    update_trace!(cache.trace, cache.stats.nsteps + 1, u, cache.fu1, J, du, α)
 
     check_and_update!(cache, cache.fu1, cache.u, cache.u_prev)
 
@@ -141,7 +141,7 @@ function perform_step!(cache::NewtonRaphsonCache{false})
     cache.fu1 = f(cache.u, p)
 
     update_trace!(cache.trace, cache.stats.nsteps + 1, cache.u, cache.fu1, cache.J,
-        cache.du)
+        cache.du, α)
 
     check_and_update!(cache, cache.fu1, cache.u, cache.u_prev)
 

src/trace.jl

@@ -35,7 +35,8 @@ function NonlinearSolveTraceEntry(iteration, fu, δu)
 end
 
 function NonlinearSolveTraceEntry(iteration, fu, δu, J)
-    return NonlinearSolveTraceEntry(iteration, norm(fu, Inf), norm(δu, 2), __cond(J), nothing,
+    return NonlinearSolveTraceEntry(iteration, norm(fu, Inf), norm(δu, 2), __cond(J),
+        nothing,
         nothing, nothing, nothing)
 end
 
@@ -79,34 +80,39 @@ function __init_trace_history(::Val{show_trace}, ::Val{trace_level}, ::Val{store
     return nothing
 end
 
-__trace_entry(::Val{1}, iter, u, fu, J, δu) = NonlinearSolveTraceEntry(iter, fu, δu)
-__trace_entry(::Val{2}, iter, u, fu, J, δu) = NonlinearSolveTraceEntry(iter, fu, δu, J)
-__trace_entry(::Val{3}, iter, u, fu, J, δu) = NonlinearSolveTraceEntry(iter, fu, δu, J, u)
-function __trace_entry(::Val{T}, iter, u, fu, J, δu) where {T}
+function __trace_entry(::Val{1}, iter, u, fu, J, δu, α = 1)
+    NonlinearSolveTraceEntry(iter, fu, δu .* α)
+end
+function __trace_entry(::Val{2}, iter, u, fu, J, δu, α = 1)
+    NonlinearSolveTraceEntry(iter, fu, δu .* α, J)
+end
+function __trace_entry(::Val{3}, iter, u, fu, J, δu, α = 1)
+    NonlinearSolveTraceEntry(iter, fu, δu .* α, J, u)
+end
+function __trace_entry(::Val{T}, iter, u, fu, J, δu, α = 1) where {T}
     throw(ArgumentError("::Val{trace_level} == ::Val{$(T)} is not supported. \
                         Possible values are `Val{1}()`/`Val{2}()`/`Val{3}()`."))
 end
 
 function update_trace!(trace::NonlinearSolveTrace{ShT, TrL, StT}, iter, u, fu, J,
-        δu) where {ShT, TrL, StT}
+        δu, α) where {ShT, TrL, StT}
     !StT && !ShT && return nothing
-    entry = __trace_entry(Val{TrL}(), iter, u, fu, J, δu)
+    entry = __trace_entry(Val{TrL}(), iter, u, fu, J, δu, α)
     StT && push!(trace.history, entry)
     ShT && show(entry)
     return trace
 end
 
 # Needed for Algorithms which directly use `inv(J)` instead of `J`
 function update_trace_with_invJ!(trace::NonlinearSolveTrace{ShT, TrL, StT}, iter, u, fu, J,
-        δu) where {ShT, TrL, StT}
+        δu, α) where {ShT, TrL, StT}
     !StT && !ShT && return nothing
     if TrL == 1
-        entry = __trace_entry(Val{1}(), iter, u, fu, J, δu)
+        entry = __trace_entry(Val{1}(), iter, u, fu, J, δu, α)
     else
-        entry = __trace_entry(Val{TrL}(), iter, u, fu, inv(J), δu)
+        entry = __trace_entry(Val{TrL}(), iter, u, fu, inv(J), δu, α)
     end
     StT && push!(trace.history, entry)
     ShT && show(entry)
     return trace
 end
-