Merge branch 'master' into fb/builddocs

Author: YingboMa

Project.toml

@@ -1,7 +1,7 @@
 name = "ModelingToolkit"
 uuid = "961ee093-0014-501f-94e3-6117800e7a78"
 authors = ["Chris Rackauckas <[email protected]>"]
-version = "8.11.0"
+version = "8.11.2"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

src/structural_transformation/utils.jl

@@ -109,20 +109,20 @@ function find_var_sccs(g::BipartiteGraph, assign=nothing)
     return sccs
 end
 
-function sorted_incidence_matrix(sys, val=true; only_algeqs=false, only_algvars=false)
-    var_eq_matching, var_scc = algebraic_variables_scc(sys)
-    s = structure(sys)
-    @unpack fullvars, graph = s
-    g = graph
+function sorted_incidence_matrix(ts::TransformationState, val=true; only_algeqs=false, only_algvars=false)
+    var_eq_matching, var_scc = algebraic_variables_scc(ts)
+    fullvars = ts.fullvars
+    s = ts.structure
+    graph = ts.structure.graph
     varsmap = zeros(Int, ndsts(graph))
     eqsmap = zeros(Int, nsrcs(graph))
     varidx = 0
     eqidx = 0
-    for vs in scc, v in vs
+    for vs in var_scc, v in vs
         eq = var_eq_matching[v]
         if eq !== unassigned
             eqsmap[eq] = (eqidx += 1)
-            varsmap[var] = (varidx += 1)
+            varsmap[v] = (varidx += 1)
         end
     end
     for i in diffvars_range(s)
@@ -139,9 +139,10 @@ function sorted_incidence_matrix(sys, val=true; only_algeqs=false, only_algvars=
 
     I = Int[]
     J = Int[]
-    for eq in 𝑠vertices(g)
-        only_algeqs && (isalgeq(s, eq) || continue)
-        for var in 𝑠neighbors(g, eq)
+    algeqs_set = algeqs(s)
+    for eq in 𝑠vertices(graph)
+        only_algeqs && (eq in algeqs_set || continue)
+        for var in 𝑠neighbors(graph, eq)
             only_algvars && (isalgvar(s, var) || continue)
             i = eqsmap[eq]
             j = varsmap[var]

src/systems/abstractsystem.jl

@@ -171,6 +171,10 @@ end
 
 Base.:(==)(e1::SymbolicContinuousCallback, e2::SymbolicContinuousCallback) = isequal(e1.eqs, e2.eqs) && isequal(e1.affect, e2.affect)
 Base.isempty(cb::SymbolicContinuousCallback) = isempty(cb.eqs)
+function Base.hash(cb::SymbolicContinuousCallback, s::UInt)
+    s = foldr(hash, cb.eqs, init=s)
+    foldr(hash, cb.affect, init=s)
+end
 
 to_equation_vector(eq::Equation) = [eq]
 to_equation_vector(eqs::Vector{Equation}) = eqs
@@ -736,7 +740,7 @@ end
 function Base.show(io::IO, ::MIME"text/plain", sys::AbstractSystem)
     eqs = equations(sys)
     vars = states(sys); nvars = length(vars)
-    if eqs isa AbstractArray
+    if eqs isa AbstractArray && eltype(eqs) <: Equation
         neqs = count(eq->!(eq.lhs isa Connection), eqs)
         Base.printstyled(io, "Model $(nameof(sys)) with $neqs "; bold=true)
         nextras = n_extra_equations(sys)

test/odesystem.jl

@@ -19,6 +19,7 @@ eqs = [D(x) ~ σ*(y-x),
 ModelingToolkit.toexpr.(eqs)[1]
 @named de = ODESystem(eqs; defaults=Dict(x => 1))
 @test eval(toexpr(de)) == de
+@test hash(deepcopy(de)) == hash(de)
 
 generate_function(de)