Merge pull request #753 from Mathics3/remove-dup-fns

Remove duplicate cancel and sympy_factor...

mathics/builtin/numbers/algebra.py

@@ -62,36 +62,7 @@
     SymbolTable,
     SymbolTanh,
 )
-
-
-def sympy_factor(expr_sympy):
-    try:
-        result = sympy.together(expr_sympy)
-        result = sympy.factor(result)
-    except sympy.PolynomialError:
-        return expr_sympy
-    return result
-
-
-def cancel(expr):
-    if expr.has_form("Plus", None):
-        return Expression(SymbolPlus, *[cancel(element) for element in expr.elements])
-    else:
-        try:
-            result = expr.to_sympy()
-            if result is None:
-                return None
-
-            # result = sympy.powsimp(result, deep=True)
-            result = sympy.cancel(result)
-
-            # cancel factors out rationals, so we factor them again
-            result = sympy_factor(result)
-
-            return from_sympy(result)
-        except sympy.PolynomialError:
-            # e.g. for non-commutative expressions
-            return expr
+from mathics.eval.numbers import cancel, sympy_factor
 
 
 def expand(expr, numer=True, denom=False, deep=False, **kwargs):