Add helpers for problem manipulation

Author: BenChung

Project.toml

@@ -10,6 +10,7 @@ DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"
 DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
+SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
 

src/ModelTesting.jl

@@ -8,4 +8,5 @@ include("test/continuous/delta_sol.jl")
 include("test/discrete/single_shooting.jl")
 include("test/discrete/merge.jl")
 include("test/metric/metric.jl")
+include("problem_config/problem.jl")
 end

src/problem_config/problem.jl

@@ -0,0 +1,14 @@
+module ProblemHelpers
+import SciMLBase
+using DataFrames, DifferentialEquations
+# some thin wrappers over remake
+initial_condition(prob::SciMLBase.AbstractDEProblem, u0) = remake(prob, u0 = u0)
+tspan(prob::SciMLBase.AbstractDEProblem, tspan) = remake(prob, tspan = tspan)
+parameters(prob::SciMLBase.AbstractDEProblem, ps) = remake(prob, p = ps)
+
+remake_solver_kwarg(prob, merge; kwargs...) = remake(prob; kwargs = mergewith(merge, kwargs, prob.kwargs))
+tstops(prob::SciMLBase.AbstractDEProblem, tstops) = remake_solver_kwarg(prob, (new, old) -> sort!([new; old]); tstops = tstops)
+tstops(prob::SciMLBase.AbstractDEProblem, tstops::DataFrame) = tstops(prob, collect(tstops[:, :timestamp]))
+
+export initial_condition, tspan, parameters, tstops
+end

src/test/discrete/single_shooting.jl

@@ -9,6 +9,14 @@ function compare_discrete(sys, data_a::DataFrame, data_b::DataFrame, evaluations
     @assert "timestamp" ∈ names(data_a) "The dataset A must contain a column named `timestamp`"
     @assert "timestamp" ∈ names(data_b) "The dataset B must contain a column named `timestamp`"
 
+    data_a = semijoin(data_a, data_b, on=:timestamp)
+    data_b = semijoin(data_b, data_a, on=:timestamp)
+    if nrow(data_a) == 0 || nrow(data_b) == 0
+        throw("Comparison datasets are empty; check that the intersection of the discretization times is nonempty")
+    end
+    if nrow(data_a) <= 2 || nrow(data_b) <= 2
+        @warn "Two or fewer (typically start and end) timestamps exist in the compared datasets; check that the time discretization of the comparisons align"
+    end
     test_results = Dict{Symbol, Any}()
     for evaluation in evaluations
         test_results = mergewith(merge, test_results, Dict([evaluate(evaluation, sys, data_a, data_b); ]))

test/block_modeling.jl

@@ -38,8 +38,6 @@ using ModelingToolkitStandardLibrary.Blocks: Constant
         d3 = discretize_solution(sol3, sol1)
         results_good = compare_discrete(sys, d1, d2)
         results_bad = compare_discrete(sys, d1, d3)
-
-        println(results_bad)
     end
     @testset "RC Functional" begin 
         R = 1.0
@@ -76,7 +74,5 @@ using ModelingToolkitStandardLibrary.Blocks: Constant
         d3 = discretize_solution(sol3, sol1)
         results_good = compare_discrete(sys, d1, d2)
         results_bad = compare_discrete(sys, d1, d3)
-
-        println(results_bad)
     end
 end