Clean up the older methods

Author: BenChung

src/ModelTesting.jl

@@ -4,11 +4,8 @@ using ModelingToolkit, SciMLBase, SymbolicIndexingInterface
 abstract type DiscreteEvaluation end
 abstract type Metric end
 include("test/measured.jl")
-include("test/continuous/delta_sol.jl")
-include("test/discrete/single_shooting.jl")
-include("test/discrete/merge.jl")
-include("test/metric/metric.jl")
-include("test/discrete/compare.jl")
-include("test/instantaneous/instant.jl")
+include("test/discretize.jl")
+include("test/instant.jl")
+include("test/compare.jl")
 include("problem_config/problem.jl")
 end

src/test/discrete/compare.jl src/test/compare.jlsrc/test/discrete/compare.jl renamed to src/test/compare.jl

@@ -63,49 +63,3 @@ function discretize_solution(solution::SciMLBase.AbstractTimeseriesSolution, tim
     return DataFrame(cols)
 end
 export discretize_solution
-
-function compare_dense_solutions(
-    reference::SciMLBase.AbstractTimeseriesSolution,
-    sol::SciMLBase.AbstractTimeseriesSolution;
-    reference_measured = nothing,
-    solution_measured = nothing,
-    integrator=Tsit5()
-)
-    results = Dict{Symbol, Any}()
-    reference_container = SymbolicIndexingInterface.symbolic_container(reference)
-    containers = SymbolicIndexingInterface.symbolic_container(sol)
-
-    measured_reference = isnothing(reference_measured) ? measured_values(reference_container) : reference_measured
-    sol_measured = isnothing(solution_measured) ? measured_values(containers) : sol_measured
-    @assert _symbolic_subset(measured_reference, sol_measured) "Test solutions must expose a superset of the reference's variables for comparison"
-    @assert length(measured_reference) > 0 "Compared solutions must share at least one measured variable"
-    measured = measured_reference
-
-    timebounds(sol) = (sol.t[1], sol.t[end])
-    @assert reference.dense "Dense (integrated) comparision requires a dense reference solution"
-    @assert sol.dense "Test solution must be dense in order to use continous-time comparison"
-    @assert timebounds(sol) == timebounds(reference) "Test solution has time range $(timebounds(sol)) which differs from the reference $(timebounds(reference))"
-
-    ref_t_vars = independent_variable_symbols(reference_container)
-    if length(ref_t_vars) > 1
-        @error "PDE solutions not currently supported; only one iv is allowed"
-    end
-    ref_t_var = first(ref_t_vars) 
-
-    function compare!(du, u, p, t) 
-        du .= abs.(reference(t, idxs=measured) .- sol(t, idxs=measured))
-    end
-    func = ODEFunction(compare!; sys = SymbolCache(collect(Symbol.(measured)), [], ref_t_var))
-    prob = ODEProblem(func, zeros(length(measured)), timebounds(reference))
-    soln = solve(prob, integrator)
-    return soln
-end
-export compare_dense_solutions
-
-function compute_error_metrics(
-    output_results, 
-    ref_soln, test_soln)
-    delta = ref_soln - test_soln
-    output_results[:l∞] = maximum(vecvecapply((x) -> abs.(x), delta))
-    output_results[:l2] = sqrt(recursive_mean(vecvecapply((x) -> float(x) .^ 2, delta)))
-end