fixes

SciML · Jan 19, 2024 · 9188660 · 9188660
1 parent d10c568
commit 9188660
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/src/problems/problem_interface.jl b/src/problems/problem_interface.jl
@@ -21,7 +21,7 @@ Base.@propagate_inbounds function Base.getindex(prob::AbstractSciMLProblem, sym)
         elseif is_independent_variable(prob.f, sym)
             return getindepsym(prob)
         elseif is_observed(prob.f, sym)
-            obs = SymbolicIndexingInterface.observed(prob.f, sym)
+            obs = SymbolicIndexingInterface.observed(prob, sym)
             if is_time_dependent(prob.f)
                 return obs(prob.u0, prob.p, 0.0)
             else

diff --git a/src/solutions/solution_interface.jl b/src/solutions/solution_interface.jl
@@ -38,13 +38,6 @@ SymbolicIndexingInterface.is_independent_variable(::AbstractNoTimeSolution, sym)
 
 SymbolicIndexingInterface.independent_variable_symbols(::AbstractNoTimeSolution) = []
 
-for soltype in [AbstractTimeseriesSolution, AbstractNoTimeSolution]
-    @eval function SymbolicIndexingInterface.observed(A::$(soltype), sym::Symbol)
-        has_sys(A.prob.f) || error("Cannot use observed without system")
-        return SymbolicIndexingInterface.observed(A, getproperty(A.prob.f.sys, sym))
-    end
-end
-
 SymbolicIndexingInterface.is_time_dependent(::AbstractTimeseriesSolution) = true
 
 SymbolicIndexingInterface.is_time_dependent(::AbstractNoTimeSolution) = false

diff --git a/test/downstream/Project.toml b/test/downstream/Project.toml
@@ -6,6 +6,7 @@ NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
 Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
 OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
 OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
+RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 SciMLSensitivity = "1ed8b502-d754-442c-8d5d-10ac956f44a1"
 Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"

diff --git a/test/downstream/symbol_indexing.jl b/test/downstream/symbol_indexing.jl
@@ -54,7 +54,7 @@ end
 @testset "observed shouldn't error" begin
     for obj in [prob, integ, sol]
         obj[:a]
-        observed(obh, :a)
+        SymbolicIndexingInterface.observed(obj, :a)
     end
 end