more fixes

Author: shashi

src/systems/connectors.jl

@@ -282,9 +282,7 @@ function generate_connection_equations_and_stream_connections(csets::AbstractVec
 
     for cset in csets
         v = cset.set[1].v
-        if hasmetadata(v, Symbolics.GetindexParent)
-            v = getparent(v)
-        end
+        v = getparent(v, v)
         vtype = get_connection_type(v)
         if vtype === Stream
             push!(stream_connections, cset)

src/utils.jl

@@ -213,7 +213,9 @@ function collect_ivs_from_nested_operator!(ivs, x, target_op)
 end
 
 function iv_from_nested_derivative(x, op = Differential)
-    if istree(x)
+    if istree(x) && operation(x) == getindex
+        iv_from_nested_derivative(arguments(x)[1], op)
+    elseif istree(x)
         operation(x) isa op ? iv_from_nested_derivative(arguments(x)[1], op) : arguments(x)[1]
     elseif issym(x)
         x

test/latexify/20.tex

@@ -1,5 +1,5 @@
 \begin{align}
-\frac{du_1(t)}{dt} =& \left(  - \mathrm{u_1}\left( t \right) + \mathrm{u_2}\left( t \right) \right) p_3 \\
-0 =&  - \mathrm{u_2}\left( t \right) + \frac{1}{10} \left(  - \mathrm{u_1}\left( t \right) + p_1 \right) \mathrm{u_1}\left( t \right) p_2 p_3 \\
-\frac{du_3(t)}{dt} =& \left( \mathrm{u_2}\left( t \right) \right)^{\frac{2}{3}} \mathrm{u_1}\left( t \right) - \mathrm{u_3}\left( t \right) p_3
+\mathrm{\frac{d}{d t}}\left( u(t)_1 \right) =& \left(  - u(t)_1 + u(t)_2 \right) p_3 \\
+0 =&  - u(t)_2 + \frac{1}{10} \left(  - u(t)_1 + p_1 \right) p_2 p_3 u(t)_1 \\
+\mathrm{\frac{d}{d t}}\left( u(t)_3 \right) =& u(t)_2^{\frac{2}{3}} u(t)_1 - p_3 u(t)_3
 \end{align}

test/latexify/30.tex

@@ -1,5 +1,5 @@
 \begin{align}
-\frac{du_1(t)}{dt} =& \left(  - \mathrm{u_1}\left( t \right) + \mathrm{u_2}\left( t \right) \right) p_3 \\
-\frac{du_2(t)}{dt} =&  - \mathrm{u_2}\left( t \right) + \frac{1}{10} \left(  - \mathrm{u_1}\left( t \right) + p_1 \right) \mathrm{u_1}\left( t \right) p_2 p_3 \\
-\frac{du_3(t)}{dt} =& \left( \mathrm{u_2}\left( t \right) \right)^{\frac{2}{3}} \mathrm{u_1}\left( t \right) - \mathrm{u_3}\left( t \right) p_3
+\mathrm{\frac{d}{d t}}\left( u(t)_1 \right) =& \left(  - u(t)_1 + u(t)_2 \right) p_3 \\
+\mathrm{\frac{d}{d t}}\left( u(t)_2 \right) =&  - u(t)_2 + \frac{1}{10} \left(  - u(t)_1 + p_1 \right) p_2 p_3 u(t)_1 \\
+\mathrm{\frac{d}{d t}}\left( u(t)_3 \right) =& u(t)_2^{\frac{2}{3}} u(t)_1 - p_3 u(t)_3
 \end{align}

test/variable_parsing.jl

@@ -45,7 +45,7 @@ D1 = Differential(t)
     t[1:2]
     s[1:4, 1:2]
 end
-@parameters σ[1:2](..)
+@parameters σ(..)[1:2]
 
 @test all(ModelingToolkit.isparameter, collect(t))
 @test all(ModelingToolkit.isparameter, collect(s))