Skip to content

Commit

Permalink
try inner constructor
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisRackauckas committed May 3, 2017
1 parent d24d72a commit 53c4a69
Showing 1 changed file with 23 additions and 3 deletions.
26 changes: 23 additions & 3 deletions src/integrators/type.jl
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,36 @@ type ODEIntegrator{algType<:OrdinaryDiffEqAlgorithm,uType,tType,tTypeNoUnits,tdi
fsalfirst::rateType
fsallast::rateType

ODEIntegrator(sol,u,k,t,dt,f,uprev,uprev2,tprev,
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 (::ODEIntegrator){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,
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,
kshortsize,just_hit_tstop,accept_step,isout,reeval_fsal,u_modified,opts)

new{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,
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

# When this is changed, DelayDiffEq.jl must be changed as well!

0 comments on commit 53c4a69

Please sign in to comment.