make dynamic_rule always take the nested f

Author: oameye

Project.toml

@@ -1,7 +1,7 @@
 name = "DynamicalSystemsBase"
 uuid = "6e36e845-645a-534a-86f2-f5d4aa5a06b4"
 repo = "https://github.com/JuliaDynamics/DynamicalSystemsBase.jl.git"
-version = "3.12.1"
+version = "3.12.2"
 
 [deps]
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"

ext/src/CoupledSDEs.jl

@@ -160,16 +160,6 @@ StateSpaceSets.dimension(::CoupledSDEs{IIP,D}) where {IIP,D} = D
 DynamicalSystemsBase.current_state(ds::CoupledSDEs) = current_state(ds.integ)
 DynamicalSystemsBase.isdeterministic(ds::CoupledSDEs) = false
 
-function DynamicalSystemsBase.dynamic_rule(ds::CoupledSDEs)
-    # with remake it can happen that we have nested SDEFunctions
-    # sciml integrator deals with this internally well
-    f = ds.integ.f
-    while hasfield(typeof(f), :f)
-        f = f.f
-    end
-    return f
-end
-
 function DynamicalSystemsBase.set_state!(ds::CoupledSDEs, u::AbstractArray)
     (set_state!(ds.integ, u); ds)
 end

src/core_systems/continuous_time_ode.jl

@@ -150,7 +150,15 @@ function SciMLBase.reinit!(ds::ContinuousTimeDynamicalSystem, u::AbstractArray =
 end
 
 # `DEIntegrator` stuff
-dynamic_rule(integ::DEIntegrator) = integ.f.f
+function dynamic_rule(integ::DEIntegrator)
+    # with remake it can happen that we have nested SDEFunctions
+    # sciml integrator deals with this internally well
+    f = integ.f
+    while hasfield(typeof(f), :f)
+        f = f.f
+    end
+    return f
+end
 current_parameters(integ::DEIntegrator) = integ.p
 initial_state(integ::DEIntegrator) = integ.sol.prob.u0
 current_state(ds::CoupledODEs) = current_state(ds.integ)