update tests

Author: shashi

Project.toml

@@ -73,7 +73,7 @@ Setfield = "0.7, 0.8, 1"
 SpecialFunctions = "0.7, 0.8, 0.9, 0.10, 1.0, 2"
 StaticArrays = "0.10, 0.11, 0.12, 1.0"
 SymbolicUtils = "0.19"
-Symbolics = "4.5.0 - 4.7.0"
+Symbolics = "4.5.0"
 UnPack = "0.1, 1.0"
 Unitful = "1.1"
 julia = "1.6"

docs/src/tutorials/spring_mass.md

@@ -13,14 +13,14 @@ D = Differential(t)
 
 function Mass(; name, m = 1.0, xy = [0., 0.], u = [0., 0.])
     ps = @parameters m=m
-    sts = @variables pos[1:2](t)=xy v[1:2](t)=u
+    sts = @variables pos(t)[1:2]=xy v(t)[1:2]=u
     eqs = scalarize(D.(pos) .~ v)
     ODESystem(eqs, t, [pos..., v...], ps; name)
 end
 
 function Spring(; name, k = 1e4, l = 1.)
     ps = @parameters k=k l=l
-    @variables x(t), dir[1:2](t)
+    @variables x(t), dir(t)[1:2]
     ODESystem(Equation[], t, [x, dir...], ps; name)
 end
 
@@ -63,7 +63,7 @@ For each component we use a Julia function that returns an `ODESystem`. At the t
 ```@example component
 function Mass(; name, m = 1.0, xy = [0., 0.], u = [0., 0.])
     ps = @parameters m=m
-    sts = @variables pos[1:2](t)=xy v[1:2](t)=u
+    sts = @variables pos(t)[1:2]=xy v(t)[1:2]=u
     eqs = scalarize(D.(pos) .~ v)
     ODESystem(eqs, t, [pos..., v...], ps; name)
 end
@@ -86,7 +86,7 @@ Next we build the spring component. It is characterised by the spring constant `
 ```@example component
 function Spring(; name, k = 1e4, l = 1.)
     ps = @parameters k=k l=l
-    @variables x(t), dir[1:2](t)
+    @variables x(t), dir(t)[1:2]
     ODESystem(Equation[], t, [x, dir...], ps; name)
 end
 ```

src/utils.jl

@@ -148,7 +148,7 @@ function check_variables(dvs, iv)
     for dv in dvs
         isequal(iv, dv) &&
             throw(ArgumentError("Independent variable $iv not allowed in dependent variables."))
-        (is_delay_var(iv, dv) || occursin(iv, iv_from_nested_derivative(dv))) ||
+        (is_delay_var(iv, dv) || occursin(iv, dv)) ||
             throw(ArgumentError("Variable $dv is not a function of independent variable $iv."))
     end
 end
@@ -201,19 +201,26 @@ function check_equations(eqs, iv)
     end
 end
 "Get all the independent variables with respect to which differentials/differences are taken."
-function collect_ivs_from_nested_operator!(ivs, x::Term, target_op)
-    op = operation(x)
+function collect_ivs_from_nested_operator!(ivs, x, target_op)
+    if !istree(x)
+        return
+    end
+    op = operation(unwrap(x))
     if op isa target_op
         push!(ivs, get_iv(op))
-        collect_ivs_from_nested_operator!(ivs, arguments(x)[1], target_op)
+        collect_ivs_from_nested_operator!(ivs, op.x, target_op)
     end
 end
 
-function iv_from_nested_derivative(x::Term, op = Differential)
-    operation(x) isa op ? iv_from_nested_derivative(arguments(x)[1], op) : arguments(x)[1]
+function iv_from_nested_derivative(x, op = Differential)
+    if istree(x) && operation(x) isa op
+        iv_from_nested_derivative(operation(x).x, op)
+    elseif SymbolicUtils.issym(x)
+        return x
+    else
+        return nothing
+    end
 end
-iv_from_nested_derivative(x::Sym, op = Differential) = x
-iv_from_nested_derivative(x, op = Differential) = nothing
 
 hasdefault(v) = hasmetadata(v, Symbolics.VariableDefaultValue)
 getdefault(v) = value(getmetadata(v, Symbolics.VariableDefaultValue))

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[1:3](t)
+@variables u(t)[1:3]
 @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/odesystem.jl

@@ -376,7 +376,7 @@ end
 
 # issue 1109
 let
-    @variables t x[1:3, 1:3](t)
+    @variables t x(t)[1:3, 1:3]
     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[1:3](t)=[1, 2, 3.0] y(t)=1.0
+sts = @variables x(t)[1:3]=[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[1:3](t)
+@variables t x(t) ms(t)[1:3]
 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[1:2](t) = zeros(2)
+    @variables x(t)[1:2] = 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[1:3](t2)
+    @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]
 
     D = Differential(t)
     D2 = Differential(t2)
@@ -749,7 +749,7 @@ end
 let
     @parameters t
 
-    u = collect(first(@variables u[1:4](t)))
+    u = collect(first(@variables u(t)[1:4]))
     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[1:2](t)=[1.0, 0.0] i[1:2](t)=1.0 [connect = Flow]
+    sts = @variables v(t)[1:2]=[1.0, 0.0] i(t)[1:2]=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[1:3](t) [unit = u"m"]
+@variables t [unit = u"s"] x(t)[1:3] [unit = u"m"]
 @parameters v[1:3]=[1, 2, 3] [unit = u"m/s"]
 D = Differential(t)
 eqs = D.(x) .~ v