refactor: throw custom exception function instead of error

SciML · Oct 17, 2023 · d45c36f · d45c36f
1 parent c04f54a
commit d45c36f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/DataInterpolations.jl b/src/DataInterpolations.jl
@@ -36,6 +36,12 @@ function (interp::AbstractInterpolation)(u::AbstractVector, t::AbstractVector)
     u
 end
 
+const EXTRAPOLATION_ERROR = "Cannot extrapolate as `extrapolate` keyword passed was `false`"
+struct ExtrapolationError <: Exception end
+function Base.showerror(io::IO, e::ExtrapolationError)
+    print(io, EXTRAPOLATION_ERROR)
+end
+
 export LinearInterpolation, QuadraticInterpolation, LagrangeInterpolation,
     AkimaInterpolation, ConstantInterpolation, QuadraticSpline, CubicSpline,
     BSplineInterpolation, BSplineApprox

diff --git a/src/derivatives.jl b/src/derivatives.jl
@@ -1,5 +1,5 @@
 function derivative(A, t)
-    ((t < A.t[1] || t > A.t[end]) && !A.extrapolate) && error("Cannot extrapolate!")
+    ((t < A.t[1] || t > A.t[end]) && !A.extrapolate) && throw(ExtrapolationError())
     derivative(A, t, firstindex(A.t) - 1)[1]
 end
 
@@ -36,7 +36,7 @@ function derivative(A::QuadraticInterpolation{<:AbstractMatrix}, t::Number, igue
 end
 
 function derivative(A::LagrangeInterpolation{<:AbstractVector}, t::Number)
-    ((t < A.t[1] || t > A.t[end]) && !A.extrapolate) && error("Cannot extrapolate!")
+    ((t < A.t[1] || t > A.t[end]) && !A.extrapolate) && throw(ExtrapolationError())
     idxs = findRequiredIdxs(A, t)
     if A.t[idxs[1]] == t
         return zero(A.u[idxs[1]])
@@ -72,7 +72,7 @@ function derivative(A::LagrangeInterpolation{<:AbstractVector}, t::Number)
 end
 
 function derivative(A::LagrangeInterpolation{<:AbstractMatrix}, t::Number)
-    ((t < A.t[1] || t > A.t[end]) && !A.extrapolate) && error("Cannot extrapolate!")
+    ((t < A.t[1] || t > A.t[end]) && !A.extrapolate) && throw(ExtrapolationError())
     idxs = findRequiredIdxs(A, t)
     if A.t[idxs[1]] == t
         return zero(A.u[:, idxs[1]])
@@ -120,12 +120,12 @@ function derivative(A::AkimaInterpolation{<:AbstractVector}, t::Number, iguess)
 end
 
 function derivative(A::ConstantInterpolation{<:AbstractVector}, t::Number)
-    ((t < A.t[1] || t > A.t[end]) && !A.extrapolate) && error("Cannot extrapolate!")
+    ((t < A.t[1] || t > A.t[end]) && !A.extrapolate) && throw(ExtrapolationError())
     return isempty(searchsorted(A.t, t)) ? zero(A.u[1]) : eltype(A.u)(NaN)
 end
 
 function derivative(A::ConstantInterpolation{<:AbstractMatrix}, t::Number)
-    ((t < A.t[1] || t > A.t[end]) && !A.extrapolate) && error("Cannot extrapolate!")
+    ((t < A.t[1] || t > A.t[end]) && !A.extrapolate) && throw(ExtrapolationError())
     return isempty(searchsorted(A.t, t)) ? zero(A.u[:, 1]) : eltype(A.u)(NaN) .* A.u[:, 1]
 end
 

diff --git a/src/interpolation_methods.jl b/src/interpolation_methods.jl
@@ -1,6 +1,6 @@
 function _interpolate(interp, t)
     ((t < interp.t[1] || t > interp.t[end]) && !interp.extrapolate) &&
-        error("Cannot extrapolate!")
+        throw(ExtrapolationError())
     _interpolate(interp, t, firstindex(interp.t) - 1)[1]
 end
 
@@ -57,7 +57,7 @@ end
 
 # Lagrange Interpolation
 function _interpolate(A::LagrangeInterpolation{<:AbstractVector}, t::Number)
-    ((t < A.t[1] || t > A.t[end]) && !A.extrapolate) && error("Cannot extrapolate!")
+    ((t < A.t[1] || t > A.t[end]) && !A.extrapolate) && throw(ExtrapolationError())
     idxs = findRequiredIdxs(A, t)
     if A.t[idxs[1]] == t
         return A.u[idxs[1]]
@@ -86,7 +86,7 @@ function _interpolate(A::LagrangeInterpolation{<:AbstractVector}, t::Number)
 end
 
 function _interpolate(A::LagrangeInterpolation{<:AbstractMatrix}, t::Number)
-    ((t < A.t[1] || t > A.t[end]) && !A.extrapolate) && error("Cannot extrapolate!")
+    ((t < A.t[1] || t > A.t[end]) && !A.extrapolate) && throw(ExtrapolationError())
     idxs = findRequiredIdxs(A, t)
     if A.t[idxs[1]] == t
         return A.u[:, idxs[1]]