Remove unnecessary compare implementations

Author: blegat

src/comparison.jl

@@ -311,18 +311,16 @@ Base.@pure function Base.cmp(v1::AbstractVariable, v2::AbstractVariable)
     return -cmp(name(v1), name(v2))
 end
 
-function Base.cmp(m1::AbstractMonomial, m2::AbstractMonomial)
-    s1, s2 = promote_variables(m1, m2)
-    return cmp(ordering(m1)(), exponents(s1), exponents(s2))
+function Base.:(==)(m1::AbstractMonomialLike, m2::AbstractMonomialLike)
+    return iszero(cmp(m1, m2))
 end
 
-function compare(
+function Base.cmp(
     m1::AbstractMonomial,
     m2::AbstractMonomial,
-    ::Type{O},
-) where {O<:AbstractMonomialOrdering}
+)
     s1, s2 = promote_variables(m1, m2)
-    return cmp(O(), exponents(s1), exponents(s2))
+    return cmp(ordering(m1)(), exponents(s1), exponents(s2))
 end
 
 # Implement this to make coefficients be compared with terms.
@@ -336,15 +334,26 @@ end
 # less than `b`, they are considered sort of equal.
 _cmp_coefficient(a, b) = 0
 
+<<<<<<< HEAD
 function Base.cmp(t1::AbstractTermLike, t2::AbstractTermLike)
+=======
+function Base.cmp(
+    t1::AbstractTermLike,
+    t2::AbstractTermLike,
+)
+>>>>>>> e84a75b (Remove unnecessary compare implementations)
     Δ = cmp(monomial(t1), monomial(t2))
     if iszero(Δ)
         return _cmp_coefficient(coefficient(t1), coefficient(t2))
     end
     return Δ
 end
 
+<<<<<<< HEAD
 Base.isless(t1::AbstractTermLike, t2::AbstractTermLike) = compare(t1, t2) < 0
+=======
+Base.isless(t1::AbstractTermLike, t2::AbstractTermLike) = cmp(t1, t2) < 0
+>>>>>>> e84a75b (Remove unnecessary compare implementations)
 
 """
     struct ExponentsIterator{M}(

src/default_polynomial.jl

@@ -93,7 +93,7 @@ Base.one(p::Polynomial) = one(typeof(p))
 Base.zero(::Type{Polynomial{C,T,A}}) where {C,T,A} = Polynomial{C,T,A}(A())
 Base.zero(t::Polynomial) = zero(typeof(t))
 
-compare_monomials(a, b) = compare(monomial(a), monomial(b))
+compare_monomials(a, b) = cmp(monomial(a), monomial(b))
 
 function join_terms(
     terms1::AbstractArray{<:Term},
@@ -294,7 +294,7 @@ function __polynomial_merge!(
             if tp isa Int && j isa Int
                 tp = get1(tp)
             end
-            compare(monomial(*(monomials(q)[j], monomial.(t)...)), monomial(tp))
+            cmp(monomial(*(monomials(q)[j], monomial.(t)...)), monomial(tp))
         end
     end
     get2 = let t = t, q = q
@@ -385,7 +385,7 @@ function __polynomial_merge!(
             if tp isa Int && j isa Int
                 tp = get1(tp)
             end
-            compare(monomial(monomial(t) * monomials(q)[j]), monomial(tp))
+            cmp(monomial(monomial(t) * monomials(q)[j]), monomial(tp))
         end
     end
     get2 = let t = t, q = q
@@ -460,7 +460,7 @@ function __polynomial_merge!(
             if t isa Int && j isa Int
                 t = get1(t)
             end
-            compare(monomials(q)[j], monomial(t))
+            cmp(monomials(q)[j], monomial(t))
         end
     end
     get2 = let q = q

src/sequences.jl

@@ -18,7 +18,7 @@ function merge_sorted!(
     while i1 <= lastindex(v1) && i2 <= lastindex(v2)
         x1 = v1[i1]
         x2 = v2[i2]
-        Δ = compare(x1, x2)
+        Δ = cmp(x1, x2)
         if Δ < 0
             if filter(x1)
                 result[i] = x1