Skip to content

Commit 93cd9b6

Browse files
authored
Merge branch 'SciML:master' into reset_noise
2 parents c32a132 + cc107ea commit 93cd9b6

24 files changed

+27
-55
lines changed

Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "StochasticDiffEq"
22
uuid = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0"
33
authors = ["Chris Rackauckas <accounts@chrisrackauckas.com>"]
4-
version = "6.52.1"
4+
version = "6.52.2"
55

66
[deps]
77
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -58,14 +58,14 @@ julia = "1.6"
5858
DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def"
5959
DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"
6060
DiffEqOperators = "9fdde737-9c7f-55bf-ade8-46b3f136cc48"
61-
DiffEqProblemLibrary = "a077e3f3-b75c-5d7f-a0c6-6bc4c8ec64a9"
6261
LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
6362
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
6463
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
6564
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
65+
SDEProblemLibrary = "c72e72a9-a271-4b2b-8966-303ed956772e"
6666
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
6767
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
6868
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
6969

7070
[targets]
71-
test = ["DiffEqCallbacks", "DiffEqDevTools", "DiffEqOperators", "DiffEqProblemLibrary", "LinearSolve", "ModelingToolkit", "Pkg", "SafeTestsets", "SparseArrays", "Statistics", "Test"]
71+
test = ["DiffEqCallbacks", "DiffEqDevTools", "DiffEqOperators", "SDEProblemLibrary", "LinearSolve", "ModelingToolkit", "Pkg", "SafeTestsets", "SparseArrays", "Statistics", "Test"]

test/adaptive/sde_autostepsize_test.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using StochasticDiffEq, Random
2-
using DiffEqProblemLibrary.SDEProblemLibrary: importsdeproblems; importsdeproblems()
3-
using DiffEqProblemLibrary.SDEProblemLibrary: prob_sde_2Dlinear
2+
using SDEProblemLibrary: prob_sde_2Dlinear
43
Random.seed!(100)
54

65
#Let the solver determine the initial stepsize for you!

test/adaptive/sde_linearadaptive_tests.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using StochasticDiffEq, Test, Random
2-
using DiffEqProblemLibrary.SDEProblemLibrary: importsdeproblems; importsdeproblems()
3-
using DiffEqProblemLibrary.SDEProblemLibrary: prob_sde_linear, prob_sde_2Dlinear, prob_sde_additive, prob_sde_additivesystem
2+
using SDEProblemLibrary: prob_sde_linear, prob_sde_2Dlinear, prob_sde_additive, prob_sde_additivesystem
43

54
probs = Vector{SDEProblem}(undef, 2)
65
add_probs = Vector{SDEProblem}(undef, 2)
@@ -107,4 +106,4 @@ end
107106
u0 = [1.0, 1.0]
108107
prob = SDEProblem(f, g, u0, (0.0, 10.0))
109108

110-
sol = solve(prob, SKenCarp())
109+
sol = solve(prob, SKenCarp())

test/adaptive/sde_lorenzattractor_tests.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using StochasticDiffEq, Random
2-
using DiffEqProblemLibrary.SDEProblemLibrary: importsdeproblems; importsdeproblems()
3-
using DiffEqProblemLibrary.SDEProblemLibrary: prob_sde_lorenz
2+
using SDEProblemLibrary: prob_sde_lorenz
43
Random.seed!(100)
54
prob = prob_sde_lorenz
65

test/adaptive/sde_twodimlinearadaptive_tests.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using StochasticDiffEq, Test, Random
2-
using DiffEqProblemLibrary.SDEProblemLibrary: importsdeproblems; importsdeproblems()
3-
using DiffEqProblemLibrary.SDEProblemLibrary: prob_sde_2Dlinear
2+
using SDEProblemLibrary: prob_sde_2Dlinear
43
Random.seed!(100)
54
prob = prob_sde_2Dlinear
65

test/composite_algorithm_test.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using StochasticDiffEq, Test, Random
2-
using DiffEqProblemLibrary.SDEProblemLibrary: importsdeproblems; importsdeproblems()
3-
using DiffEqProblemLibrary.SDEProblemLibrary: prob_sde_linear, prob_sde_2Dlinear
2+
using SDEProblemLibrary: prob_sde_linear, prob_sde_2Dlinear
43
prob = prob_sde_2Dlinear
54
choice_function(integrator) = (Int(integrator.t<0.5) + 1)
65
alg_double = StochasticCompositeAlgorithm((SRIW1(),SRIW1()),choice_function)

test/oval2_single.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using StochasticDiffEq, Random
2-
using DiffEqProblemLibrary.SDEProblemLibrary: importsdeproblems; importsdeproblems()
3-
using DiffEqProblemLibrary.SDEProblemLibrary: oval2ModelExample
2+
using SDEProblemLibrary: oval2ModelExample
43
Random.seed!(200)
54
prob = oval2ModelExample(largeFluctuations=true,useBigs=false)
65
quick_prob = deepcopy(prob)

test/oval2_test.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using DiffEqProblemLibrary.SDEProblemLibrary: importsdeproblems; importsdeproblems()
2-
using DiffEqProblemLibrary.SDEProblemLibrary: prob_sde_lorenz, oval2ModelExample
1+
using SDEProblemLibrary: prob_sde_lorenz, oval2ModelExample
32

43
oval2ModelExample()
54

test/reversal_tests.jl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using StochasticDiffEq, DiffEqNoiseProcess, Test, Random
22
using Random
3-
using DiffEqProblemLibrary.SDEProblemLibrary
4-
# load problems
5-
SDEProblemLibrary.importsdeproblems()
3+
using SDEProblemLibrary
64
# automatically construct SDE transformation for Ito reversal
75
using ModelingToolkit
86

test/saveat_tests.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using StochasticDiffEq, Test, Random
2-
using DiffEqProblemLibrary.SDEProblemLibrary: importsdeproblems; importsdeproblems()
3-
using DiffEqProblemLibrary.SDEProblemLibrary: prob_sde_linear, prob_sde_2Dlinear
2+
using SDEProblemLibrary: prob_sde_linear, prob_sde_2Dlinear
43
Random.seed!(100)
54
prob = prob_sde_linear
65
f(u,p,t) = 2u

0 commit comments

Comments
 (0)