Merge pull request #1333 from mathics/Integer0

Integer(0) -> Integer0; Integer(1) -> Integer1

Author: rocky

mathics/builtin/algebra.py

@@ -10,6 +10,7 @@
     Atom,
     Expression,
     Integer,
+    Integer0,
     Integer1,
     Number,
     Symbol,
@@ -61,7 +62,7 @@ def _expand(expr):
         return expand(expr, numer=numer, denom=denom, deep=deep, **kwargs)
 
     if kwargs["modulus"] is not None and kwargs["modulus"] <= 0:
-        return Integer(0)
+        return Integer0
 
     # A special case for trigonometric functions
     if "trig" in kwargs and kwargs["trig"]:
@@ -496,8 +497,8 @@ class FactorTermsList(Builtin):
 
     def apply_list(self, expr, vars, evaluation):
         "FactorTermsList[expr_, vars_List]"
-        if expr == Integer(0):
-            return Expression("List", Integer1, Integer(0))
+        if expr == Integer0:
+            return Expression("List", Integer1, Integer0)
         elif isinstance(expr, Number):
             return Expression("List", expr, Integer1)
 
@@ -1053,7 +1054,7 @@ def apply(self, expr, v, evaluation):
 # Get a coefficient of form in an expression
 def _coefficient(name, expr, form, n, evaluation):
     if expr == SymbolNull or form == SymbolNull or n == SymbolNull:
-        return Integer(0)
+        return Integer0
 
     if not (isinstance(form, Symbol)) and not (isinstance(form, Expression)):
         return evaluation.message(name, "ivar", form)
@@ -1260,10 +1261,10 @@ def apply(self, expr, form, evaluation):
         # special cases for expr and form
         e_null = expr == SymbolNull
         f_null = form == SymbolNull
-        if expr == Integer(0):
+        if expr == Integer0:
             return Expression("List")
         elif e_null and f_null:
-            return Expression("List", Integer(0))
+            return Expression("List", Integer0)
         elif e_null and not f_null:
             return Expression("List", SymbolNull)
         elif f_null:
@@ -1411,7 +1412,7 @@ def apply_novar(self, expr, evaluation):
 
     def apply(self, expr, form, h, evaluation):
         "Exponent[expr_, form_, h_]"
-        if expr == Integer(0):
+        if expr == Integer0:
             return Expression("DirectedInfinity", Integer(-1))
 
         if not form.has_form("List", None):

mathics/builtin/arithmetic.py

@@ -26,6 +26,7 @@
     Complex,
     Expression,
     Integer,
+    Integer0,
     Integer1,
     Number,
     Rational,
@@ -384,13 +385,13 @@ def append_last():
             else:
                 number = from_sympy(sum(item.to_sympy() for item in numbers))
         else:
-            number = Integer(0)
+            number = Integer0
 
-        if not number.sameQ(Integer(0)):
+        if not number.sameQ(Integer0):
             leaves.insert(0, number)
 
         if not leaves:
-            return Integer(0)
+            return Integer0
         elif len(leaves) == 1:
             return leaves[0]
         else:
@@ -1227,7 +1228,7 @@ def apply_complex(self, number, evaluation):
     def apply_number(self, number, evaluation):
         "Im[number_?NumberQ]"
 
-        return Integer(0)
+        return Integer0
 
     def apply(self, number, evaluation):
         "Im[number_]"
@@ -1391,7 +1392,7 @@ class I(Predefined):
     python_equivalent = 1j
 
     def evaluate(self, evaluation):
-        return Complex(Integer(0), Integer1)
+        return Complex(Integer0, Integer1)
 
 
 class NumberQ(Test):
@@ -1474,7 +1475,7 @@ def apply(self, expr, evaluation):
             ):
                 return (
                     SymbolTrue
-                    if Expression("Simplify", expr).evaluate(evaluation) == Integer(0)
+                    if Expression("Simplify", expr).evaluate(evaluation) == Integer0
                     else SymbolFalse
                 )
 
@@ -1891,7 +1892,7 @@ def from_sympy(self, sympy_name, leaves):
         if sympy_name == "lowergamma":
             # lowergamma(z, x) -> Gamma[z, 0, x]
             z, x = leaves
-            return Expression(self.get_name(), z, Integer(0), x)
+            return Expression(self.get_name(), z, Integer0, x)
         else:
             return Expression(self.get_name(), *leaves)
 
@@ -2240,7 +2241,7 @@ def to_sympy(self, expr, **kwargs):
         if len(leaves) == 2:  # default case
             sympy_cases.append((leaves[1].to_sympy(**kwargs), True))
         else:
-            sympy_cases.append((Integer(0).to_sympy(**kwargs), True))
+            sympy_cases.append((Integer0.to_sympy(**kwargs), True))
 
         return sympy.Piecewise(*sympy_cases)
 
@@ -2274,7 +2275,7 @@ def apply(self, expr, evaluation):
             if expr == SymbolTrue:
                 return Integer1
             elif expr == SymbolFalse:
-                return Integer(0)
+                return Integer0
         return None
 
 

mathics/builtin/comparison.py

@@ -20,6 +20,7 @@
     Complex,
     Expression,
     Integer,
+    Integer0,
     Integer1,
     Number,
     Symbol,
@@ -459,7 +460,7 @@ def do_cplx_equal(x, y) -> Optional[int]:
             else:
                 return True
         else:
-            c = do_cmp(x.imag, Integer(0))
+            c = do_cmp(x.imag, Integer0)
             if c is None:
                 return
             if c != 0:

mathics/builtin/exptrig.py

@@ -17,6 +17,7 @@
     Expression,
     Real,
     Integer,
+    Integer0,
     Symbol,
 )
 
@@ -98,13 +99,13 @@ def parse(step):
     def apply(self, steps, evaluation):
         "AnglePath[{steps___}]"
         return AnglePath._compute(
-            Integer(0), Integer(0), None, steps.get_sequence(), evaluation
+            Integer0, Integer0, None, steps.get_sequence(), evaluation
         )
 
     def apply_phi0(self, phi0, steps, evaluation):
         "AnglePath[phi0_, {steps___}]"
         return AnglePath._compute(
-            Integer(0), Integer(0), phi0, steps.get_sequence(), evaluation
+            Integer0, Integer0, phi0, steps.get_sequence(), evaluation
         )
 
     def apply_xy(self, x, y, steps, evaluation):

mathics/builtin/image.py

@@ -10,6 +10,8 @@
     Atom,
     Expression,
     Integer,
+    Integer0,
+    Integer1,
     Rational,
     Real,
     MachineReal,
@@ -1063,7 +1065,7 @@ def apply(self, r, evaluation):
         "BoxMatrix[r_?RealNumberQ]"
         py_r = abs(r.round_to_float())
         s = int(math.floor(1 + 2 * py_r))
-        return _matrix([[Integer(1)] * s] * s)
+        return _matrix([[Integer1] * s] * s)
 
 
 class DiskMatrix(_ImageBuiltin):
@@ -1082,7 +1084,7 @@ def apply(self, r, evaluation):
         py_r = abs(r.round_to_float())
         s = int(math.floor(0.5 + py_r))
 
-        m = (Integer(0), Integer(1))
+        m = (Integer0, Integer1)
         r_sqr = (py_r + 0.5) * (py_r + 0.5)
 
         def rows():
@@ -1108,8 +1110,8 @@ def apply(self, r, evaluation):
         py_r = abs(r.round_to_float())
         t = int(math.floor(0.5 + py_r))
 
-        zero = Integer(0)
-        one = Integer(1)
+        zero = Integer0
+        one = Integer1
 
         def rows():
             for d in range(0, t):

mathics/builtin/integer.py

@@ -12,7 +12,7 @@
 
 from mathics.builtin.base import Builtin, SympyFunction
 from mathics.core.convert import from_sympy
-from mathics.core.expression import Integer, String, Expression
+from mathics.core.expression import Integer, Integer0, String, Expression
 
 
 class Floor(SympyFunction):
@@ -148,7 +148,7 @@ def apply(self, n, b, evaluation):
 
         if n == 0:
             # special case
-            return Integer(0)
+            return Integer0
 
         n = abs(n)
 
@@ -344,7 +344,7 @@ class IntegerDigits(_IntBaseBuiltin):
         "IntegerDigits[n_Integer]": "IntegerDigits[n, 10]",
     }
 
-    _padding = [Integer(0)]
+    _padding = [Integer0]
 
     def apply_n_b(self, n, b, evaluation):
         "IntegerDigits[n_Integer, b_Integer]"
@@ -515,7 +515,7 @@ def _parse_string(s, b):
         code_a = ord("a")
         assert code_a > code_0
 
-        value = Integer(0)
+        value = Integer0
         for char in s.lower():
             code = ord(char)
             if code >= code_a:
@@ -534,7 +534,7 @@ def _parse_string(s, b):
     def apply(self, l, b, evaluation):
         "FromDigits[l_, b_]"
         if l.get_head_name() == "System`List":
-            value = Integer(0)
+            value = Integer0
             for leaf in l.leaves:
                 value = Expression("Plus", Expression("Times", value, b), leaf)
             return value

mathics/builtin/lists.py

@@ -39,6 +39,7 @@
     SymbolAssociation,
     SymbolSequence,
     Integer,
+    Integer0,
     Number,
     Real,
     strip_context,
@@ -369,7 +370,7 @@ def apply(self, expr, evaluation):
         "Length[expr_]"
 
         if expr.is_atom():
-            return Integer(0)
+            return Integer0
         else:
             return Integer(len(expr.leaves))
 
@@ -2466,7 +2467,7 @@ def apply_iter(self, expr, i, imin, imax, di, evaluation):
         result = []
         compare_type = (
             "GreaterEqual"
-            if Expression("Less", di, Integer(0)).evaluate(evaluation).to_python()
+            if Expression("Less", di, Integer0).evaluate(evaluation).to_python()
             else "LessEqual"
         )
         while True:
@@ -3212,7 +3213,7 @@ def item(i):
             if i == k:
                 return Integer(1)
             else:
-                return Integer(0)
+                return Integer0
 
         return Expression(SymbolList, *(item(i) for i in range(1, n + 1)))
 
@@ -4845,8 +4846,8 @@ def apply_zero(self, l, n, evaluation):
         return self._pad(
             l,
             n,
-            Integer(0),
-            Integer(0),
+            Integer0,
+            Integer0,
             evaluation,
             lambda: Expression(self.get_name(), l, n),
         )
@@ -4857,7 +4858,7 @@ def apply(self, l, n, x, evaluation):
             l,
             n,
             x,
-            Integer(0),
+            Integer0,
             evaluation,
             lambda: Expression(self.get_name(), l, n, x),
         )

mathics/builtin/numbertheory.py

@@ -12,6 +12,7 @@
 from mathics.core.expression import (
     Expression,
     Integer,
+    Integer0,
     Rational,
     Symbol,
     from_python,
@@ -132,7 +133,7 @@ class Divisors(Builtin):
 
     def apply(self, n, evaluation):
         "Divisors[n_Integer]"
-        if n == Integer(0):
+        if n == Integer0:
             return None
         return Expression(
             "List", *[from_sympy(i) for i in sympy.divisors(n.to_sympy())]

mathics/builtin/numeric.py

@@ -37,6 +37,7 @@
     Complex,
     Expression,
     Integer,
+    Integer0,
     MachineReal,
     Number,
     Rational,
@@ -1143,13 +1144,13 @@ def approx_interval_continued_fraction(xmin, xmax):
 def chop(expr, delta=10.0 ** (-10.0)):
     if isinstance(expr, Real):
         if -delta < expr.get_float_value() < delta:
-            return Integer(0)
+            return Integer0
     elif isinstance(expr, Complex) and expr.is_inexact():
         real, imag = expr.real, expr.imag
         if -delta < real.get_float_value() < delta:
-            real = Integer(0)
+            real = Integer0
         if -delta < imag.get_float_value() < delta:
-            imag = Integer(0)
+            imag = Integer0
         return Complex(real, imag)
     elif isinstance(expr, Expression):
         return Expression(chop(expr.head), *[chop(leaf) for leaf in expr.leaves])

mathics/builtin/plot.py

@@ -18,6 +18,7 @@
     Symbol,
     String,
     Integer,
+    Integer0,
     from_python,
     SymbolList,
     SymbolN,
@@ -910,9 +911,9 @@ def _draw(self, data, color, evaluation, options):
         sector_spacing = self.get_option(options, "SectorSpacing", evaluation)
         if isinstance(sector_spacing, Symbol):
             if sector_spacing.get_name() == "System`Automatic":
-                sector_spacing = Expression(SymbolList, Integer(0), Real(0.2))
+                sector_spacing = Expression(SymbolList, Integer0, Real(0.2))
             elif sector_spacing.get_name() == "System`None":
-                sector_spacing = Expression(SymbolList, Integer(0), Integer(0))
+                sector_spacing = Expression(SymbolList, Integer0, Integer0)
             else:
                 return
         if not sector_spacing.has_form("List", 2):