Merge pull request #529 from ChrisRackauckas-Claude/fff-strategy-batched-evals

Use FFF strategy API for sorted-batch evaluators (fixes n ≫ m regression)

Author: ChrisRackauckas

Project.toml

@@ -38,7 +38,7 @@ BenchmarkTools = "1"
 ChainRulesCore = "1.25"
 EnumX = "1.0.4"
 FillArrays = "1.13"
-FindFirstFunctions = "1.3"
+FindFirstFunctions = "2"
 FiniteDifferences = "0.12.31"
 ForwardDiff = "0.10.37, 1"
 LinearAlgebra = "1.10"

src/DataInterpolations.jl

@@ -8,8 +8,8 @@ using LinearAlgebra, RecipesBase
 using PrettyTables
 using ForwardDiff
 using EnumX
-import FindFirstFunctions: searchsortedfirstcorrelated, searchsortedlastcorrelated,
-    Guesser
+import FindFirstFunctions
+import FindFirstFunctions: Guesser
 
 @enumx ExtrapolationType None Constant Linear Extension Periodic Reflective
 

src/integral_inverses.jl

@@ -33,17 +33,19 @@ Can be easily constructed with `invert_integral(A::LinearInterpolation{<:Abstrac
   - `t` : Given by `A.I` (the cumulative integral of `A`)
   - `A` : The `LinearInterpolation` object
 """
-struct LinearInterpolationIntInv{uType, tType, itpType, T} <:
+struct LinearInterpolationIntInv{uType, tType, itpType, T, propsType} <:
     AbstractIntegralInverseInterpolation{T}
     u::uType
     t::tType
     extrapolation_left::ExtrapolationType.T
     extrapolation_right::ExtrapolationType.T
     iguesser::Guesser{tType}
+    t_props::propsType
     itp::itpType
     function LinearInterpolationIntInv(u, t, A, extrapolation_left, extrapolation_right)
-        return new{typeof(u), typeof(t), typeof(A), eltype(u)}(
-            u, t, extrapolation_left, extrapolation_right, Guesser(t), A
+        t_props = FindFirstFunctions.SearchProperties(t)
+        return new{typeof(u), typeof(t), typeof(A), eltype(u), typeof(t_props)}(
+            u, t, extrapolation_left, extrapolation_right, Guesser(t), t_props, A
         )
     end
 end
@@ -93,19 +95,21 @@ Can be easily constructed with `invert_integral(A::ConstantInterpolation{<:Abstr
   - `t` : Given by `A.I` (the cumulative integral of `A`)
   - `A` : The `ConstantInterpolation` object
 """
-struct ConstantInterpolationIntInv{uType, tType, itpType, T} <:
+struct ConstantInterpolationIntInv{uType, tType, itpType, T, propsType} <:
     AbstractIntegralInverseInterpolation{T}
     u::uType
     t::tType
     extrapolation_left::ExtrapolationType.T
     extrapolation_right::ExtrapolationType.T
     iguesser::Guesser{tType}
+    t_props::propsType
     itp::itpType
     function ConstantInterpolationIntInv(
             u, t, A, extrapolation_left, extrapolation_right
         )
-        return new{typeof(u), typeof(t), typeof(A), eltype(u)}(
-            u, t, extrapolation_left, extrapolation_right, Guesser(t), A
+        t_props = FindFirstFunctions.SearchProperties(t)
+        return new{typeof(u), typeof(t), typeof(A), eltype(u), typeof(t_props)}(
+            u, t, extrapolation_left, extrapolation_right, Guesser(t), t_props, A
         )
     end
 end