Merge pull request #85 from JuliaComputing/as/cached-linear-expander

refactor: use new cached `LinearExpander`s in `System`

Author: AayushSabharwal

lib/ModelingToolkitTearing/Project.toml

@@ -30,7 +30,7 @@ ForwardDiff = "1.3"
 Graphs = "1"
 LinearAlgebra = "1"
 ModelingToolkit = "11"
-ModelingToolkitBase = "1.23"
+ModelingToolkitBase = "1.37"
 Moshi = "0.3"
 OffsetArrays = "1"
 OrderedCollections = "1.8.1"

lib/ModelingToolkitTearing/src/reassemble.jl

@@ -556,7 +556,7 @@ function get_linear_scc_linsol(state::TearingState, alg_eqs::Vector{Int},
                                analytical_linear_scc_limit::Int,
                                simplify::Bool; allow_symbolic::Bool = false,
                                allow_parameter::Bool = true)
-    (; fullvars) = state
+    (; fullvars, sys) = state
     # If the SCC is fully torn, don't bother generating a linsolve
     all_torn = true
     for iv in alg_vars
@@ -587,7 +587,7 @@ function get_linear_scc_linsol(state::TearingState, alg_eqs::Vector{Int},
     end
 
     for (varidx, var) in enumerate(vars)
-        lex = Symbolics.LinearExpander(var; strict = true)
+        lex = MTKBase.get_linear_expander_for!(sys, var, true)
         for (eqidx, resid) in enumerate(b)
             p, q, islinear = lex(resid)
             islinear || return nothing

lib/ModelingToolkitTearing/src/stateselection_interface.jl

@@ -230,7 +230,7 @@ function StateSelection.find_eq_solvables!(state::TearingState, ieq, to_rm = Int
         conservative = false,
         symbolically_rm_singular = true,
         kwargs...)
-    (; fullvars) = state
+    (; fullvars, sys) = state
     (; graph, solvable_graph) = state.structure
 
     eq = equations(state)[ieq]
@@ -249,7 +249,7 @@ function StateSelection.find_eq_solvables!(state::TearingState, ieq, to_rm = Int
     for j in 𝑠neighbors(graph, ieq)
         var = fullvars[j]
         MTKBase.isirreducible(var) && (all_int_vars = false; continue)
-        a, b, islinear = Symbolics.LinearExpander(var; strict = true)(term)
+        a, b, islinear = MTKBase.get_linear_expander_for!(sys, var, true)(term)
         islinear || (all_int_vars = false; continue)
         if !SU.isconst(a)
             all_int_vars = false
@@ -291,7 +291,7 @@ function StateSelection.find_eq_solvables!(state::TearingState, ieq, to_rm = Int
         rem_edge!(graph, ieq, j)
         symbolically_rm_singular || continue
         eq = equations(state)[ieq]
-        a, b, islin = Symbolics.LinearExpander(fullvars[j]; strict = true)(eq.rhs)
+        a, b, islin = MTKBase.get_linear_expander_for!(sys, fullvars[j], true)(eq.rhs)
         SU._iszero(a) && islin || continue
         equations(state)[ieq] = eq.lhs ~ b
     end