revert tests back to old state

Author: shashi

test/latexify.jl

@@ -30,7 +30,7 @@ eqs = [D(x) ~ σ * (y - x) * D(x - y) / D(z),
 # Latexify.@generate_test latexify(eqs)
 @test_reference "latexify/10.tex" latexify(eqs)
 
-@variables u(t)[1:3]
+@variables u[1:3](t)
 @parameters p[1:3]
 eqs = [D(u[1]) ~ p[3] * (u[2] - u[1]),
     0 ~ p[2] * p[3] * u[1] * (p[1] - u[1]) / 10 - u[2],

test/latexify/20.tex

@@ -1,5 +1,5 @@
 \begin{align}
-\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
+\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
 \end{align}

test/latexify/30.tex

@@ -1,5 +1,5 @@
 \begin{align}
-\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
+\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
 \end{align}

test/linearize.jl

@@ -73,7 +73,7 @@ desired_order = [f.x, p.x]
 lsys = ModelingToolkit.reorder_states(lsys, states(ssys), desired_order)
 
 @test lsys.A == [-2 0; 1 -2]
-@test lsys.B == reshape([1, 0], 2, 1)
+@test lsys.B == reshape([1; 0;;], 2, 1) # reshape required when testing on Julia v1.6
 @test lsys.C == [0 1]
 @test lsys.D[] == 0
 

test/mass_matrix.jl

@@ -1,6 +1,6 @@
 using OrdinaryDiffEq, ModelingToolkit, Test, LinearAlgebra
 @parameters t
-@variables y(t)[1:3]
+@variables y[1:3](t)
 @parameters k[1:3]
 D = Differential(t)
 

test/odesystem.jl

@@ -376,7 +376,7 @@ end
 
 # issue 1109
 let
-    @variables t x(t)[1:3, 1:3]
+    @variables t x[1:3, 1:3](t)
     D = Differential(t)
     @named sys = ODESystem(D.(x) .~ x)
     @test_nowarn structural_simplify(sys)
@@ -386,7 +386,7 @@ end
 using Symbolics: unwrap, wrap
 using LinearAlgebra
 @variables t
-sts = @variables x(t)[1:3]=[1, 2, 3.0] y(t)=1.0
+sts = @variables x[1:3](t)=[1, 2, 3.0] y(t)=1.0
 ps = @parameters p[1:3] = [1, 2, 3]
 D = Differential(t)
 eqs = [collect(D.(x) .~ x)
@@ -487,7 +487,7 @@ function foo(a::Num, ms::AbstractVector)
     wrap(term(foo, a, term(SVector, ms...)))
 end
 foo(a, ms::AbstractVector) = a + sum(ms)
-@variables t x(t) ms(t)[1:3]
+@variables t x(t) ms[1:3](t)
 D = Differential(t)
 ms = collect(ms)
 eqs = [D(x) ~ foo(x, ms); D.(ms) .~ 1]
@@ -589,7 +589,7 @@ end
 let
     @parameters t
     D = Differential(t)
-    @variables x(t)[1:2] = zeros(2)
+    @variables x[1:2](t) = zeros(2)
     @variables y(t) = 0
     @parameters k = 1
     eqs = [D(x[1]) ~ x[2]
@@ -680,7 +680,7 @@ let
     eqs_to_lhs(eqs) = eq_to_lhs.(eqs)
 
     @parameters σ=10 ρ=28 β=8 / 3 sigma rho beta
-    @variables t t2 x(t)=1 y(t)=0 z(t)=0 x2(t2)=1 y2(t2)=0 z2(t2)=0 u(t2)[1:3]
+    @variables t t2 x(t)=1 y(t)=0 z(t)=0 x2(t2)=1 y2(t2)=0 z2(t2)=0 u[1:3](t2)
 
     D = Differential(t)
     D2 = Differential(t2)
@@ -749,7 +749,7 @@ end
 let
     @parameters t
 
-    u = collect(first(@variables u(t)[1:4]))
+    u = collect(first(@variables u[1:4](t)))
     Dt = Differential(t)
 
     eqs = [Differential(t)(u[2]) - 1.1u[1] ~ 0

test/stream_connectors.jl

@@ -192,7 +192,7 @@ eqns = [connect(source.port, n2m2.port_a)
 
 # array var
 @connector function VecPin(; name)
-    sts = @variables v(t)[1:2]=[1.0, 0.0] i(t)[1:2]=1.0 [connect = Flow]
+    sts = @variables v[1:2](t)=[1.0, 0.0] i[1:2](t)=1.0 [connect = Flow]
     ODESystem(Equation[], t, [sts...;], []; name = name)
 end
 

test/units.jl

@@ -48,7 +48,7 @@ eqs = [D(E) ~ P - E / τ
 @test !MT.validate(0 ~ P + E * τ)
 
 # Array variables
-@variables t [unit = u"s"] x(t)[1:3] [unit = u"m"]
+@variables t [unit = u"s"] x[1:3](t) [unit = u"m"]
 @parameters v[1:3]=[1, 2, 3] [unit = u"m/s"]
 D = Differential(t)
 eqs = D.(x) .~ v

test/variable_parsing.jl

@@ -45,11 +45,11 @@ 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))
-@test all(ModelingToolkit.isparameter, Any[σ(t)[1], σ(t)[2]])
+@test all(ModelingToolkit.isparameter, Any[σ[1], σ[2]])
 
 # fntype(n, T) = FnType{NTuple{n, Any}, T}
 # t1 = Num[Variable{Real}(:t, 1), Variable{Real}(:t, 2)]