Skip to content

Commit 37ff1cd

Browse files
Merge branch 'master' into remove-calculus
2 parents cf6ee72 + a5a4441 commit 37ff1cd

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

Project.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ NLsolve = "2774e3e8-f4cf-5e23-947b-6d7e65073b56"
256256
ODEProblemLibrary = "fdc4e326-1af4-4b90-96e7-779fcce2daa5"
257257
ParameterizedFunctions = "65888b18-ceab-5e60-b2b9-181511a3b968"
258258
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
259-
PoissonRandom = "e409e4f3-bfea-5376-8464-e040bb5c01ab"
260-
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
261259
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
262260
RecursiveFactorization = "f2c3362d-daeb-58d1-803e-2bc74f2840b4"
263261
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
@@ -272,4 +270,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
272270
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
273271

274272
[targets]
275-
test = ["ComponentArrays", "Symbolics", "AlgebraicMultigrid", "IncompleteLU", "DiffEqCallbacks", "DifferentiationInterface", "DiffEqDevTools", "ODEProblemLibrary", "ElasticArrays", "ExplicitImports", "InteractiveUtils", "ParameterizedFunctions", "JLArrays", "PoissonRandom", "Printf", "Random", "ReverseDiff", "SafeTestsets", "SparseArrays", "Statistics", "StructArrays", "Test", "Unitful", "ModelingToolkit", "Pkg", "NLsolve", "RecursiveFactorization", "SparseConnectivityTracer", "SparseMatrixColorings"]
273+
test = ["ComponentArrays", "Symbolics", "AlgebraicMultigrid", "IncompleteLU", "DiffEqCallbacks", "DifferentiationInterface", "DiffEqDevTools", "ODEProblemLibrary", "ElasticArrays", "ExplicitImports", "InteractiveUtils", "ParameterizedFunctions", "JLArrays", "Random", "ReverseDiff", "SafeTestsets", "SparseArrays", "Statistics", "StructArrays", "Test", "Unitful", "ModelingToolkit", "Pkg", "NLsolve", "RecursiveFactorization", "SparseConnectivityTracer", "SparseMatrixColorings"]

test/interface/enums.jl

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
using OrdinaryDiffEq, PoissonRandom
1+
using OrdinaryDiffEq, Random
2+
3+
# Simple Poisson random number generator using Knuth's algorithm
4+
function pois_rand::Float64)
5+
L = exp(-λ)
6+
k = 0
7+
p = 1.0
8+
while p > L
9+
k += 1
10+
p *= rand()
11+
end
12+
return k - 1
13+
end
214

315
function rate_to_proportion(r::Float64, t::Float64)
416
1 - exp(-r * t)

test/regression/ode_dense_tests.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
using OrdinaryDiffEq, Test, DiffEqBase
22
using OrdinaryDiffEqCore
3-
using ForwardDiff, Printf
3+
using ForwardDiff
44
import ODEProblemLibrary: prob_ode_linear,
55
prob_ode_2Dlinear,
66
prob_ode_bigfloatlinear, prob_ode_bigfloat2Dlinear
77
# use `PRINT_TESTS = true` to print the tests, including results
88
const PRINT_TESTS = false
99
print_results(x) =
1010
if PRINT_TESTS
11-
@printf("%s \n", x)
11+
println(x)
1212
end
1313

1414
# points and storage arrays used in the interpolation tests

0 commit comments

Comments
 (0)