fix

SciML · Oct 17, 2024 · d314e61 · d314e61
1 parent a3b1c1d
commit d314e61
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/aggregators/ccnrm.jl b/src/aggregators/ccnrm.jl
@@ -39,7 +39,10 @@ function CCNRMJumpAggregation(nj::Int, njt::T, et::T, crs::Vector{T}, sr::T,
         add_self_dependencies!(dg)
     end
 
-    ptt = PriorityTimeTable(zeros(T, length(crs)), 0.0, 1.0) # We will re-initialize this in initialize!()
+    binwidthconst = haskey(kwargs, :binwidthconst) ? kwargs[:binwidthconst] : 16
+    numbinsconst = haskey(kwargs, :numbinsconst) ? kwargs[:numbinsconst] : 20
+    ptt = PriorityTimeTable(zeros(T, length(crs)), zero(T), one(T),
+        binwidthconst = binwidthconst, numbinsconst = numbinsconst) # We will re-initialize this in initialize!()
 
     affecttype = F2 <: Tuple ? F2 : Any
     CCNRMJumpAggregation{T, S, F1, affecttype, RNG, typeof(dg), typeof(ptt)}(
@@ -116,7 +119,7 @@ function update_dependent_rates!(p::CCNRMJumpAggregation, u, params, t)
         # Calculate new jump times for dependent jumps
         if rx != p.next_jump && oldrate > zero(oldrate)
             if cur_rates[rx] > zero(eltype(cur_rates))
-                update!(ptt, rx, oldtime, t + oldrate / cur_rates[rx] * (times[rx] - t))
+                update!(ptt, rx, oldtime, t + oldrate / cur_rates[rx] * (oldtime - t))
             else
                 update!(ptt, rx, oldtime, floatmax(typeof(t)))
             end

diff --git a/src/aggregators/prioritytable.jl b/src/aggregators/prioritytable.jl
@@ -323,7 +323,7 @@ end
 ### Routines for CCNRM ###
 ##########################
 
-mutable struct TimeGrouper{T <: Number}
+struct TimeGrouper{T <: Number}
     mintime::T
     binwidth::T
 end
@@ -347,9 +347,11 @@ end
 # Construct the time table with the default optimal bin width and number of bins. 
 # DEFAULT NUMBINS: 20 * √length(times)
 # DEFAULT BINWIDTH: 16 / sum(propensities)
-function PriorityTimeTable(times::AbstractVector, mintime, timestep)
-    numbins = floor(Int64, 20 * sqrt(length(times)))
-    maxtime = mintime + numbins * timestep
+function PriorityTimeTable(
+        times::AbstractVector, mintime, timestep; binwidthconst = 16, numbinsconst = 20)
+    binwidth = binwidthconst * timestep
+    numbins = floor(Int64, numbinsconst * sqrt(length(times)))
+    maxtime = mintime + numbins * binwidth
 
     pidtype = typeof(numbins)
     ptype = eltype(times)