Merge pull request #3637 from JuliaReach/schillic/setprog

Adapt to Symbolics v6.1; allow SetProg v0.4 in tests

docs/Project.toml

@@ -34,6 +34,6 @@ Plots = "1"
 Polyhedra = "0.7"
 RecipesBase = "1"
 StaticArrays = "1"
-Symbolics = "5"
+Symbolics = "6.1"
 SymEngine = "0.7 - 0.12"
 TaylorModels = "0.6 - 0.7"

src/Initialization/init_Symbolics.jl

@@ -7,7 +7,7 @@ _vec(vars::Vector{Symbolics.Arr{Num,1}}) = reduce(vcat, vars)
 _vec(vars::Vector{Vector{Num}}) = reduce(vcat, vars)
 _vec(vars::Vector{Real}) = reduce(vcat, vars)
 
-_get_variables(expr::Num) = convert(Vector{Num}, Symbolics.get_variables(expr))
+_get_variables(expr::Num) = convert(Vector{Num}, Symbolics.get_variables(expr; sort=true))
 function _get_variables(expr::Vector{<:Num})
     return unique(reduce(vcat, _get_variables(ex) for ex in expr))
 end

src/Sets/HalfSpace/HalfSpace.jl

@@ -48,7 +48,7 @@ function load_Symbolics_HalfSpace()
         ### Input
 
         - `expr` -- symbolic expression that describes a half-space
-        - `vars` -- (optional, default: `get_variables(expr)`) if an array of variables
+        - `vars` -- (optional, default: `_get_variables(expr)`) if an array of variables
                     is given, use those as the ambient variables in the set with respect
                     to which derivations take place; otherwise, use only the variables
                     that appear in the given expression (but be careful because the

test/Project.toml

@@ -51,9 +51,9 @@ Polyhedra = "0.6 - 0.7"
 RangeEnclosures = "0.1.1, 0.2"
 RecipesBase = "0.6 - 0.8, 1"
 SCS = "1, 2"
-SetProg = "0.3"
+SetProg = "0.3 - 0.4"
 StaticArrays = "0.12, 1"
 SymEngine = "0.7 - 0.12"
-Symbolics = "1 - 5"
+Symbolics = "1 - 5.30, 6.1"
 TaylorModels = "0.0.1, 0.1 - 0.7"
 WriteVTK = "1"