compat, dead code, similarterm, iv() depwarn

Author: anandijain

Project.toml

@@ -46,6 +46,7 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 [compat]
 AbstractTrees = "0.3"
 ArrayInterface = "3.1.39, 4, 5"
+Combinatorics = "1"
 ConstructionBase = "1"
 DataStructures = "0.17, 0.18"
 DiffEqBase = "6.81.0"

src/systems/diffeqs/abstractodesystem.jl

@@ -902,7 +902,6 @@ function SteadyStateProblemExpr(sys::AbstractODESystem, args...; kwargs...)
 end
 
 # SU 442 and Symbolics 588 copied over for CI, will be removed
-(f::Symbolic{<:FnType})(args...; kwargs...) = Term{promote_symtype(f, symtype.(args)...)}(f, [args...]; kwargs...)
 function SymbolicUtils.substitute(op::Symbolics.Differential, dict; kwargs...)
     @set! op.x = substitute(op.x, dict; kwargs...)
 end
@@ -914,18 +913,17 @@ function _match_eqs(eqs1, eqs2)
             if isequal(eq, eq2)
                 push!(eqpairs, i => j)
                 break
-            elseif !isequal(eq, eq2) && j == length(eqs2)
             end
         end
     end
     eqpairs
 end
 
-function isisomorphic(sys1::AbstractODESystem, sys2::AbstractODESystem; verbose=false)
+function isisomorphic(sys1::AbstractODESystem, sys2::AbstractODESystem)
     sys1 = flatten(sys1)
     sys2 = flatten(sys2)
 
-    iv1, iv2 = independent_variable(sys1), independent_variable(sys2) # not needed
+    iv2 = only(independent_variables(sys2))
     sys1 = convert_system(ODESystem, sys1, iv2)
     s1, s2 = states(sys1), states(sys2)
     p1, p2 = parameters(sys1), parameters(sys2)
@@ -938,7 +936,7 @@ function isisomorphic(sys1::AbstractODESystem, sys2::AbstractODESystem; verbose=
     pps = permutations(p2)
     psts = permutations(s2)
     orig = [p1; s1]
-    perms = [[x; y] for x in pps for y in psts]
+    perms = ([x; y] for x in pps for y in psts)
 
     for perm in perms
         rules = Dict(orig .=> perm)

src/systems/diffeqs/odesystem.jl

@@ -367,7 +367,7 @@ function convert_system(::Type{<:ODESystem}, sys, t; name=nameof(sys))
                 newsts[i] = s
                 continue
             end
-            ns = operation(s)(t; metadata=SymbolicUtils.metadata(s))
+            ns = similarterm(s, operation(s), (t,); metadata=SymbolicUtils.metadata(s))
             newsts[i] = ns
             varmap[s] = ns
         else
@@ -377,7 +377,7 @@ function convert_system(::Type{<:ODESystem}, sys, t; name=nameof(sys))
         end
     end
     sub = Base.Fix2(substitute, varmap)
-    iv = independent_variable(sys)
+    iv = only(independent_variables(sys))
     sub.x[iv] = t # otherwise the Differentials aren't fixed
     neweqs = map(sub, equations(sys))
     defs = Dict(sub(k) => sub(v) for (k, v) in defaults(sys))

test/odesystem.jl

@@ -717,6 +717,6 @@ let
     @test !ModelingToolkit.isisomorphic(sys1, sys4) 
 
     # 1281
-    iv2 = independent_variable(sys2)
-    @test isequal(independent_variable(convert_system(ODESystem, sys1, iv2)), iv2)
+    iv2 = only(independent_variables(sys2))
+    @test isequal(only(independent_variables(convert_system(ODESystem, sys1, iv2))), iv2)
 end