Merge pull request #61 from avik-pal/ap/term

Use a mutable struct instead of Dict for Safe termination
SciML · Apr 13, 2023 · 5ca2d21 · 5ca2d21
2 parents 18d4ca2 + 6c4cf4d
commit 5ca2d21
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/lib/SimpleNonlinearSolve/.gitignore b/lib/SimpleNonlinearSolve/.gitignore
@@ -1,3 +1,3 @@
 Manifest.toml
-
+.vscode
 wip
diff --git a/lib/SimpleNonlinearSolve/Project.toml b/lib/SimpleNonlinearSolve/Project.toml
@@ -23,7 +23,7 @@ SimpleBatchedNonlinearSolveExt = "NNlib"
 
 [compat]
 ArrayInterface = "6, 7"
-DiffEqBase = "6.119"
+DiffEqBase = "6.123.0"
 FiniteDiff = "2"
 ForwardDiff = "0.10.3"
 NNlib = "0.8"

diff --git a/lib/SimpleNonlinearSolve/ext/SimpleBatchedNonlinearSolveExt.jl b/lib/SimpleNonlinearSolve/ext/SimpleBatchedNonlinearSolveExt.jl
@@ -59,7 +59,8 @@ function SciMLBase.__solve(prob::NonlinearProblem, alg::Broyden{true}, args...;
         error("Broyden currently doesn't support SAFE_BEST termination modes")
     end
 
-    storage = mode ∈ DiffEqBase.SAFE_TERMINATION_MODES ? Dict() : nothing
+    storage = mode ∈ DiffEqBase.SAFE_TERMINATION_MODES ? NLSolveSafeTerminationResult() :
+              nothing
     termination_condition = tc(storage)
 
     xₙ = x

diff --git a/lib/SimpleNonlinearSolve/src/broyden.jl b/lib/SimpleNonlinearSolve/src/broyden.jl
@@ -48,7 +48,8 @@ function SciMLBase.__solve(prob::NonlinearProblem, alg::Broyden{false}, args...;
         error("Broyden currently doesn't support SAFE_BEST termination modes")
     end
 
-    storage = mode ∈ DiffEqBase.SAFE_TERMINATION_MODES ? Dict() : nothing
+    storage = mode ∈ DiffEqBase.SAFE_TERMINATION_MODES ? NLSolveSafeTerminationResult() :
+              nothing
     termination_condition = tc(storage)
 
     xₙ = x

diff --git a/lib/SimpleNonlinearSolve/src/lbroyden.jl b/lib/SimpleNonlinearSolve/src/lbroyden.jl
@@ -63,7 +63,8 @@ end
         error("LBroyden currently doesn't support SAFE_BEST termination modes")
     end
 
-    storage = mode ∈ DiffEqBase.SAFE_TERMINATION_MODES ? Dict() : nothing
+    storage = mode ∈ DiffEqBase.SAFE_TERMINATION_MODES ? NLSolveSafeTerminationResult() :
+              nothing
     termination_condition = tc(storage)
 
     xₙ = x