Merge branch 'master' into sphericalplot3d

Author: mmatera

Makefile

@@ -36,6 +36,7 @@ MATHICS3_MODULE_OPTION ?= --load-module pymathics.graph,pymathics.natlang
    djangotest \
    gstest \
    latexdoc \
+   mypy \
    plot-detailed-tests\
    pytest \
    pytest-x \
@@ -128,6 +129,9 @@ clean: clean-cython clean-cache
 	rm -f mathics/data/op-tables || true; \
 	rm -rf build || true
 
+mypy:
+	mypy --install-types --ignore-missing-imports --non-interactive mathics
+
 plot-detailed-tests:
 	MATHICS_CHARACTER_ENCODING="ASCII" MATHICS_PLOT_DETAILED_TESTS="1" $(PYTHON) -m pytest -x $(PYTEST_OPTIONS) test/builtin/drawing/test_plot_detail.py
 

SYMBOLS_MANIFEST.txt

@@ -563,7 +563,6 @@ System`Image
 System`ImageAdd
 System`ImageAdjust
 System`ImageAspectRatio
-System`ImageBox
 System`ImageChannels
 System`ImageColorSpace
 System`ImageConvolve
@@ -992,6 +991,7 @@ System`RandomSample
 System`Range
 System`RankedMax
 System`RankedMin
+System`RasterBox
 System`Rational
 System`Rationalize
 System`Re

mathics/algorithm/clusters.py

@@ -1074,10 +1074,10 @@ def _kmeans(self, k):
 
         a = [0] * len(x)
         u = [0] * len(x)
-        l = [0] * len(x)
+        li = [0] * len(x)
 
         for i, xi in enumerate(x):
-            ai, u[i], _, l[i] = _smallest2(d(xi, cj) for cj in c)
+            ai, u[i], _, li[i] = _smallest2(d(xi, cj) for cj in c)
             q[ai] += 1
             cc[ai] = _pairwise_sum(cc[ai], xi)
             a[i] = ai
@@ -1093,14 +1093,14 @@ def _kmeans(self, k):
 
             # find new assignments
             for i, ai in enumerate(a):
-                m = max(s[ai] / 2.0, l[i])
+                m = max(s[ai] / 2.0, li[i])
 
                 if u[i] > m:
                     xi = x[i]
                     u[i] = d(xi, c[ai])
 
                     if u[i] > m:
-                        new_ai, u[i], _, l[i] = _smallest2(d(xi, cj) for cj in c)
+                        new_ai, u[i], _, li[i] = _smallest2(d(xi, cj) for cj in c)
 
                         if new_ai != ai:
                             q[ai] -= 1
@@ -1132,9 +1132,9 @@ def _kmeans(self, k):
             for i, ai in enumerate(a):
                 u[i] += p[ai]
                 if r1 == ai:
-                    l[i] -= p2
+                    li[i] -= p2
                 else:
-                    l[i] -= p1
+                    li[i] -= p1
 
             change = sum(p)
 

mathics/algorithm/introselect.py

@@ -167,25 +167,25 @@ def introselect(a, k):  # changes a
     import itertools
     import random
 
-    def test_algorithm(l, r_max, name, f):
-        a = [random.randint(-r_max, r_max) for _ in range(l)]
+    def test_algorithm(m, r_max, name, f):
+        a = [random.randint(-r_max, r_max) for _ in range(m)]
         b = sorted(a)
         c = [f(a[:], i) for i in range(len(a))]
         if b == c:
-            print("OK %s r: %d l: %d" % (name, r_max, l))
+            print("OK %s r: %d l: %d" % (name, r_max, m))
             return True
         else:
-            print("FAIL %s r: %d l: %d" % (name, r_max, l))
+            print("FAIL %s r: %d l: %d" % (name, r_max, m))
             print(a, b, c)
             return False
 
-    def test_configuration(l_max, r_max):
-        for l in range(l_max):
-            if not test_algorithm(l, r_max, "bfprt", bfprt):
+    def test_configuration(m_max, r_max):
+        for m in range(m_max):
+            if not test_algorithm(m, r_max, "bfprt", bfprt):
                 return False
 
-        for l in range(l_max):
-            if not test_algorithm(l, r_max, "introselect", introselect):
+        for m in range(m_max):
+            if not test_algorithm(m, r_max, "introselect", introselect):
                 return False
 
         return True

mathics/builtin/__init__.py

@@ -7,7 +7,7 @@
 
 Note that there are other modules to collect specific aspects a
 Builtin, such as ``mathics.eval`` for evaluation specifics, or
-``mathics.format`` for rendering details, or ``mathics.compile`` for
+``mathics.format.render`` for rendering details, or ``mathics.compile`` for
 compilation details.
 
 A Mathics Builtin is implemented one of a particular kind of Python

mathics/builtin/atomic/strings.py

@@ -876,7 +876,7 @@ class ToString(Builtin):
     >> "U" <> ToString[2]
      = U2
     >> ToString[Integrate[f[x],x], TeXForm]
-     = \\int f\\left[x\\right] \\, dx
+     = \\int f\\left(x\\right) \\, dx
 
     """
 

mathics/builtin/box/__init__.py

@@ -1,8 +1,15 @@
-r"""
-Boxing modules.
+r"""Expression Boxing
 
-Boxes are added in formatting \Mathics Expressions.
+Boxes are central to <url>:Form:/doc/reference-of-built-in-symbols/forms-of-input-and-output/</url> \
+processing of \Mathics expressions.
+
+Boxing information, like the class of expression to be worked on and \
+its size, allow formatters, like <url>:StandardForm:
+/doc/reference-of-built-in-symbols/forms-of-input-and-output/printforms/standardform/</url> \
+to do their work without \
+having to know more specific details and intricacies of expression to be formatted.
 
-Boxing information like bounding-box width and size makes it easier for formatters to do
-layout without having to know the intricacies of what is inside the box.
 """
+
+# This tells documentation how to sort this module
+sort_order = "mathics.builtin.expression-boxing"

mathics/builtin/box/compilation.py

@@ -5,7 +5,7 @@
 
 from mathics.builtin.box.expression import BoxExpression
 
-# Docs are not yet ready for prime time. Maybe after release 6.0.0.
+# No user docs here: Box primitives aren't documented.
 no_doc = True
 
 

mathics/builtin/box/graphics.py

@@ -37,9 +37,9 @@
 from mathics.core.list import ListExpression
 from mathics.core.symbols import Symbol, SymbolFalse, SymbolTrue
 from mathics.core.systemsymbols import SymbolAutomatic, SymbolTraditionalForm
-from mathics.eval.makeboxes import format_element
+from mathics.format.box import format_element
 
-# Docs are not yet ready for prime time. Maybe after release 6.0.0.
+# No user docs here: Box primitives aren't documented.
 no_doc = True
 
 SymbolRegularPolygonBox = Symbol("RegularPolygonBox")

mathics/builtin/box/graphics3d.py

@@ -36,7 +36,7 @@
 from mathics.core.symbols import Symbol, SymbolTrue
 from mathics.eval.nevaluator import eval_N
 
-# Docs are not yet ready for prime time. Maybe after release 7.0.0.
+# No user docs here - Box primitives aren't documented.
 no_doc = True