Merge pull request #17 from QuEraComputing/update-integrate

Update interface to catch errors.
QuEraComputing · Jan 3, 2024 · b6f2e17 · b6f2e17 · weinbe58 · Jan 3, 2024
2 parents ccdcc74 + b2b21e4
commit b6f2e17
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "DormandPrince"
 uuid = "5e45e72d-22b8-4dd0-9c8b-f96714864bcd"
 authors = ["John Long<jlong@quera.com>", "Phillip Weinberg<pweinberg@quera.com>"]
-version = "0.4.0"
+version = "0.5.0"
 
 [deps]
 

diff --git a/src/dp5/solver.jl b/src/dp5/solver.jl
@@ -3,7 +3,7 @@
 #include("checks.jl")
 #include("helpers.jl")
 
-function  DormandPrince.integrate!(
+function  DormandPrince.integrate_core!(
    solver::DP5Solver{T},
    xend::T
 ) where T

diff --git a/src/dp8/solver.jl b/src/dp8/solver.jl
@@ -3,7 +3,7 @@
 #include("checks.jl")
 #include("helpers.jl")
 
-function  DormandPrince.integrate!(
+function  DormandPrince.integrate_core!(
    solver::DP8Solver{T},
    xend::T
 ) where T
@@ -21,6 +21,10 @@ function  DormandPrince.integrate!(
     check_beta(solver.options) || return Report(solver.vars.x, DormandPrince.CURIOUS_BETA, DormandPrince.INPUT_NOT_CONSISTENT, 0, 0, 0, 0)
     check_safety_factor(solver.options) || return Report(solver.vars.x, DormandPrince.CURIOUS_SAFETY_FACTOR, DormandPrince.INPUT_NOT_CONSISTENT, 0, 0, 0, 0)
 
+    if solver.vars.x == xend
+        return Report(solver.vars.x, DormandPrince.INPUT_CHECKS_SUCCESSFUL, DormandPrince.COMPUTATION_SUCCESSFUL, 0, 0, 0, 0)
+    end
+
     ###### nstiff -  parameters for stiffness detection
     # nstiff = solver_options.stiffness_test_activation_step
 

diff --git a/src/interface.jl b/src/interface.jl
@@ -30,13 +30,21 @@ end
 # 3. integrate(callback, solver, times) -> vector of states with callback applied
 
 get_current_state(::AbstractDPSolver) = error("not implemented")
-integrate!(::AbstractDPSolver{T}, ::T) where T = error("not implemented")
+integrate_core!(::AbstractDPSolver{T}, ::T) where T = error("not implemented")
+
+function integrate!(solver::AbstractDPSolver{T}, time::T) where T <: Real
+    report = integrate_core!(solver, time)
+    if report.idid != COMPUTATION_SUCCESSFUL
+        error("integration failed at time $time with report $report")
+    end
+end
 function integrate!(callback, solver::AbstractDPSolver{T}, times::AbstractVector{T}; sort_times::Bool = true) where {T <: Real}
     times = sort_times ? sort(collect(times)) : times
 
     result = []
     for time in times
         integrate!(solver, time)
+
         push!(result, callback(time, get_current_state(solver)))
     end