Misc 5.0.0 API changes

Author: rocky

pymathics/graph/__init__.py

@@ -11,11 +11,11 @@
    In[4]:= CompleteKaryTree[3, VertexLabels->True]
 """
 
-from pymathics.graph.version import __version__
 from pymathics.graph.__main__ import *  # noqa
-from pymathics.graph.tree import *  # qoqa
-from pymathics.graph.generators import *  # noqa
 from pymathics.graph.algorithms import *  # noqa
+from pymathics.graph.generators import *  # noqa
+from pymathics.graph.tree import *  # noqa
+from pymathics.graph.version import __version__  # noqa
 
 pymathics_version_data = {
     "author": "The Mathics Team",

pymathics/graph/__main__.py

@@ -11,7 +11,6 @@
 
 from inspect import isgenerator
 
-
 from mathics.builtin.base import AtomBuiltin, Builtin
 from mathics.builtin.box.graphics import GraphicsBox
 from mathics.builtin.box.inout import _BoxedString
@@ -269,8 +268,7 @@ def _evaluate_atom(self, graph, options, compute):
     def __str__(self):
         return "-Graph-"
 
-    # FIXME: return type should be a specific kind of Tuple, not a list.
-    def get_sort_key(self, pattern_sort=False) -> list:
+    def get_sort_key(self, pattern_sort=False) -> tuple:
         """
         Returns a particular encoded list (which should be a tuple) that is used
         in ``Sort[]`` comparisons and in the ordering that occurs
@@ -471,6 +469,24 @@ def default_format(self, evaluation, form):
     def do_format(self, evaluation, form):
         return self
 
+    @property
+    def edges(self):
+        return self.G.edges
+
+    def empty(self):
+        return len(self.G) == 0
+
+    def is_loop_free(self):
+        return not any(True for _ in nx.nodes_with_selfloops(self.G))
+
+    # networkx graphs can't be for mixed
+    def is_mixed_graph(self):
+        return False
+        # return self.edges. ... is_mixed()
+
+    def is_multigraph(self):
+        return isinstance(self.G, (nx.MultiDiGraph, nx.MultiGraph))
+
     def get_sort_key(self, pattern_sort=False) -> tuple:
         """
         Returns a particular encoded list (which should be a tuple) that is used
@@ -498,30 +514,6 @@ def get_sort_key(self, pattern_sort=False) -> tuple:
             ]
             return hash(self)
 
-    @property
-    def edges(self):
-        return self.G.edges
-
-    def empty(self):
-        return len(self.G) == 0
-
-    def is_loop_free(self):
-        return not any(True for _ in nx.nodes_with_selfloops(self.G))
-
-    # networkx graphs can't be for mixed
-    def is_mixed_graph(self):
-        return False
-        # return self.edges. ... is_mixed()
-
-    def is_multigraph(self):
-        return isinstance(self.G, (nx.MultiDiGraph, nx.MultiGraph))
-
-    def get_sort_key(self, pattern_sort=False):
-        if pattern_sort:
-            return super(Graph, self).get_sort_key(True)
-        else:
-            return (1, 3, Symbol("Pymathics`Graph"), tuple(), 2, len(self.pixels), hash(self))
-
     @property
     def value(self):
         return self.G

pymathics/graph/algorithms.py

@@ -5,23 +5,20 @@
 networkx does all the heavy lifting.
 """
 
-from mathics.core.expression import Expression, Symbol
+from mathics.core.convert.python import from_python
+from mathics.core.expression import Expression
+from mathics.core.list import ListExpression
+from mathics.core.symbols import SymbolFalse
 
 from pymathics.graph.__main__ import (
     DEFAULT_GRAPH_OPTIONS,
-    _NetworkXBuiltin,
+    SymbolDirectedEdge,
+    SymbolUndirectedEdge,
     _create_graph,
+    _NetworkXBuiltin,
     nx,
 )
 
-from mathics.core.expression import (
-    from_python,
-)
-
-# FIXME: Add to Mathics Expression
-# SymbolFalse = Symbol("System`False")
-# SymbolTrue = Symbol("System`True")
-
 
 class ConnectedComponents(_NetworkXBuiltin):
     """
@@ -152,8 +149,8 @@ def apply(self, graph, expression, evaluation, options):
         "%(name)s[graph_, OptionsPattern[%(name)s]]"
         graph = self._build_graph(graph, evaluation, options, expression)
         if graph:
-            weight = graph.update_weights(evaluation)
-            edge_type = "DirectedEdge" if graph.G.is_directed() else "UndirectedEdge"
+            graph.update_weights(evaluation)
+            SymbolDirectedEdge if graph.G.is_directed() else SymbolUndirectedEdge
             # FIXME: put in edge to Graph conversion function?
             edges = [
                 Expression("UndirectedEdge", u, v)
@@ -187,9 +184,9 @@ def apply(self, graph, expression, evaluation, options):
         "%(name)s[graph_, OptionsPattern[%(name)s]]"
         graph = self._build_graph(graph, evaluation, options, expression)
         if not graph:
-            return Symbol("System`False")
+            return SymbolFalse
         is_planar, _ = nx.check_planarity(graph.G)
-        return Symbol("System`True") if is_planar else Symbol("System`False")
+        return from_python(is_planar)
 
 
 class WeaklyConnectedComponents(_NetworkXBuiltin):
@@ -214,6 +211,6 @@ def apply(self, graph, expression, evaluation, options):
             components = sorted(components, key=lambda c: index[next(iter(c))])
 
             vertices_sorted = graph.vertices.get_sorted()
-            result = [Expression("List", *vertices_sorted(c)) for c in components]
+            result = [ListExpression(*vertices_sorted(c)) for c in components]
 
-            return Expression("List", *result)
+            return ListExpression(*result)

pymathics/graph/generators.py

@@ -5,24 +5,23 @@
 networkx does all the heavy lifting.
 """
 
+from typing import Callable, Optional
+
 from mathics.builtin.numbers.randomnumbers import RandomEnv
+from mathics.core.expression import Expression, Integer, String
 
 from pymathics.graph.__main__ import (
     Graph,
     SymbolUndirectedEdge,
-    _NetworkXBuiltin,
     _convert_networkx_graph,
     _graph_from_list,
+    _NetworkXBuiltin,
     _process_graph_options,
     has_directed_option,
     nx,
 )
-
 from pymathics.graph.tree import DEFAULT_TREE_OPTIONS
 
-from mathics.core.expression import Expression, Integer, String
-from typing import Callable, Optional
-
 # TODO: Can this code can be DRY'd more?
 
 

pymathics/graph/tree.py

@@ -1,11 +1,12 @@
 import networkx as nx
+from mathics.core.expression import Atom, Symbol
+
 from pymathics.graph.__main__ import (
+    DEFAULT_GRAPH_OPTIONS,
     Graph,
     _graph_from_list,
-    DEFAULT_GRAPH_OPTIONS,
     _NetworkXBuiltin,
 )
-from mathics.core.expression import Atom, Symbol
 
 DEFAULT_TREE_OPTIONS = {
     **DEFAULT_GRAPH_OPTIONS,