update tests to simplify

Author: ChrisRackauckas

Project.toml

@@ -37,7 +37,7 @@ NaNMath = "0.3"
 SafeTestsets = "0.0.1"
 SpecialFunctions = "0.7, 0.8, 0.9, 0.10"
 StaticArrays = "0.10, 0.11, 0.12"
-SymbolicUtils = "0.2.1"
+SymbolicUtils = "0.3"
 TreeViews = "0.3"
 UnPack = "0.1"
 Unitful = "1.1"

test/derivatives.jl

@@ -6,7 +6,7 @@ using Test
 @variables x y z
 @derivatives D'~t D2''~t Dx'~x
 
-test_equal(a, b) = @test isequal(simplify_constants(a), simplify_constants(b))
+test_equal(a, b) = @test isequal(simplify(a), simplify(b))
 
 @test @macroexpand(@derivatives D'~t D2''~t) == @macroexpand(@derivatives (D'~t), (D2''~t))
 
@@ -17,12 +17,12 @@ dsin = D(sin(t))
 @test isequal(expand_derivatives(dsin), cos(t))
 
 dcsch = D(csch(t))
-@test isequal(expand_derivatives(dcsch), simplify_constants(-coth(t) * csch(t)))
+@test isequal(expand_derivatives(dcsch), simplify(-coth(t) * csch(t)))
 
 @test isequal(expand_derivatives(D(-7)), 0)
-@test isequal(expand_derivatives(D(sin(2t))), simplify_constants(cos(2t) * 2))
-@test isequal(expand_derivatives(D2(sin(t))), simplify_constants(-sin(t)))
-@test isequal(expand_derivatives(D2(sin(2t))), simplify_constants(-sin(2t) * 4))
+@test isequal(expand_derivatives(D(sin(2t))), simplify(cos(2t) * 2))
+@test isequal(expand_derivatives(D2(sin(t))), simplify(-sin(t)))
+@test isequal(expand_derivatives(D2(sin(2t))), simplify(-sin(2t) * 4))
 @test isequal(expand_derivatives(D2(t)), 0)
 @test isequal(expand_derivatives(D2(5)), 0)
 
@@ -32,8 +32,8 @@ dsinsin = D(sin(sin(t)))
 
 d1 = D(sin(t)*t)
 d2 = D(sin(t)*cos(t))
-@test isequal(expand_derivatives(d1), simplify_constants(t*cos(t)+sin(t)))
-@test isequal(expand_derivatives(d2), simplify_constants(cos(t)*cos(t)+(-sin(t))*sin(t)))
+@test isequal(expand_derivatives(d1), simplify(t*cos(t)+sin(t)))
+@test isequal(expand_derivatives(d2), simplify(cos(t)*cos(t)+(-sin(t))*sin(t)))
 
 eqs = [0 ~ σ*(y-x),
        0 ~ x*(ρ-z)-y,
@@ -58,12 +58,12 @@ test_equal(jac[3,3], -1β)
 
 @variables x(t) y(t) z(t)
 
-@test isequal(expand_derivatives(D(x * y)), simplify_constants(y*D(x) + x*D(y)))
-@test isequal(expand_derivatives(D(x * y)), simplify_constants(D(x)*y + x*D(y)))
+@test isequal(expand_derivatives(D(x * y)), simplify(y*D(x) + x*D(y)))
+@test isequal(expand_derivatives(D(x * y)), simplify(D(x)*y + x*D(y)))
 
 @test isequal(expand_derivatives(D(2t)), 2)
 @test isequal(expand_derivatives(D(2x)), 2D(x))
-@test isequal(expand_derivatives(D(x^2)), simplify_constants(2 * x * D(x)))
+@test isequal(expand_derivatives(D(x^2)), simplify(2 * x * D(x)))
 
 # n-ary * and +
 isequal(ModelingToolkit.derivative(Operation(*, [x, y, z*ρ]), 1), y*(z*ρ))

test/direct.jl

@@ -2,7 +2,7 @@ using ModelingToolkit, StaticArrays, LinearAlgebra, SparseArrays
 using DiffEqBase
 using Test
 
-canonequal(a, b) = isequal(simplify_constants(a), simplify_constants(b))
+canonequal(a, b) = isequal(simplify(a), simplify(b))
 
 # Calculus
 @parameters t σ ρ β

test/nonlinearsystem.jl

@@ -2,7 +2,7 @@ using ModelingToolkit, StaticArrays, LinearAlgebra
 using DiffEqBase
 using Test
 
-canonequal(a, b) = isequal(simplify_constants(a), simplify_constants(b))
+canonequal(a, b) = isequal(simplify(a), simplify(b))
 
 # Define some variables
 @parameters t σ ρ β

test/simplify.jl

@@ -5,27 +5,27 @@ using Test
 @variables x(t) y(t) z(t)
 
 null_op = 0*t
-@test isequal(simplify_constants(null_op), 0)
+@test isequal(simplify(null_op), 0)
 
 one_op = 1*t
-@test isequal(simplify_constants(one_op), t)
+@test isequal(simplify(one_op), t)
 
 identity_op = Operation(identity,[x])
-@test isequal(simplify_constants(identity_op), x)
+@test isequal(simplify(identity_op), x)
 
 minus_op = -x
-@test isequal(simplify_constants(minus_op), -x)
-simplify_constants(minus_op)
+@test isequal(simplify(minus_op), -x)
+simplify(minus_op)
 
 @variables x
 
 @test simplified_expr(expand_derivatives(Differential(x)((x-2)^2))) == :(2 * (-2 + x))
 @test simplified_expr(expand_derivatives(Differential(x)((x-2)^3))) == :(3 * (-2 + x)^2)
-@test simplified_expr(simplify_constants(x+2+3)) == :(5 + x)
+@test simplified_expr(simplify(x+2+3)) == :(5 + x)
 
 d1 = Differential(x)((-2 + x)^2)
 d2 = Differential(x)(d1)
 d3 = Differential(x)(d2)
 
 @test simplified_expr(expand_derivatives(d3)) == :(0)
-@test simplified_expr(simplify_constants(x^0)) == :(1)
+@test simplified_expr(simplify(x^0)) == :(1)