Skip to content

Commit f7bba5a

Browse files
committed
Merge branch 'master' into noise_hygiene
2 parents 0768f81 + b34540b commit f7bba5a

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ArrayInterface = "2.4, 3.0, 4, 5, 6"
3636
DataStructures = "0.18"
3737
DiffEqBase = "6.19"
3838
JumpProcesses = "9"
39-
DiffEqNoiseProcess = "5.0.0"
39+
DiffEqNoiseProcess = "5.13"
4040
DocStringExtensions = "0.8, 0.9"
4141
FillArrays = "0.6, 0.7, 0.8, 0.9, 0.10, 0.11, 0.12, 0.13"
4242
FiniteDiff = "2"

src/solve.jl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,13 +420,14 @@ function DiffEqBase.__init(
420420
elseif typeof(prob) <: DiffEqBase.AbstractRODEProblem
421421
W = (!haskey(kwargs, :alias_noise) || kwargs[:alias_noise] == true) ? deepcopy(prob.noise) : prob.noise
422422
if W.reset
423-
if W.curt != t
424-
reinit!(W,t,t0=t)
425-
end
426423
# Reseed
427-
if typeof(W) <: NoiseProcess && W.reseed
424+
if typeof(W) <: Union{NoiseProcess, NoiseTransport} && W.reseed
428425
Random.seed!(W.rng,_seed)
429426
end
427+
if W.curt != t
428+
reinit!(W,t,t0=t)
429+
end
430+
430431
elseif W.curt != t
431432
error("Starting time in the noise process is not the starting time of the simulation. The noise process should be re-initialized for repeated use")
432433
end

0 commit comments

Comments
 (0)