Merge pull request #733 from SciML/myb/latex

Re-enable latexify tests

Author: YingboMa

Project.toml

@@ -52,7 +52,7 @@ RuntimeGeneratedFunctions = "0.4, 0.5"
 SafeTestsets = "0.0.1"
 SpecialFunctions = "0.7, 0.8, 0.9, 0.10, 1.0"
 StaticArrays = "0.10, 0.11, 0.12, 1.0"
-SymbolicUtils = "0.7"
+SymbolicUtils = "0.7.3"
 TreeViews = "0.3"
 UnPack = "0.1, 1.0"
 Unitful = "1.1"

test/direct.jl

@@ -13,9 +13,11 @@ eqs = [σ*(y-x),
        x*y - β*z]
 
 
-simpexpr = Expr[:($(*)(σ, $(+)($(*)(-1, x), y))),
-                :($(+)($(*)(x, $(+)($(*)(-1, z), ρ)), $(*)(-1, y))),
-                :($(+)($(*)(x, y), $(*)(-1, z, β)))]
+simpexpr = [
+ :($(*)(σ, $(+)(y, $(*)(-1, x))))
+ :($(+)($(*)(x, $(+)(ρ, $(*)(-1, z))), $(*)(-1, y)))
+ :($(+)($(*)(x, y), $(*)(-1, z, β)))
+]
 
 for i in 1:3
    @test ModelingToolkit.toexpr.(eqs)[i] == simpexpr[i]

test/latexify.jl

@@ -30,9 +30,9 @@ eqs = [D(x) ~ σ*(y-x)*D(x-y)/D(z),
 # Latexify.@generate_test latexify(eqs)
 @test latexify(eqs) == replace(
 raw"\begin{align}
-\frac{dx(t)}{dt} =& \left( y\left( t \right) -1 x\left( t \right) \right) \left( \frac{dz(t)}{dt} \right)^{-1} \sigma \frac{d\left(x\left( t \right) -1 \cdot y\left( t \right)\right)}{dt} \\
-0 =& -1 y\left( t \right) + 0.1 x\left( t \right) \sigma \left( -1 z\left( t \right) + \rho \right) \\
-\frac{dz(t)}{dt} =& x\left( t \right) \left( y\left( t \right) \right)^{\frac{2}{3}} -1 z\left( t \right) \beta
+\frac{dx(t)}{dt} =& \sigma \frac{d\left(x\left( t \right) -1 \cdot y\left( t \right)\right)}{dt} \left( y\left( t \right) -1 x\left( t \right) \right) \left( \frac{dz(t)}{dt} \right)^{-1} \\
+0 =& -1 y\left( t \right) + 0.1 \sigma x\left( t \right) \left( \rho -1 z\left( t \right) \right) \\
+\frac{dz(t)}{dt} =& x\left( t \right) \left( y\left( t \right) \right)^{\frac{2}{3}} -1 \beta z\left( t \right)
 \end{align}
 ", "\r\n"=>"\n")
 

test/runtests.jl

@@ -32,4 +32,4 @@ using SafeTestsets, Test
 @safetestset "Variable Utils Test" begin include("variable_utils.jl") end
 println("Last test requires gcc available in the path!")
 @safetestset "C Compilation Test" begin include("ccompile.jl") end
-#@safetestset "Latexify recipes Test" begin include("latexify.jl") end
+@safetestset "Latexify recipes Test" begin include("latexify.jl") end

test/variable_utils.jl

@@ -1,8 +1,9 @@
 using ModelingToolkit, Test
+using SymbolicUtils: <ₑ
 @parameters α β δ
 expr = (((1 / β - 1) + δ) / α) ^ (1 / (α - 1))
-ref = [β, δ, α]
-sol = Num.(ModelingToolkit.get_variables(expr))
+ref = sort([β, δ, α], lt = <ₑ)
+sol = sort(Num.(ModelingToolkit.get_variables(expr)), lt = <ₑ)
 @test all(simplify, sol[i] == ref[i] for i in 1:3)
 
 @parameters γ