Implement ContourPlot3D

.github/workflows/consistency-checks.yml

@@ -23,7 +23,7 @@ jobs:
         sudo apt update -qq && sudo apt install llvm-dev remake
         python -m pip install --upgrade pip
         # We can comment out after next Mathics-Scanner release
-        python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
+        python -m pip install -e "Mathics-Scanner[full] @ git+https://github.com/Mathics3/mathics-scanner"
         pip install -e .
 
     - name: Install Mathics with minimum dependencies

.github/workflows/macos.yml

@@ -30,7 +30,7 @@ jobs:
       run: |
         # We can comment out after next Mathics-Scanner release
         # python -m pip install Mathics-Scanner[full]
-        python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
+        python -m pip install -e "Mathics-Scanner[full] @ git+https://github.com/Mathics3/mathics-scanner"
         pip install -e .
         remake -x develop-full
     - name: Test Mathics3

.github/workflows/packages.yml

@@ -25,7 +25,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         # We can comment out after next Mathics-Scanner release
-        python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
+        python -m pip install -e "Mathics-Scanner[full] @ git+https://github.com/Mathics3/mathics-scanner"
     - name: Run Mathics3 Combinatorica tests
       run: |
         git submodule init

.github/workflows/plot-tests.yml

@@ -25,7 +25,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         # We can comment out after next Mathics-Scanner release
-        python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
+        python -m pip install -e "Mathics-Scanner[full] @ git+https://github.com/Mathics3/mathics-scanner"
         git clone --depth 1 https://github.com/Mathics3/mathics-scanner.git
         cd mathics-scanner/
         pip install -e .

.github/workflows/pyodide.yml

@@ -58,5 +58,5 @@ jobs:
           python -m pip install --no-build-isolation -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner
 
           pip install --no-build-isolation -e .
-          make mathics/data/op-tables.json mathics/data/operator-tables.json
+          make mathics/data/character-tables.json mathics/data/operator-tables.json
           make -j3 check

.github/workflows/ubuntu-bench.yml

@@ -26,7 +26,7 @@ jobs:
         python -m pip install --upgrade pip
         python -m pip install pytest-benchmark
         # We can comment out after next Mathics-Scanner release
-        python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
+        python -m pip install -e "Mathics-Scanner[full] @ git+https://github.com/Mathics3/mathics-scanner"
         # python -m pip install Mathics-Scanner[full]
         pip install -e .
         remake -x develop

.github/workflows/ubuntu-cython.yml

@@ -25,7 +25,7 @@ jobs:
         sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev tesseract-ocr
         python -m pip install --upgrade pip
         # We can comment out after next Mathics-Scanner release
-        python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
+        python -m pip install -e "Mathics-Scanner[full] @ git+https://github.com/Mathics3/mathics-scanner"
         pip install -e .
         cd ..
 

.github/workflows/windows.yml

@@ -34,7 +34,7 @@ jobs:
     - name: Install Mathics3 with Python dependencies
       run: |
         # We can comment out after next Mathics-Scanner release
-        python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
+        python -m pip install -e "Mathics-Scanner[full] @ git+https://github.com/Mathics3/mathics-scanner"
         pip install -e .
 
         # python -m pip install Mathics-Scanner[full]

Makefile

@@ -44,13 +44,13 @@ MATHICS3_MODULE_OPTION ?= --load-module pymathics.graph,pymathics.natlang
    test \
    texdoc
 
-SANDBOX	?=
+MATHICS3_SANDBOX	?=
 ifeq ($(OS),Windows_NT)
-	SANDBOX = t
+	MATHICS3_SANDBOX = t
 else
 	UNAME_S := $(shell uname -s)
 	ifeq ($(UNAME_S),Darwin)
-		SANDBOX = t
+		MATHICS3_SANDBOX = t
 	endif
 endif
 
@@ -69,17 +69,17 @@ build:
 # because pip install doesn't handle
 # INSTALL_REQUIRES properly
 #: Set up to run from the source tree
-develop:  mathics/data/op-tables.json mathics/data/operator-tables.json
+develop:  mathics/data/character-tables.json mathics/data/operator-tables.json
 	$(PIP) install -e .[dev]
 
 # See note above on ./setup.py
 #: Set up to run from the source tree with full dependencies
-develop-full:  mathics/data/op-tables.json mathics/data/operators.json
+develop-full:  mathics/data/character-tables.json mathics/data/operators.json
 	$(PIP) install -e .[dev,full]
 
 # See note above on ./setup.py
 #: Set up to run from the source tree with full dependencies and Cython
-develop-full-cython: mathics/data/op-tables.json mathics/data/operators.json
+develop-full-cython: mathics/data/character-tables.json mathics/data/operators.json
 	$(PIP) install -e .[dev,full,cython]
 
 
@@ -126,7 +126,7 @@ clean: clean-cython clean-cache
 	   ($(MAKE) -C "$$dir" clean); \
 	done; \
 	rm -f factorials || true; \
-	rm -f mathics/data/op-tables || true; \
+	rm -f mathics/data/character-tables.json || true; \
 	rm -rf build || true
 
 mypy:
@@ -155,7 +155,7 @@ doctest-data: mathics/builtin/*.py mathics/doc/documentation/*.mdoc mathics/doc/
 
 #: Run tests that appear in docstring in the code. Use environment variable "DOCTEST_OPTIONS" for doctest options
 doctest:
-	MATHICS_CHARACTER_ENCODING="ASCII" SANDBOX=$(SANDBOX) $(PYTHON) mathics/docpipeline.py $(DOCTEST_OPTIONS)
+	MATHICS_CHARACTER_ENCODING="ASCII" MATHICS3_SANDBOX=$(MATHICS3_SANDBOX) $(PYTHON) mathics/docpipeline.py $(DOCTEST_OPTIONS)
 
 #: Run tests that appear in docstring in the code, stopping on the first error.
 doctest-x:
@@ -166,7 +166,7 @@ latexdoc texdoc doc:
 	(cd mathics/doc/latex && $(MAKE) doc)
 
 #: Build JSON ASCII to unicode opcode table and operator table
-mathics/data/operator-tables.json mathics/data/op-tables.json mathics/data/operators.json:
+mathics/data/operator-tables.json mathics/data/character-tables.json mathics/data/operators.json:
 	$(BASH) ./admin-tools/make-JSON-tables.sh
 
 #: Remove ChangeLog

SYMBOLS_MANIFEST.txt

@@ -12,6 +12,7 @@ ImportExport`RegisterExport
 ImportExport`RegisterImport
 Internal`RealValuedNumberQ
 Internal`RealValuedNumericQ
+JSON`Import`JSONImport
 System`$Aborted
 System`$Assumptions
 System`$BaseDirectory
@@ -486,6 +487,7 @@ System`FoldList
 System`FontColor
 System`For
 System`Format
+System`FormatType
 System`FormatValues
 System`FractionBox
 System`FractionalPart

admin-tools/make-JSON-tables.sh

@@ -5,14 +5,7 @@ mydir=$(dirname $bs)
 PYTHON=${PYTHON:-python}
 
 cd $mydir/../mathics/data
-mathics3-generate-json-table \
-    --field=ascii-operator-to-symbol \
-    --field=ascii-operator-to-unicode \
-    --field=ascii-operator-to-wl-unicode \
-    --field=operator-to-ascii \
-    --field=operator-to-amslatex \
-    --field=operator-to-unicode \
-    -o op-tables.json
+mathics3-generate-json-table -o character-tables.json
 mathics3-generate-operator-json-table -o operator-tables.json
 # tokenizer looks for the table in the default place...
 mathics3-generate-operator-json-table

mathics/__main__.py

@@ -357,7 +357,10 @@ def interactive_eval_loop(shell, full_form: bool, strict_wl_output: bool):
 
             show_echo(source_code, evaluation)
             if len(source_code) and source_code[0] == "!":
-                subprocess.run(source_code[1:], shell=True)
+                if not settings.ENABLE_SYSTEM_COMMANDS:
+                    evaluation.message("Run", "dis")
+                else:
+                    subprocess.run(source_code[1:], shell=True)
                 shell.definitions.increment_line_no(1)
                 continue
             if query is None:

mathics/builtin/arithfns/basic.py

@@ -7,19 +7,14 @@
 
 """
 
-from mathics.builtin.arithmetic import create_infix
 from mathics.core.atoms import (
     Complex,
     Integer,
     Integer1,
     Integer3,
-    Integer310,
     IntegerM1,
     Number,
-    Rational,
     RationalOneHalf,
-    Real,
-    String,
 )
 from mathics.core.attributes import (
     A_FLAT,
@@ -37,32 +32,20 @@
     PrefixOperator,
     SympyFunction,
 )
-from mathics.core.convert.expression import to_expression
-from mathics.core.convert.sympy import from_sympy
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
-from mathics.core.list import ListExpression
-from mathics.core.symbols import (
-    Symbol,
-    SymbolDivide,
-    SymbolHoldForm,
-    SymbolNull,
-    SymbolPower,
-    SymbolTimes,
-)
+from mathics.core.symbols import Symbol, SymbolNull, SymbolPower, SymbolTimes
 from mathics.core.systemsymbols import (
     SymbolBlank,
     SymbolComplexInfinity,
     SymbolIndeterminate,
-    SymbolInfix,
-    SymbolLeft,
-    SymbolMinus,
     SymbolPattern,
     SymbolSequence,
 )
 from mathics.eval.arithfns.basic import eval_Plus, eval_Times
 from mathics.eval.nevaluator import eval_N
 from mathics.eval.numerify import numerify
+from mathics.format.form_rule.arithfns import format_plus, format_times
 
 
 class CubeRoot(Builtin):
@@ -303,54 +286,7 @@ def eval(self, elements, evaluation: Evaluation):
 
     def format_plus(self, items, evaluation: Evaluation):
         "Plus[items__]"
-
-        def negate(item):  # -> Expression (see FIXME below)
-            if item.has_form("Times", 2, None):
-                if isinstance(item.elements[0], Number):
-                    first, *rest = item.elements
-                    first = -first
-                    if first.sameQ(Integer1):
-                        if len(rest) == 1:
-                            return rest[0]
-                        return Expression(SymbolTimes, *rest)
-
-                    return Expression(SymbolTimes, first, *rest)
-                else:
-                    return Expression(SymbolTimes, IntegerM1, *item.elements)
-            elif isinstance(item, Number):
-                return from_sympy(-item.to_sympy())
-            else:
-                return Expression(SymbolTimes, IntegerM1, item)
-
-        def is_negative(value) -> bool:
-            if isinstance(value, Complex):
-                real, imag = value.to_sympy().as_real_imag()
-                if real <= 0 and imag <= 0:
-                    return True
-            elif isinstance(value, Number) and value.to_sympy() < 0:
-                return True
-            return False
-
-        elements = items.get_sequence()
-        values = [to_expression(SymbolHoldForm, element) for element in elements[:1]]
-        ops = []
-        for element in elements[1:]:
-            if (
-                element.has_form("Times", 1, None) and is_negative(element.elements[0])
-            ) or is_negative(element):
-                element = negate(element)
-                op = "-"
-            else:
-                op = "+"
-            values.append(Expression(SymbolHoldForm, element))
-            ops.append(String(op))
-        return Expression(
-            SymbolInfix,
-            ListExpression(*values),
-            ListExpression(*ops),
-            Integer310,
-            SymbolLeft,
-        )
+        return format_plus(items, evaluation)
 
 
 class Power(InfixOperator, MPMathFunction):
@@ -645,74 +581,16 @@ def eval(self, elements, evaluation: Evaluation):
 
     def format_times(self, items, evaluation: Evaluation, op="\u2062"):
         "Times[items__]"
-
-        def inverse(item):
-            if item.has_form("Power", 2) and isinstance(  # noqa
-                item.elements[1], (Integer, Rational, Real)
-            ):
-                neg = -item.elements[1]
-                if neg.sameQ(Integer1):
-                    return item.elements[0]
-                else:
-                    return Expression(SymbolPower, item.elements[0], neg)
-            else:
-                return item
-
-        items = items.get_sequence()
-        if len(items) < 2:
-            return
-        positive = []
-        negative = []
-        for item in items:
-            if (
-                item.has_form("Power", 2)
-                and isinstance(item.elements[1], (Integer, Rational, Real))
-                and item.elements[1].to_sympy() < 0
-            ):  # nopep8
-                negative.append(inverse(item))
-            elif isinstance(item, Rational):
-                numerator = item.numerator()
-                if not numerator.sameQ(Integer1):
-                    positive.append(numerator)
-                negative.append(item.denominator())
-            else:
-                positive.append(item)
-
-        if positive and hasattr(positive[0], "value") and positive[0].value == -1:
-            del positive[0]
-            minus = True
-        else:
-            minus = False
-        positive = [Expression(SymbolHoldForm, item) for item in positive]
-        negative = [Expression(SymbolHoldForm, item) for item in negative]
-        if positive:
-            positive = create_infix(positive, op, 400, "Left")
-        else:
-            positive = Integer1
-        if negative:
-            negative = create_infix(negative, op, 400, "Left")
-            result = Expression(
-                SymbolDivide,
-                Expression(SymbolHoldForm, positive),
-                Expression(SymbolHoldForm, negative),
-            )
-        else:
-            result = positive
-        if minus:
-            result = Expression(
-                SymbolMinus, result
-            )  # Expression('PrecedenceForm', result, 481))
-        result = Expression(SymbolHoldForm, result)
-        return result
+        return format_times(items, evaluation, op)
 
     def format_inputform(self, items, evaluation):
         "(InputForm,): Times[items__]"
-        return self.format_times(items, evaluation, op="*")
+        return format_times(items, evaluation, op="*")
 
     def format_standardform(self, items, evaluation):
         "(StandardForm,): Times[items__]"
-        return self.format_times(items, evaluation, op=" ")
+        return format_times(items, evaluation, op=" ")
 
     def format_outputform(self, items, evaluation):
         "(OutputForm,): Times[items__]"
-        return self.format_times(items, evaluation, op=" ")
+        return format_times(items, evaluation, op=" ")

mathics/builtin/assignments/types.py

@@ -155,7 +155,7 @@ class SubValues(Builtin):
     >> SubValues[f]
      = {HoldPattern[f[2][x_]] :> x ^ 2, HoldPattern[f[1][x_]] :> x}
     >> Definition[f]
-     = f[2][x_] = x ^ 2
+     = f[2][x_] = x^2
      .
      . f[1][x_] = x
     """

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(x) \\, dx
 
     """