Merge pull request #90 from SciML/ChrisRackauckas-patch-1

Fix tests

Author: ChrisRackauckas

Project.toml

@@ -7,6 +7,7 @@ ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
 DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+NonlinearSolveBase = "be0214bd-f91f-a760-ac4e-3421ce2b2da0"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 

src/SteadyStateDiffEq.jl

@@ -1,14 +1,15 @@
 module SteadyStateDiffEq
 
 using Reexport: @reexport
-@reexport using DiffEqBase
+@reexport using SciMLBase
 
 using ConcreteStructs: @concrete
 using NonlinearSolveBase
+import DiffEqBase
 using NonlinearSolveBase: AbstractNonlinearTerminationMode,
                    AbstractSafeNonlinearTerminationMode,
                    AbstractSafeBestNonlinearTerminationMode,
-                   NonlinearSafeTerminationReturnCode, NormTerminationMode
+                   NormTerminationMode
 using DiffEqCallbacks: TerminateSteadyState
 using LinearAlgebra: norm
 using SciMLBase: SciMLBase, CallbackSet, NonlinearProblem, ODEProblem,

src/solve.jl

@@ -15,7 +15,7 @@ end
 
 function SciMLBase.__solve(prob::SciMLBase.AbstractSteadyStateProblem, alg::DynamicSS,
         args...; abstol = 1e-8, reltol = 1e-6, odesolve_kwargs = (;),
-        save_idxs = nothing, termination_condition = NormTerminationMode(infnorm),
+        save_idxs = nothing, termination_condition = NonlinearSolveBase.NormTerminationMode(infnorm),
         kwargs...)
     tspan = __get_tspan(prob.u0, alg)
 
@@ -36,9 +36,9 @@ function SciMLBase.__solve(prob::SciMLBase.AbstractSteadyStateProblem, alg::Dyna
         du = f(prob.u0, prob.p, first(tspan))
     end
 
-    tc_cache = init(du, prob.u0, termination_condition, last(tspan); abstol, reltol)
-    abstol = DiffEqBase.get_abstol(tc_cache)
-    reltol = DiffEqBase.get_reltol(tc_cache)
+    tc_cache = init(prob, termination_condition, du, prob.u0; abstol, reltol)
+    abstol = NonlinearSolveBase.get_abstol(tc_cache)
+    reltol = NonlinearSolveBase.get_reltol(tc_cache)
 
     function terminate_function(u, t, integrator)
         return tc_cache(get_du(integrator), integrator.u, integrator.uprev, t)
@@ -78,16 +78,7 @@ end
 function __get_result_from_sol(::AbstractSafeNonlinearTerminationMode, tc_cache, odesol)
     u, t = last(odesol.u), last(odesol.t)
     du = odesol(t, Val{1})
-
-    if tc_cache.retcode == NonlinearSafeTerminationReturnCode.Success
-        retcode_tc = ReturnCode.Success
-    elseif tc_cache.retcode == NonlinearSafeTerminationReturnCode.PatienceTermination
-        retcode_tc = ReturnCode.ConvergenceFailure
-    elseif tc_cache.retcode == NonlinearSafeTerminationReturnCode.ProtectiveTermination
-        retcode_tc = ReturnCode.Unstable
-    else
-        retcode_tc = ReturnCode.Default
-    end
+    retcode_tc = tc_cache.retcode
 
     retcode = if odesol.retcode == ReturnCode.Terminated
         ifelse(retcode_tc != ReturnCode.Default, retcode_tc, ReturnCode.Success)
@@ -103,16 +94,7 @@ end
 function __get_result_from_sol(::AbstractSafeBestNonlinearTerminationMode, tc_cache, odesol)
     u, t = tc_cache.u, only(DiffEqBase.get_saved_values(tc_cache))
     du = odesol(t, Val{1})
-
-    if tc_cache.retcode == NonlinearSafeTerminationReturnCode.Success
-        retcode_tc = ReturnCode.Success
-    elseif tc_cache.retcode == NonlinearSafeTerminationReturnCode.PatienceTermination
-        retcode_tc = ReturnCode.ConvergenceFailure
-    elseif tc_cache.retcode == NonlinearSafeTerminationReturnCode.ProtectiveTermination
-        retcode_tc = ReturnCode.Unstable
-    else
-        retcode_tc = ReturnCode.Default
-    end
+    retcode_tc = tc_cache.retcode
 
     retcode = if odesol.retcode == ReturnCode.Terminated
         ifelse(retcode_tc != ReturnCode.Default, retcode_tc, ReturnCode.Success)

test/core.jl

@@ -1,5 +1,7 @@
-using SteadyStateDiffEq,
-      DiffEqBase, NonlinearSolve, Sundials, OrdinaryDiffEq, DiffEqCallbacks, Test
+using SteadyStateDiffEq, NonlinearSolve, Sundials, OrdinaryDiffEq, DiffEqCallbacks, Test
+using NonlinearSolve.NonlinearSolveBase
+using NonlinearSolve.NonlinearSolveBase: NormTerminationMode, RelTerminationMode, RelNormTerminationMode,
+      AbsTerminationMode, AbsNormTerminationMode
 
 function f(du, u, p, t)
     du[1] = 2 - 2u[1]
@@ -83,9 +85,6 @@ sol2 = solve(prob, DynamicSS(Tsit5()); abstol = 1e-4)
 for termination_condition in [
     NormTerminationMode(SteadyStateDiffEq.infnorm), RelTerminationMode(), RelNormTerminationMode(SteadyStateDiffEq.infnorm),
     AbsTerminationMode(), AbsNormTerminationMode(SteadyStateDiffEq.infnorm),
-    RelSafeTerminationMode(SteadyStateDiffEq.infnorm),
-    AbsSafeTerminationMode(SteadyStateDiffEq.infnorm), RelSafeBestTerminationMode(SteadyStateDiffEq.infnorm),
-    AbsSafeBestTerminationMode(SteadyStateDiffEq.infnorm)
 ]
     sol_tc = solve(prob, DynamicSS(Tsit5()); termination_condition)
     @show sol_tc.retcode, termination_condition