Merge pull request #346 from AayushSabharwal/as/issymbollike

fix: remove uses of issymbollike, depend on SII

.github/workflows/CI.yml

@@ -38,7 +38,6 @@ jobs:
           - Complex
         version:
           - '1'
-          - '1.6'
     steps:
       - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@v1

.github/workflows/Downstream.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        julia-version: [1,1.6]
+        julia-version: [1]
         os: [ubuntu-latest]
         package:
           - {user: SciML, repo: PDESystemLibrary.jl, group: MOL}

Project.toml

@@ -18,6 +18,7 @@ PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
 RuntimeGeneratedFunctions = "7e49a35a-f44a-4d26-94aa-eba1b4ca6b47"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
+SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
 SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
 Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 TermInterface = "8ea1fca8-c5ef-4a55-8b96-4e9afe9c9a3c"
@@ -37,10 +38,11 @@ RuntimeGeneratedFunctions = "0.5.9"
 SafeTestsets = "0.0.1"
 SciMLBase = "1.94, 2"
 StaticArrays = "1"
+SymbolicIndexingInterface = "0.3.0"
 SymbolicUtils = "1"
 Symbolics = "5"
 TermInterface = "0.2, 0.3"
-julia = "1.6"
+julia = "1.9"
 
 [extras]
 NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"

src/MethodOfLines.jl

@@ -5,6 +5,7 @@ using DiffEqBase
 using ModelingToolkit
 using ModelingToolkit: operation, istree, arguments, variable, get_metadata, get_states,
 parameters, defaults, varmap_to_vars
+using SymbolicIndexingInterface
 using SymbolicUtils, Symbolics
 using Symbolics: unwrap, solve_for, expand_derivatives, diff2term, setname, rename, similarterm
 using SymbolicUtils: operation, arguments

src/interface/solution/common.jl

@@ -46,9 +46,9 @@ Base.@propagate_inbounds function Base.getindex(A::SciMLBase.PDESolution{T,N,S,D
     elseif any(isequal(safe_unwrap(sym)), safe_unwrap.(collect(values(A.disc_data.discretespace.vars.replaced_vars))))
         dv = sym
     end
-    if SciMLBase.issymbollike(sym) && iv !== nothing && isequal(sym, iv)
+    if symbolic_type(sym) != NotSymbolic() && iv !== nothing && isequal(sym, iv)
         A.ivdomain[iiv]
-    elseif SciMLBase.issymbollike(sym) && dv !== nothing && isequal(sym, dv)
+    elseif symbolic_type(sym) != NotSymbolic() && dv !== nothing && isequal(sym, dv)
             A.u[sym]
     elseif iscomplex(A) && istree(safe_unwrap(sym))
         symargs = arguments(safe_unwrap(sym))
@@ -71,12 +71,12 @@ Base.@propagate_inbounds function Base.getindex(A::SciMLBase.PDESolution{T,N,S,D
     if idv !== nothing
         dv = A.dvs[idv]
     end
-    if SciMLBase.issymbollike(sym) && iv !== nothing && isequal(sym, iv)
+    if symbolic_type(sym) != NotSymbolic() && iv !== nothing && isequal(sym, iv)
         A.ivdomains[iiv][args...]
-    elseif SciMLBase.issymbollike(sym) && dv !== nothing && isequal(sym, dv)
+    elseif symbolic_type(sym) != NotSymbolic() && dv !== nothing && isequal(sym, dv)
         A.u[sym][args...]
     end
-    if iscomplex(A) && SciMlBase.issymbollike(sym) && istree(safe_unwrap(sym))
+    if iscomplex(A) && symbolic_type(sym) != NotSymbolic() && istree(safe_unwrap(sym))
         symargs = arguments(safe_unwrap(sym))
         redv, imdv = A.disc_data.complexmap[operation(safe_unwrap(sym))]
         A.u[Num(redv(symargs...))][args...] .+ im * A.u[Num(imdv(symargs...))][args...]