Skip to content

Commit c21f941

Browse files
Merged branch master into master
2 parents 74f849b + 8475a06 commit c21f941

File tree

6 files changed

+9
-11
lines changed

6 files changed

+9
-11
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ os:
55
- osx
66
julia:
77
- 0.5
8+
- nightly
89
matrix:
910
allow_failures:
1011
- julia: nightly

REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ ResettableStacks 0.0.1
77
Juno 0.2.5
88
Roots
99
Iterators
10-
Compat 0.18.0
10+
Compat 0.17.0

src/algorithms.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
abstract StochasticDiffEqAlgorithm <: AbstractSDEAlgorithm
2-
abstract StochasticDiffEqAdaptiveAlgorithm <: StochasticDiffEqAlgorithm
3-
abstract StochasticDiffEqCompositeAlgorithm <: StochasticDiffEqAlgorithm
1+
@compat abstract type StochasticDiffEqAlgorithm <: AbstractSDEAlgorithm end
2+
@compat abstract type StochasticDiffEqAdaptiveAlgorithm <: StochasticDiffEqAlgorithm end
3+
@compat abstract type StochasticDiffEqCompositeAlgorithm <: StochasticDiffEqAlgorithm end
44

55
@with_kw immutable EM{RSType} <: StochasticDiffEqAlgorithm
66
rswm::RSType = RSWM(adaptivealg=:RSwM1)

src/caches.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
abstract StochasticDiffEqCache <: DECache
2-
abstract StochasticDiffEqConstantCache <: StochasticDiffEqCache
3-
abstract StochasticDiffEqMutableCache <: StochasticDiffEqCache
1+
@compat abstract type StochasticDiffEqCache <: DECache end
2+
@compat abstract type StochasticDiffEqConstantCache <: StochasticDiffEqCache end
3+
@compat abstract type StochasticDiffEqMutableCache <: StochasticDiffEqCache end
44

55
type StochasticCompositeCache{T,F} <: StochasticDiffEqCache
66
caches::T

test/REQUIRE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
Plots 0.9.2
21
DiffEqDevTools
32
DiffEqProblemLibrary
43
ParameterizedFunctions

test/sde/sde_numbertype_tests.jl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
using StochasticDiffEq, Plots
1+
using StochasticDiffEq
22
srand(100)
33
prob = prob_sde_2Dlinear
44

55
## Solve and plot
66
println("Solve and Plot")
77
sol =solve(prob,SRI(),dt=1//2^(4),abstol=1,reltol=0)
88
err1 = sol.errors[:final]
9-
TEST_PLOT && plot(sol,plot_analytic=true,legend=false,title="tol = 1")
109

1110

1211
println("Solve and Plot")
1312
sol =solve(prob,SRI(),dt=1//2^(4),abstol=1,reltol=0)
1413
err1 = sol.errors[:final]
15-
TEST_PLOT && plot(sol,plot_analytic=true,legend=false,title="tol = 1")
1614

1715
@test true

0 commit comments

Comments
 (0)