update for SymbolicUtils v1.4

Author: jverzani

Project.toml

@@ -22,6 +22,7 @@ Compat = "0.63.0, 1, 2, 3, 4"
 RecipesBase = "0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 1.0"
 SpecialFunctions = "0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.10, 1, 2"
 SymEngine_jll = "0.9, 0.10"
+SymbolicUtils = "1.4"
 julia = "1.6"
 
 [extras]

ext/SymEngineSymbolicUtilsExt.jl

@@ -73,32 +73,19 @@ end
 
 # Needed for some simplification routines
 # a total order <ₑ
-import SymbolicUtils: <ₑ, isterm, isadd, ismul, issym, cmp_mul_adds, cmp_term_term
+import SymbolicUtils: <ₑ, isterm, isadd, ismul, issym, get_degrees, monomial_lt, _arglen
 function SymbolicUtils.:<ₑ(a::SymEngine.Basic, b::SymEngine.Basic)
-    if isterm(a) && !isterm(b)
-        return false
-    elseif isterm(b) && !isterm(a)
-        return true
-    elseif (isadd(a) || ismul(a)) && (isadd(b) || ismul(b))
-        return cmp_mul_adds(a, b)
-    elseif issym(a) && issym(b)
-        nameof(a) < nameof(b)
-    elseif !istree(a) && !istree(b)
-        T = typeof(a)
-        S = typeof(b)
-        if T == S
-            is_number(a) && is_number(b) && return N(a) < N(b)
-            return hash(a) < hash(b)
+    da, db = get_degrees(a), get_degrees(b)
+    fw = monomial_lt(da, db)
+    bw = monomial_lt(db, da)
+    if fw === bw && !isequal(a, b)
+        if _arglen(a) == _arglen(b)
+            return (operation(a), arguments(a)...,) <ₑ (operation(b), arguments(b)...,)
         else
-            return name(T) < nameof(S)
+            return _arglen(a) < _arglen(b)
         end
-        #return T===S ? (T <: Number ? isless(a, b) : hash(a) < hash(b)) : nameof(T) < nameof(S)
-    elseif istree(b) && !istree(a)
-        return true
-    elseif istree(a) && istree(b)
-        return cmp_term_term(a,b)
     else
-        return !(b <ₑ a)
+        return fw
     end
 end