Merge pull request #36 from SciML/dw/history

Remove `HistoryFunction`

Author: devmotion

Project.toml

@@ -1,7 +1,7 @@
 name = "StochasticDelayDiffEq"
 uuid = "29a0d76e-afc8-11e9-03a4-eda52ae4b960"
 authors = ["Henrik Sykora <[email protected]>"]
-version = "0.2.6"
+version = "0.2.7"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -21,7 +21,7 @@ UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
 
 [compat]
 DataStructures = "0.18"
-DelayDiffEq = "5"
+DelayDiffEq = "5.28.2"
 DiffEqBase = "6.29"
 DiffEqNoiseProcess = "5"
 RandomNumbers = "1"

src/StochasticDelayDiffEq.jl

@@ -16,6 +16,8 @@ using DiffEqBase: AbstractSDDEProblem, AbstractSDDEAlgorithm, AbstractRODESoluti
 import DelayDiffEq: constant_extrapolant!, constant_extrapolant, AbstractMethodOfStepsAlgorithm, iscomposite, MethodOfSteps
 using DiffEqNoiseProcess
 
+using DelayDiffEq: HistoryFunction
+
 import RandomNumbers: Xorshifts
 using Random
 import Base: convert
@@ -30,7 +32,6 @@ include("integrators/type.jl")
 include("integrators/interface.jl")
 include("integrators/utils.jl")
 include("functionwrapper.jl")
-include("history_function.jl")
 include("utils.jl")
 include("solve.jl")
 

src/history_function.jl

@@ -10,10 +10,19 @@ mutable struct HistorySDEIntegrator{algType,IIP,uType,tType,SolType,CacheType} <
     tdir::Int
     saveiter::Int
     cache::CacheType
-  end
+end
 
-mutable struct
-    SDDEIntegrator{algType,IIP,uType,uEltype,tType,P,eigenType,tTypeNoUnits,uEltypeNoUnits,randType,randType2,rateType,solType,cacheType,F,G,F6,OType,noiseType,EventErrorType,CallbackCacheType,H,IType} <: AbstractSDDEIntegrator{algType,IIP,uType,tType}
+function (integrator::HistorySDEIntegrator)(t, deriv::Type=Val{0}; idxs=nothing)
+    StochasticDiffEq.current_interpolant(t, integrator, idxs, deriv)
+end
+
+function (integrator::HistorySDEIntegrator)(
+    val::AbstractArray, t::Union{Number,AbstractArray}, deriv::Type=Val{0}; idxs=nothing
+)
+    StochasticDiffEq.current_interpolant!(val, t, integrator, idxs, deriv)
+end
+
+mutable struct SDDEIntegrator{algType,IIP,uType,uEltype,tType,P,eigenType,tTypeNoUnits,uEltypeNoUnits,randType,randType2,rateType,solType,cacheType,F,G,F6,OType,noiseType,EventErrorType,CallbackCacheType,H,IType} <: AbstractSDDEIntegrator{algType,IIP,uType,tType}
     f::F
     g::G
     c::F6
@@ -66,12 +75,14 @@ mutable struct
     history::H
     destats::DiffEqBase.DEStats
     integrator::IType # history integrator
-  end
+end
 
-  function (integrator::SDDEIntegrator)(t, deriv::Type=Val{0}; idxs=nothing)
-      StochasticDiffEq.current_interpolant(t, integrator, idxs, deriv)
-  end
+function (integrator::SDDEIntegrator)(t, deriv::Type=Val{0}; idxs=nothing)
+    StochasticDiffEq.current_interpolant(t, integrator, idxs, deriv)
+end
 
-  function (integrator::SDDEIntegrator)(val::AbstractArray, t::Union{Number,AbstractArray},deriv::Type=Val{0}; idxs=nothing)
-      StochasticDiffEq.current_interpolant!(val, t, integrator, idxs, deriv)
-  end
+function (integrator::SDDEIntegrator)(
+    val::AbstractArray, t::Union{Number,AbstractArray}, deriv::Type=Val{0}; idxs=nothing
+)
+    StochasticDiffEq.current_interpolant!(val, t, integrator, idxs, deriv)
+end