more ambiguities

src/aggregators/coevolve.jl

@@ -146,7 +146,8 @@ function aggregate(aggregator::Coevolve, u, p, t, end_time, constant_jumps,
 end
 
 # set up a new simulation and calculate the first jump / jump time
-function initialize!(p::CoevolveJumpAggregation, integrator, u, params, t)
+function initialize!(p::CoevolveJumpAggregation, integrator::DiffEqBase.DEIntegrator, u,
+                     params, t)
     p.end_time = integrator.sol.prob.tspan[2]
     fill_rates_and_get_times!(p, u, params, t)
     generate_jumps!(p, integrator, u, params, t)

src/aggregators/direct.jl

@@ -45,7 +45,8 @@ function aggregate(aggregator::DirectFW, u, p, t, end_time, constant_jumps,
 end
 
 # set up a new simulation and calculate the first jump / jump time
-function initialize!(p::DirectJumpAggregation, integrator, u, params, t)
+function initialize!(p::DirectJumpAggregation, integrator::DiffEqBase.DEIntegrator, u,
+                     params, t)
     p.end_time = integrator.sol.prob.tspan[2]
     generate_jumps!(p, integrator, u, params, t)
     nothing

src/aggregators/directcr.jl

@@ -85,7 +85,8 @@ function aggregate(aggregator::DirectCR, u, p, t, end_time, constant_jumps,
 end
 
 # set up a new simulation and calculate the first jump / jump time
-function initialize!(p::DirectCRJumpAggregation, integrator, u, params, t)
+function initialize!(p::DirectCRJumpAggregation, integrator::DiffEqBase.DEIntegrator, u,
+                     params, t)
     p.end_time = integrator.sol.prob.tspan[2]
 
     # initialize rates

src/aggregators/frm.jl

@@ -45,7 +45,8 @@ function aggregate(aggregator::FRMFW, u, p, t, end_time, constant_jumps,
 end
 
 # set up a new simulation and calculate the first jump / jump time
-function initialize!(p::FRMJumpAggregation, integrator, u, params, t)
+function initialize!(p::FRMJumpAggregation, integrator::DiffEqBase.DEIntegrator, u,
+                     params, t)
     p.end_time = integrator.sol.prob.tspan[2]
     generate_jumps!(p, integrator, u, params, t)
     nothing

src/aggregators/nrm.jl

@@ -60,7 +60,8 @@ function aggregate(aggregator::NRM, u, p, t, end_time, constant_jumps,
 end
 
 # set up a new simulation and calculate the first jump / jump time
-function initialize!(p::NRMJumpAggregation, integrator, u, params, t)
+function initialize!(p::NRMJumpAggregation, integrator::DiffEqBase.DEIntegrator, u,
+                     params, t)
     p.end_time = integrator.sol.prob.tspan[2]
     fill_rates_and_get_times!(p, u, params, t)
     generate_jumps!(p, integrator, u, params, t)

src/aggregators/rdirect.jl

@@ -64,7 +64,8 @@ function aggregate(aggregator::RDirect, u, p, t, end_time, constant_jumps,
 end
 
 # set up a new simulation and calculate the first jump / jump time
-function initialize!(p::RDirectJumpAggregation, integrator, u, params, t)
+function initialize!(p::RDirectJumpAggregation, integrator::DiffEqBase.DEIntegrator, u,
+                     params, t)
     p.end_time = integrator.sol.prob.tspan[2]
     fill_rates_and_sum!(p, u, params, t)
     p.max_rate = maximum(p.cur_rates)

src/aggregators/rssa.jl

@@ -85,7 +85,8 @@ function aggregate(aggregator::RSSA, u, p, t, end_time, constant_jumps,
 end
 
 # set up a new simulation and calculate the first jump / jump time
-function initialize!(p::RSSAJumpAggregation, integrator, u, params, t)
+function initialize!(p::RSSAJumpAggregation, integrator::DiffEqBase.DEIntegrator,
+                     u, params, t)
     p.end_time = integrator.sol.prob.tspan[2]
     set_bracketing!(p, u, params, t)
     generate_jumps!(p, integrator, u, params, t)

src/aggregators/rssacr.jl

@@ -102,7 +102,8 @@ function aggregate(aggregator::RSSACR, u, p, t, end_time, constant_jumps,
 end
 
 # set up a new simulation and calculate the first jump / jump time
-function initialize!(p::RSSACRJumpAggregation, integrator, u, params, t)
+function initialize!(p::RSSACRJumpAggregation, integrator::DiffEqBase.DEIntegrator,
+                     u, params, t)
     p.end_time = integrator.sol.prob.tspan[2]
     set_bracketing!(p, u, params, t)
 

src/aggregators/sortingdirect.jl

@@ -64,7 +64,8 @@ function aggregate(aggregator::SortingDirect, u, p, t, end_time, constant_jumps,
 end
 
 # set up a new simulation and calculate the first jump / jump time
-function initialize!(p::SortingDirectJumpAggregation, integrator, u, params, t)
+function initialize!(p::SortingDirectJumpAggregation, integrator::DiffEqBase.DEIntegrator,
+                     u, params, t)
     p.end_time = integrator.sol.prob.tspan[2]
     fill_rates_and_sum!(p, u, params, t)
     generate_jumps!(p, integrator, u, params, t)

src/spatial/directcrdirect.jl

@@ -104,7 +104,8 @@ function aggregate(aggregator::DirectCRDirect, starting_state, p, t, end_time,
 end
 
 # set up a new simulation and calculate the first jump / jump time
-function initialize!(p::DirectCRDirectJumpAggregation, integrator, u, params, t)
+function initialize!(p::DirectCRDirectJumpAggregation, integrator::DiffEqBase.DEIntegrator,
+                     u, params, t)
     p.end_time = integrator.sol.prob.tspan[2]
     fill_rates_and_get_times!(p, integrator, t)
     generate_jumps!(p, integrator, params, u, t)

src/spatial/nsm.jl

@@ -92,7 +92,8 @@ function aggregate(aggregator::NSM, starting_state, p, t, end_time, constant_jum
 end
 
 # set up a new simulation and calculate the first jump / jump time
-function initialize!(p::NSMJumpAggregation, integrator, u, params, t)
+function initialize!(p::NSMJumpAggregation, integrator::DiffEqBase.DEIntegrator, u,
+                     params, t)
     p.end_time = integrator.sol.prob.tspan[2]
     fill_rates_and_get_times!(p, integrator, t)
     generate_jumps!(p, integrator, params, u, t)