Merge remote-tracking branch 'origin/master'

README.md

@@ -12,8 +12,6 @@
 
 This is a library of callbacks for extending the solvers of DifferentialEquations.jl.
 
-Currently only one callback is implemented.
-
 ## Usage
 
 

REQUIRE

@@ -1,5 +1,6 @@
-julia 0.6.0-pre
+julia 0.6.0
 DiffEqBase 0.6.0
 NLsolve
 ForwardDiff 0.5.0
 DiffBase
+OrdinaryDiffEq

src/autoabstol.jl

@@ -1,4 +1,4 @@
-type AutoAbstolAffect{T}
+mutable struct AutoAbstolAffect{T}
   curmax::T
 end
 # Now make `affect!` for this:

src/manifold.jl

@@ -10,7 +10,7 @@ Base.@pure function determine_chunksize(u,CS)
   end
 end
 
-function autodiff_setup{CS}(f!, initial_x,chunk_size::Type{Val{CS}})
+function autodiff_setup(f!, initial_x,chunk_size::Type{Val{CS}}) where CS
 
     permf! = (fx, x) -> f!(reshape(x,size(initial_x)...), fx)
 
@@ -33,10 +33,10 @@ function non_autodiff_setup(f!, initial_x)
   DifferentiableMultivariateFunction((x,resid)->f!(reshape(x,size(initial_x)...), resid))
 end
 
-immutable NLSOLVEJL_SETUP{CS,AD} end
+struct NLSOLVEJL_SETUP{CS,AD} end
 Base.@pure NLSOLVEJL_SETUP(;chunk_size=0,autodiff=true) = NLSOLVEJL_SETUP{chunk_size,autodiff}()
 (p::NLSOLVEJL_SETUP)(f, u0; kwargs...) = (res=NLsolve.nlsolve(f, u0; kwargs...); res.zero)
-function (p::NLSOLVEJL_SETUP{CS,AD}){CS,AD}(::Type{Val{:init}},f,u0_prototype)
+function (p::NLSOLVEJL_SETUP{CS,AD})(::Type{Val{:init}},f,u0_prototype) where {CS,AD}
   if AD
     return non_autodiff_setup(f,u0_prototype)
   else
@@ -45,7 +45,7 @@ function (p::NLSOLVEJL_SETUP{CS,AD}){CS,AD}(::Type{Val{:init}},f,u0_prototype)
 end
 
 get_chunksize(x) = 0
-get_chunksize{CS,AD}(x::NLSOLVEJL_SETUP{CS,AD}) = CS
+get_chunksize(x::NLSOLVEJL_SETUP{CS,AD}) where {CS,AD} = CS
 
 #########################
 

test/REQUIRE

@@ -1,2 +1 @@
-OrdinaryDiffEq
 DiffEqProblemLibrary