fix everything

SciML · Aug 17, 2017 · 765287b · 765287b
1 parent 2dc09b7
commit 765287b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/integrator_utils.jl b/src/integrator_utils.jl
@@ -44,7 +44,7 @@ for calculation of DDE solution.
 
                     # correct other arrays
                     pop!(integrator.integrator.notsaveat_idxs)
-                    if typeof(integrator.integrator.alg) <: OrdinaryDiffEqCompositeAlgorithm
+                    if typeof(integrator.integrator.alg) <: OrdinaryDiffEq.OrdinaryDiffEqCompositeAlgorithm
                         deleteat!(integrator.integrator.alg_choice, integrator.saveiter + 1)
                     end
 
@@ -198,7 +198,7 @@ function build_solution_interpolation(integrator::DDEIntegrator, sol::DiffEqArra
         if typeof(integrator.opts.save_idxs) <: Void
             integrator.sol.interp
         else # update interpolation data if only a subset of indices is returned
-            if typeof(integrator.alg) <: OrdinaryDiffEqCompositeAlgorithm
+            if typeof(integrator.alg) <: OrdinaryDiffEq.OrdinaryDiffEqCompositeAlgorithm
                 OrdinaryDiffEq.CompositeInterpolationData(
                     integrator.sol.interp.f, [@view(u[integrator.opts.save_idxs]) for u in
                                               integrator.sol.interp.timeseries],
@@ -217,7 +217,7 @@ function build_solution_interpolation(integrator::DDEIntegrator, sol::DiffEqArra
             end
         end
     else # create not dense interpolation data if desired
-        if typeof(integrator.alg) <: OrdinaryDiffEqCompositeAlgorithm
+        if typeof(integrator.alg) <: OrdinaryDiffEq.OrdinaryDiffEqCompositeAlgorithm
             OrdinaryDiffEq.CompositeInterpolationData(
                 integrator.sol.interp.f, sol.u, sol.t, typeof(integrator.sol.k)(0), Int[],
                 Int[], false, integrator.sol.interp.cache)

diff --git a/src/solve.jl b/src/solve.jl
@@ -33,15 +33,15 @@ function init(prob::AbstractDDEProblem{uType,tType,lType,isinplace}, alg::algTyp
         interp_f = (t,u) -> prob.f(t,u,interp_h)
     end
 
-    if typeof(alg.alg) <: OrdinaryDiffEqCompositeAlgorithm
+    if typeof(alg.alg) <: OrdinaryDiffEq.OrdinaryDiffEqCompositeAlgorithm
         interp_data = OrdinaryDiffEq.CompositeInterpolationData(integrator.sol.interp,
                                                                 interp_f)
     else
         interp_data = OrdinaryDiffEq.InterpolationData(integrator.sol.interp,
                                                        interp_f)
     end
 
-    if typeof(alg.alg) <: OrdinaryDiffEqCompositeAlgorithm
+    if typeof(alg.alg) <: OrdinaryDiffEq.OrdinaryDiffEqCompositeAlgorithm
         sol = build_solution(prob, integrator.sol.alg, integrator.sol.t, integrator.sol.u,
                              dense=integrator.sol.dense, k=integrator.sol.k,
                              interp=interp_data, alg_choice=integrator.sol.alg_choice,
@@ -73,7 +73,7 @@ function init(prob::AbstractDDEProblem{uType,tType,lType,isinplace}, alg::algTyp
                                                        integrator.opts.reltol,
                                                        integrator.opts.internalnorm,
                                                        ode_prob,
-                                                       OrdinaryDiffEq.alg_order(alg)))
+                                                       OrdinaryDiffEq.alg_order(alg),alg))
     end
     # assure that ODE integrator satisfies tprev + dt == t
     integrator.dt = zero(integrator.dt)