black

Author: mmatera

pymathics/vectorizedplot/__init__.py

@@ -22,23 +22,24 @@
 </ul>
 """
 
-
 from pymathics.vectorizedplot.version import __version__
+
 try:
-    from pymathics.vectorizedplot.plot_plot3d import ContourPlot3D, ParametricPlot3D, SphericalPlot3D
+    from pymathics.vectorizedplot.plot_plot3d import (
+        ContourPlot3D,
+        ParametricPlot3D,
+        SphericalPlot3D,
+    )
 
     __all__ = (
         "ContourPlot3D",
         "ParametricPlot3D",
         "SphericalPlot3D",
         "__version__",
-        "pymathics_version_data"
+        "pymathics_version_data",
     )
 except ModuleNotFoundError:
-    __all__ = (
-        "__version__",
-        "pymathics_version_data"
-    )
+    __all__ = ("__version__", "pymathics_version_data")
 
 # To be recognized as an external mathics module, the following variable
 # is required:
@@ -51,5 +52,3 @@
 
 # This tells documentation how to sort this module
 sort_order = "mathics.builtin.plotting-graphing-and-drawing"
-
-

pymathics/vectorizedplot/eval/colors.py

@@ -6,7 +6,6 @@
 from typing import Optional
 
 import palettable
-
 from mathics.core.atoms import Integer0, Integer1, MachineReal, String
 from mathics.core.convert.expression import to_expression
 from mathics.core.element import BaseElement

pymathics/vectorizedplot/eval/plot3d_vectorized.py

@@ -6,14 +6,11 @@
 import math
 
 import numpy as np
-
 from mathics.builtin.colors.color_internals import convert_color
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
-from mathics.core.symbols import strip_context, Symbol
-from mathics.core.systemsymbols import (
-    # TODO: uncomment me after adding this symbol to mathics.core.systemsymbols
-    #    SymbolAbsoluteThickness,
+from mathics.core.symbols import Symbol, strip_context
+from mathics.core.systemsymbols import (  # TODO: uncomment me after adding this symbol to mathics.core.systemsymbols; SymbolAbsoluteThickness,
     SymbolEqual,
     SymbolFull,
     SymbolNone,
@@ -25,9 +22,8 @@
 from .colors import palette2, palette3, palette_color_directive
 from .util import GraphicsGenerator, compile_exprs
 
-
 # TODO: remove me after adding this symbol to mathics.core.systemsymbols
-SymbolAbsoluteThickness= Symbol("System`AbsoluteThickness")
+SymbolAbsoluteThickness = Symbol("System`AbsoluteThickness")
 
 
 def make_surfaces(

pymathics/vectorizedplot/plot.py

@@ -6,9 +6,7 @@
 points, as another parameter, and plot or show the function applied to the data.
 """
 
-
 import palettable
-
 from mathics.builtin.graphics import Graphics
 from mathics.builtin.options import options_to_rules
 from mathics.core.atoms import Integer, Integer0, MachineReal, String
@@ -33,10 +31,11 @@
     SymbolStyle,
 )
 from mathics.eval.drawing.colors import COLOR_PALETTES, get_color_palette
-from pymathics.vectorizedplot.eval.plot import get_plot_range
-import pymathics.vectorizedplot.eval.plot3d_vectorized as plot_module
 from mathics.eval.nevaluator import eval_N
 
+import pymathics.vectorizedplot.eval.plot3d_vectorized as plot_module
+from pymathics.vectorizedplot.eval.plot import get_plot_range
+
 # The vectorized plot function generates GraphicsComplex using NumericArray,
 # which no consumer will currently understand. So lets make it opt-in for now.
 # If it remains opt-in we'll probably want some combination of env variables,
@@ -45,9 +44,6 @@
 # TODO: work out exactly how to deploy.
 
 
-
-
-
 # get the plot eval function for the given class,
 # depending on whether vectorized plot functions are enabled
 def get_plot_eval_function(cls):
@@ -197,7 +193,8 @@ def to_numbers(li):
 
         from math import ceil
 
-        from mpmath import ceil as mpceil, floor as mpfloor
+        from mpmath import ceil as mpceil
+        from mpmath import floor as mpfloor
 
         class Distribution:
             def __init__(self, data, n_bins):

pymathics/vectorizedplot/plot_plot.py

@@ -9,14 +9,14 @@
 from typing import Callable
 
 import numpy as np
-
 from mathics.builtin.graphics import Graphics
 from mathics.core.attributes import A_HOLD_ALL, A_PROTECTED, A_READ_PROTECTED
 from mathics.core.builtin import Builtin
 from mathics.core.convert.expression import to_mathics_list
 from mathics.core.evaluation import Evaluation
 from mathics.core.symbols import SymbolTrue
 from mathics.core.systemsymbols import SymbolLogPlot, SymbolPlotRange, SymbolSequence
+
 from pymathics.vectorizedplot.eval.drawing.plot import eval_Plot
 from pymathics.vectorizedplot.eval.drawing.plot_vectorized import eval_Plot_vectorized
 

pymathics/vectorizedplot/plot_plot3d.py

@@ -11,8 +11,6 @@
 """
 
 import numpy as np
-
-from pymathics.vectorizedplot import plot
 from mathics.builtin.drawing.graphics3d import Graphics3D
 from mathics.builtin.graphics import Graphics
 from mathics.builtin.options import filter_from_iterable, options_to_rules
@@ -22,6 +20,8 @@
 from mathics.core.evaluation import Evaluation
 from mathics.core.systemsymbols import Symbol, SymbolPlotRange, SymbolSequence
 
+from pymathics.vectorizedplot import plot
+
 # This tells documentation how to sort this module
 sort_order = "mathics.builtin.custom-plots"
 
@@ -176,13 +176,14 @@ class ComplexPlot3D(_Plot3D):
     >> ComplexPlot3D[(z^2 + 1)/(z^2 - 1), {z, -2 - 2 I, 2 + 2 I}]
      = ...
     """
+
     expected_args = 2
     graphics_class = Graphics3D
     many_functions = True
     num_plot_points = 2  # different from number of ranges
     options = _Plot3D.options3d | {"Mesh": "None"}
     summary_text = "plot one or more complex functions as a 3D surface"
-    
+
     def apply_function(self, function, names, us, vs):
         parms = {str(names[0]): us + vs * 1j}
         return us, vs, function(**parms)