Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update DiffEqJump to JumpProcesses #479

Merged
merged 1 commit into from
Jun 29, 2022
Merged

update DiffEqJump to JumpProcesses #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
*.jl.*.cov
*.jl.mem
Manifest.toml
.vscode/
4 changes: 2 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
DiffEqJump = "c894b116-72e5-5b58-be3c-e6d8d4ac2b12"
DiffEqNoiseProcess = "77a26b50-5914-5dd7-bc55-306e6241c503"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
JumpProcesses = "ccbc3e58-028d-4f4c-8cd5-9ae44345cda5"
LevyArea = "2d8b4e74-eb68-11e8-0fb9-d5eb67b50637"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
Expand All @@ -35,7 +35,7 @@ Adapt = "3"
ArrayInterface = "2.4, 3.0, 4, 5, 6"
DataStructures = "0.18"
DiffEqBase = "6.19"
DiffEqJump = "6.7.4, 7, 8"
JumpProcesses = "9"
DiffEqNoiseProcess = "5.0.0"
DocStringExtensions = "0.8, 0.9"
FillArrays = "0.6, 0.7, 0.8, 0.9, 0.10, 0.11, 0.12, 0.13"
Expand Down
4 changes: 2 additions & 2 deletions src/StochasticDiffEq.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ using DocStringExtensions

const CompiledFloats = Union{Float32,Float64}

import DiffEqJump
import DiffEqJump: JumpProblem
import JumpProcesses
import JumpProcesses: JumpProblem

import Base.Threads
@static if VERSION < v"1.3"
Expand Down
4 changes: 2 additions & 2 deletions src/solve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ function DiffEqBase.__init(

if typeof(_prob) <: JumpProblem
if !alias_jumps
_prob = DiffEqJump.resetted_jump_problem(_prob, _seed)
_prob = JumpProcesses.resetted_jump_problem(_prob, _seed)
elseif _seed !== 0
DiffEqJump.reset_jump_problem!(_prob, _seed)
JumpProcesses.reset_jump_problem!(_prob, _seed)
end
end

Expand Down
2 changes: 1 addition & 1 deletion test/multithreaded_jump_test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using DiffEqJump, StochasticDiffEq, Test
using JumpProcesses, StochasticDiffEq, Test

# Requires threads to be effective
# https://github.com/SciML/DifferentialEquations.jl/issues/854
Expand Down
2 changes: 1 addition & 1 deletion test/tau_leaping.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using StochasticDiffEq, DiffEqJump, DiffEqBase, Statistics
using StochasticDiffEq, JumpProcesses, DiffEqBase, Statistics
using Test, LinearAlgebra

function regular_rate(out,u,p,t)
Expand Down