final depwarn fix?

SciML · May 3, 2017 · a10a8fb · tkelman · May 4, 2017 · a10a8fb
1 parent cec21b3
commit a10a8fb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/src/integrators/type.jl b/src/integrators/type.jl
@@ -72,22 +72,7 @@ type ODEIntegrator{algType<:OrdinaryDiffEqAlgorithm,uType,tType,tTypeNoUnits,tdi
   fsalfirst::rateType
   fsallast::rateType
 
-  if VERSION < v"0.6-"
-
-    ODEIntegrator(sol,u,k,t,dt,f,uprev,uprev2,tprev,
-        alg,rate_prototype,notsaveat_idxs,dtcache,dtchangeable,dtpropose,tdir,
-        EEst,qold,q11,
-        iter,saveiter,saveiter_dense,prog,cache,
-        kshortsize,just_hit_tstop,accept_step,isout,reeval_fsal,u_modified,opts) = new(
-        sol,u,k,t,dt,f,uprev,uprev2,tprev,
-        alg,rate_prototype,notsaveat_idxs,dtcache,dtchangeable,dtpropose,tdir,
-        EEst,qold,q11,
-        iter,saveiter,saveiter_dense,prog,cache,
-        kshortsize,just_hit_tstop,accept_step,isout,reeval_fsal,u_modified,opts) # Leave off fsalfirst and last
-
-  else
-
-    function (::Type{ODEIntegrator{algType,uType,tType,tTypeNoUnits,tdirType,ksEltype,SolType,
+  function (::Type{ODEIntegrator{algType,uType,tType,tTypeNoUnits,tdirType,ksEltype,SolType,
                 rateType,F,ProgressType,CacheType,O}}){algType,uType,tType,tTypeNoUnits,tdirType,ksEltype,SolType,
                 rateType,F,ProgressType,CacheType,O}(sol,u,k,t,dt,f,uprev,uprev2,tprev,
       alg,rate_prototype,notsaveat_idxs,dtcache,dtchangeable,dtpropose,tdir,
@@ -101,7 +86,6 @@ type ODEIntegrator{algType<:OrdinaryDiffEqAlgorithm,uType,tType,tTypeNoUnits,tdi
       EEst,qold,q11,
       iter,saveiter,saveiter_dense,prog,cache,
       kshortsize,just_hit_tstop,accept_step,isout,reeval_fsal,u_modified,opts) # Leave off fsalfirst and last
-    end
   end
 end
 

diff --git a/test/iterator_tests.jl b/test/iterator_tests.jl
@@ -43,10 +43,17 @@ integrator([1.0;2.0])
 
 
 integrator = init(prob,RK4();dt=1//2^(9))
-for i in Base.Iterators.take(integrator,12) end
-@test integrator.iter == 12
-for i in Base.Iterators.take(integrator,12) end
-@test integrator.iter == 24
+if VERSION < v"0.6-"
+  for i in take(integrator,12) end
+  @test integrator.iter == 12
+  for i in take(integrator,12) end
+  @test integrator.iter == 24
+else
+  for i in Base.Iterators.take(integrator,12) end
+  @test integrator.iter == 12
+  for i in Base.Iterators.take(integrator,12) end
+  @test integrator.iter == 24
+end
 
 integrator = init(prob_ode_2Dlinear,Tsit5();dt=1//2^(4),tstops=[0.5],advance_to_tstop=true,stop_at_next_tstop=true)
 for (t,u) in tuples(integrator)