@@ -5,9 +5,8 @@ module MATLABDiffEq
5
5
using Reexport
6
6
@reexport using DiffEqBase
7
7
using MATLAB
8
- import DiffEqBase: solve
9
8
10
- abstract MATLABAlgorithm <: AbstractODEAlgorithm
9
+ abstract MATLABAlgorithm <: DiffEqBase. AbstractODEAlgorithm
11
10
immutable ode23 <: MATLABAlgorithm end
12
11
immutable ode45 <: MATLABAlgorithm end
13
12
immutable ode113 <: MATLABAlgorithm end
@@ -17,13 +16,15 @@ immutable ode23tb <: MATLABAlgorithm end
17
16
immutable ode15s <: MATLABAlgorithm end
18
17
immutable ode15i <: MATLABAlgorithm end
19
18
20
- function solve {uType,tType ,isinplace,AlgType<:MATLABAlgorithm} (
21
- prob:: AbstractODEProblem{uType,tType ,isinplace} ,
19
+ function DiffEqBase . __solve {uType,tupType ,isinplace,AlgType<:MATLABAlgorithm} (
20
+ prob:: DiffEqBase. AbstractODEProblem{uType,tupType ,isinplace} ,
22
21
alg:: AlgType ,timeseries= [],ts= [],ks= [];
23
- saveat= tType[],timeseries_errors= true ,reltol = 1e-3 , abstol = 1e-6 ,
22
+ saveat= eltype ( tType) [],timeseries_errors= true ,reltol = 1e-3 , abstol = 1e-6 ,
24
23
kwargs... )
24
+
25
+ tType = eltype (tupType)
25
26
26
- if ! (typeof (prob. f) <: AbstractParameterizedFunction )
27
+ if ! (typeof (prob. f) <: DiffEqBase. AbstractParameterizedFunction )
27
28
error (" Functions must be defined via ParameterizedFunctions.jl to work with this package." )
28
29
end
29
30
@@ -79,7 +80,7 @@ function solve{uType,tType,isinplace,AlgType<:MATLABAlgorithm}(
79
80
timeseries = timeseries_tmp
80
81
end
81
82
82
- build_solution (prob,alg,ts,timeseries,
83
+ DiffEqBase . build_solution (prob,alg,ts,timeseries,
83
84
timeseries_errors = timeseries_errors)
84
85
end
85
86
0 commit comments