Merge pull request #206 from SciML/perf_ref

Improve long performance and prevent repeat calls in PresetTimeCallback
SciML · Feb 27, 2024 · 44980a1 · 44980a1
2 parents e20fc6c + 8bd54d3
commit 44980a1
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/src/preset_time.jl b/src/preset_time.jl
@@ -21,15 +21,36 @@ automatic.
     Defaults to true. If false, then tstops can extend the interval of integration.
 """
 function PresetTimeCallback(tstops, user_affect!;
-        initialize = SciMLBase.INITIALIZE_DEFAULT,
-        filter_tstops = true, kwargs...)
-    condition = function (u, t, integrator)
-        t in tstops
+                            initialize = SciMLBase.INITIALIZE_DEFAULT,
+                            filter_tstops = true, 
+                            sort_inplace = false, kwargs...)
+
+    local tdir
+    if tstops isa AbstractVector
+        if sort_inplace
+            sort!(tstops)
+        else
+            tstops = sort(tstops)
+        end
+        search_start, search_end = firstindex(tstops), lastindex(tstops)
+        condition = function (u, t, integrator)
+            t in @view(tstops[search_start:search_end])
+        end
+    else
+        search_start, search_end = 0, 0
+        condition = function (u, t, integrator)
+            t == tstops
+        end
     end
 
     # Call f, update tnext, and make sure we stop at the new tnext
     affect! = function (integrator)
         user_affect!(integrator)
+        if integrator.tdir > 0
+            search_start += 1
+        else
+            search_end -= 1
+        end
         nothing
     end
 
@@ -50,6 +71,11 @@ function PresetTimeCallback(tstops, user_affect!;
         end
         if t ∈ tstops
             user_affect!(integrator)
+            if integrator.tdir > 0
+                search_start += 1
+            else
+                search_end -= 1
+            end
         end
     end
     DiscreteCallback(condition, affect!; initialize = initialize_preset, kwargs...)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -21,9 +21,6 @@ using Test
     @time @testset "IndependentlyLinearized tests" begin
         include("independentlylinearizedtests.jl")
     end
-    @time @testset "Saving tests" begin
-        include("saving_tests.jl")
-    end
     @time @testset "PresetTime tests" begin
         include("preset_time.jl")
     end
@@ -48,4 +45,7 @@ using Test
     @time @testset "Integrating sum tests" begin
         include("integrating_sum_tests.jl")
     end
+    @time @testset "Saving tests" begin
+        include("saving_tests.jl")
+    end
 end