redo do_cmp

Author: weakit

.gitignore

@@ -53,3 +53,5 @@ mathics/web/media/pdf/
 mathics/web/media/doc/classes.pdf
 mathics/web/media/doc/classes.png
 tmp
+
+.idea/

mathics/builtin/comparison.py

@@ -2,13 +2,14 @@
 # -*- coding: utf-8 -*-
 
 
-import sympy
 import itertools
 
-from mathics.builtin.base import Builtin, BinaryOperator, Test, SympyFunction
-from mathics.core.expression import (Expression, Number, Integer, Rational,
-                                     Real, Symbol, String)
-from mathics.core.numbers import get_type, dps
+import sympy
+
+from mathics.builtin.base import BinaryOperator, Builtin, SympyFunction
+from mathics.core.expression import (Complex, Expression, Integer, Number,
+                                     String, Symbol)
+from mathics.core.numbers import dps
 
 
 class SameQ(BinaryOperator):
@@ -88,6 +89,7 @@ class TrueQ(Builtin):
         'TrueQ[expr_]': 'If[expr, True, False, False]',
     }
 
+
 class BooleanQ(Builtin):
     """
     <dl>
@@ -313,37 +315,35 @@ def apply(self, items, evaluation):
 
 
 def do_cmp(x1, x2):
-    inf1 = inf2 = real1 = real2 = None
-    if isinstance(x1, (Real, Integer, Rational)):
-        real1 = x1.to_sympy()
-    if isinstance(x2, (Real, Integer, Rational)):
-        real2 = x2.to_sympy()
-    if x1.has_form('DirectedInfinity', 1):
-        inf1 = x1.leaves[0].get_int_value()
-    if x2.has_form('DirectedInfinity', 1):
-        inf2 = x2.leaves[0].get_int_value()
-
-    if real1 is not None and real2 is not None:
-        if x1 == x2:
-            return 0
-        elif x1 < x2:
-            return -1
-        else:
-            return 1
-    elif inf1 is not None and inf2 is not None:
-        if inf1 == inf2:
-            return 0
-        elif inf1 < inf2:
-            return -1
-        else:
-            return 1
-    elif inf1 is not None and real2 is not None:
-        return inf1
-    elif real1 is not None and inf2 is not None:
-        return -inf2
-    else:
+
+    # don't attempt to compare complex numbers
+    for x in (x1, x2):
+        # TODO: Send message General::nord
+        if isinstance(x, Complex) or (
+                x.has_form("DirectedInfinity", 1) and isinstance(x.leaves[0], Complex)
+        ):
+            return None
+
+    # rely on sympy for better comparisons
+    s1 = x1.to_sympy()
+    s2 = x2.to_sympy()
+
+    # this might seem like poorly written code at first glance, but
+    # the equality comparison is required for it to function properly.
+    # Sympy comparisons might not return sometimes, and will raise
+    # an error in that case if not compared to True/False.
+
+    eq = sympy.Equality(s1, s2)
+
+    if eq == True:
+        return 0
+    elif eq != False:
         return None
 
+    if sympy.StrictLessThan(s1, s2) == True:
+        return -1
+    return 1
+
 
 class SympyComparison(SympyFunction):
     def to_sympy(self, expr, **kwargs):
@@ -732,9 +732,11 @@ class Max(_MinMax):
         <dd>returns the expression with the greatest value among the $e_i$.
     </dl>
 
-    Maximum of a series of numbers:
+    Maximum of a series of values:
     >> Max[4, -8, 1]
      = 4
+    >> Max[E - Pi, Pi, E + Pi, 2 E]
+     = E + Pi
 
     'Max' flattens lists in its arguments:
     >> Max[{1,2},3,{-3,3.5,-Infinity},{{1/2}}]
@@ -767,6 +769,8 @@ class Min(_MinMax):
     Minimum of a series of numbers:
     >> Min[4, -8, 1]
      = -8
+    >> Min[E - Pi, Pi, E + Pi, 2 E]
+     = E - Pi
 
     'Min' flattens lists in its arguments:
     >> Min[{1,2},3,{-3,3.5,-Infinity},{{1/2}}]