Merge branch 'master' into solve_ineq

Author: BlankShrimp

mathics/builtin/atomic/numbers.py

@@ -45,7 +45,7 @@
     SymbolRound,
 )
 from mathics.eval.nevaluator import eval_N
-from mathics.eval.numbers import eval_Accuracy, eval_Precision
+from mathics.eval.numbers.numbers import eval_Accuracy, eval_Precision
 
 SymbolIntegerDigits = Symbol("IntegerDigits")
 SymbolIntegerExponent = Symbol("IntegerExponent")

mathics/builtin/numbers/algebra.py

@@ -17,7 +17,6 @@
 
 import sympy
 
-from mathics.algorithm.simplify import default_complexity_function
 from mathics.builtin.inference import evaluate_predicate
 from mathics.builtin.options import options_to_rules
 from mathics.builtin.scoping import dynamic_scoping
@@ -64,7 +63,8 @@
     SymbolTable,
     SymbolTanh,
 )
-from mathics.eval.numbers import cancel, sympy_factor
+from mathics.eval.numbers.algebra.simplify import default_complexity_function
+from mathics.eval.numbers.numbers import cancel, sympy_factor
 from mathics.eval.parts import walk_parts
 from mathics.eval.patterns import match
 

mathics/builtin/numbers/calculus.py

@@ -15,18 +15,6 @@
 import numpy as np
 import sympy
 
-from mathics.algorithm.integrators import (
-    _fubini,
-    _internal_adaptative_simpsons_rule,
-    decompose_domain,
-    eval_D_to_Integral,
-)
-from mathics.algorithm.series import (
-    build_series,
-    series_derivative,
-    series_plus_series,
-    series_times_series,
-)
 from mathics.builtin.scoping import dynamic_scoping
 from mathics.core.atoms import (
     Atom,
@@ -94,6 +82,18 @@
 from mathics.eval.calculus import solve_sympy
 from mathics.eval.makeboxes import format_element
 from mathics.eval.nevaluator import eval_N
+from mathics.eval.numbers.calculus.integrators import (
+    _fubini,
+    _internal_adaptative_simpsons_rule,
+    decompose_domain,
+    eval_D_to_Integral,
+)
+from mathics.eval.numbers.calculus.series import (
+    build_series,
+    series_derivative,
+    series_plus_series,
+    series_times_series,
+)
 
 # These should be used in lower-level formatting
 SymbolDifferentialD = Symbol("System`DifferentialD")
@@ -752,7 +752,9 @@ class FindMaximum(_BaseFinder):
     messages = _BaseFinder.messages.copy()
     summary_text = "local maximum optimization"
     try:
-        from mathics.algorithm.optimizers import native_local_optimizer_methods
+        from mathics.eval.numbers.calculus.optimizers import (
+            native_local_optimizer_methods,
+        )
 
         methods.update(native_local_optimizer_methods)
     except Exception:
@@ -801,7 +803,7 @@ class FindMinimum(_BaseFinder):
     messages = _BaseFinder.messages.copy()
     summary_text = "local minimum optimization"
     try:
-        from mathics.algorithm.optimizers import (
+        from mathics.eval.numbers.calculus.optimizers import (
             native_local_optimizer_methods,
             native_optimizer_messages,
         )
@@ -887,7 +889,7 @@ class FindRoot(_BaseFinder):
     )
 
     try:
-        from mathics.algorithm.optimizers import (
+        from mathics.eval.numbers.calculus.optimizers import (
             native_findroot_messages,
             native_findroot_methods,
         )
@@ -1353,7 +1355,7 @@ class NIntegrate(Builtin):
 
     try:
         # builtin integrators
-        from mathics.algorithm.integrators import (
+        from mathics.eval.numbers.calculus.integrators import (
             integrator_messages,
             integrator_methods,
         )

mathics/core/builtin.py

@@ -63,7 +63,7 @@
     SymbolSequence,
 )
 from mathics.eval.arithmetic import eval_mpmath_function
-from mathics.eval.numbers import cancel
+from mathics.eval.numbers.numbers import cancel
 from mathics.eval.numerify import numerify
 from mathics.eval.scoping import dynamic_scoping
 

mathics/eval/numbers/__init__.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+"""
+Implementation of mathics.builtin.numbers
+"""

mathics/eval/numbers/algebra/__init__.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+"""
+Implementation of  mathics.builtin.numbers.algebra
+"""

mathics/algorithm/simplify.py renamed to mathics/eval/numbers/algebra/simplify.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+"""
+Implementation of mathics.builtin.numbers.calculus
+"""

mathics/eval/numbers/calculus/__init__.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-
+"""
+Implementation of builtin function integrators.
+"""
 import numpy as np
 
 from mathics.core.atoms import Integer, Integer0, Number

mathics/algorithm/integrators.py renamed to mathics/eval/numbers/calculus/integrators.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-
+"""
+Implementation of builtin optimizers.
+"""
 from typing import Optional
 
 from mathics.builtin.scoping import dynamic_scoping

mathics/algorithm/optimizers.py renamed to mathics/eval/numbers/calculus/optimizers.py

@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+"""
+Implementation of Series handling functions.
+"""
 from mathics.core.atoms import Integer, Integer0, Rational
 from mathics.core.convert.expression import to_mathics_list
 from mathics.core.expression import Expression

mathics/algorithm/series.py renamed to mathics/eval/numbers/calculus/series.py

@@ -1,3 +1,8 @@
+# -*- coding: utf-8 -*-
+"""
+Implementation of numbers handling functions.
+"""
+
 from typing import Optional
 
 import mpmath