stronger typing of interpolations, callback changes

SciML · Jan 8, 2017 · 0fd1c7a · 0fd1c7a
1 parent e70fbdb
commit 0fd1c7a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/callbacks.jl b/src/callbacks.jl
@@ -1,6 +1,7 @@
-immutable Callback{F1,F2,T,T2} <: DECallback
+immutable Callback{F1,F2,F3,T,T2} <: DECallback
   condition::F1
   affect!::F2
+  affect_neg!::F3
   rootfind::Bool
   interp_points::Int
   save_positions::Tuple{Bool,Bool}
@@ -9,8 +10,10 @@ immutable Callback{F1,F2,T,T2} <: DECallback
 end
 
 Callback(condition,affect!,
-         rootfind,interp_points,
+         rootfind,
          save_positions;
-         abstol=1e-14,reltol=0) = Callback(condition,affect!,
+         affect_neg! = affect!,
+         interp_points=10,
+         abstol=1e-14,reltol=0) = Callback(condition,affect!,affect_neg!,
                     rootfind,interp_points,
                     save_positions,abstol,reltol)
diff --git a/src/problems/ode_problems.jl b/src/problems/ode_problems.jl
@@ -4,10 +4,10 @@ type ODEProblem{uType,tType,isinplace,F} <: AbstractODEProblem{uType,tType,isinp
   tspan::Tuple{tType,tType}
 end
 
-type ODETestProblem{uType,tType,isinplace,F} <: AbstractODETestProblem{uType,tType,isinplace,F}
+type ODETestProblem{uType,AType,tType,isinplace,F} <: AbstractODETestProblem{uType,tType,isinplace,F}
   f::F
   u0::uType
-  analytic::Base.Callable
+  analytic::AType
   tspan::Tuple{tType,tType}
 end
 
@@ -16,7 +16,7 @@ function ODEProblem(f,u0,tspan; iip = isinplace(f,3))
 end
 
 function ODETestProblem(f,u0,analytic,tspan=(0.0,1.0); iip = isinplace(f,3))
-  ODETestProblem{typeof(u0),eltype(tspan),iip,typeof(f)}(f,u0,analytic,tspan)
+  ODETestProblem{typeof(u0),typeof(analytic),eltype(tspan),iip,typeof(f)}(f,u0,analytic,tspan)
 end
 
 function print{uType,tType,isinplace,F}(io::IO, prob::AbstractODEProblem{uType,tType,isinplace,F})

diff --git a/src/solutions/ode_solutions.jl b/src/solutions/ode_solutions.jl
@@ -1,26 +1,26 @@
 ### Concrete Types
 
-type ODESolution{uType,tType,rateType,P,A} <: AbstractODESolution
+type ODESolution{uType,tType,rateType,P,A,IType} <: AbstractODESolution
   u::uType
   t::tType
   k::rateType
   prob::P
   alg::A
-  interp::Function
+  interp::IType
   dense::Bool
   tslocation::Int
 end
 (sol::ODESolution)(t) = sol.interp(t)
 
-type ODETestSolution{uType,uType2,uEltype,tType,rateType,P,A} <: AbstractODETestSolution
+type ODETestSolution{uType,uType2,uEltype,tType,rateType,P,A,IType} <: AbstractODETestSolution
   u::uType
   u_analytic::uType2
   errors::Dict{Symbol,uEltype}
   t::tType
   k::rateType
   prob::P
   alg::A
-  interp::Function
+  interp::IType
   dense::Bool
   tslocation::Int
 end