Merge pull request #512 from SciML/sutils

Bump symbolicutils to 2

Author: ChrisRackauckas

Project.toml

@@ -38,8 +38,8 @@ Reexport = "1.0"
 Setfield = "1"
 Statistics = "1"
 StatsBase = "0.32.0, 0.33, 0.34"
-SymbolicUtils = "1"
-Symbolics = "5"
+SymbolicUtils = "2"
+Symbolics = "5.30.1"
 julia = "1.10"
 
 [extras]

lib/DataDrivenSR/src/DataDrivenSR.jl

@@ -108,7 +108,7 @@ function collect_numerical_parameters(eq, options = DataDrivenCommonOptions())
 end
 
 function _collect_numerical_parameters!(ps::AbstractVector, eq, options)
-    if Symbolics.istree(eq)
+    if Symbolics.iscall(eq)
         args_ = map(Symbolics.arguments(eq)) do (eqi)
             _collect_numerical_parameters!(ps, eqi, options)
         end

src/DataDrivenDiffEq.jl

@@ -14,7 +14,7 @@ using Setfield
 
 @reexport using ModelingToolkit
 using ModelingToolkit: AbstractSystem
-using SymbolicUtils: operation, arguments, istree, issym
+using SymbolicUtils: operation, arguments, iscall, issym
 using Symbolics
 using Symbolics: scalarize, variable, value
 @reexport using ModelingToolkit: unknowns, parameters, independent_variable, observed,

src/basis/utils.jl

@@ -39,7 +39,7 @@ function count_operation(x::AbstractArray, ops::AbstractArray, nested::Bool = tr
 end
 
 function split_term!(x::AbstractArray, o, ops::AbstractArray = [+])
-    if istree(o)
+    if iscall(o)
         n_ops = count_operation(o, ops, false)
         c_ops = 0
         @views begin
@@ -69,7 +69,7 @@ remove_constant_factor(x::Number) = one(x)
 
 function remove_constant_factor(x)
     # Return, if the function is nested
-    istree(x) || return x
+    iscall(x) || return x
     # Count the number of operations
     n_ops = count_operation(x, [*], false) + 1
     # Create a new array