Merge branch 'master' into mathics-5.0.0-more-adjustments

Author: rocky

pymathics/graph/__main__.py

@@ -471,7 +471,7 @@ def default_format(self, evaluation, form):
     def do_format(self, evaluation, form):
         return self
 
-    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
@@ -516,6 +516,12 @@ def is_mixed_graph(self):
     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/generators.py

@@ -144,7 +144,8 @@ def apply(self, m1, m2, expression, evaluation, options):
         return g
 
 
-# Oddly, networkX doesn't allow the directed case.
+# This code will be in the 2.6 release of networkx.
+# See https://github.com/networkx/networkx/pull/4461
 def binomial_tree(n, create_using=None):
     """Returns the Binomial Tree of order n.
 
@@ -162,11 +163,20 @@ def binomial_tree(n, create_using=None):
     G : NetworkX graph
         A binomial tree of $2^n$ vertices and $2^n - 1$ edges.
 
+    create_using : NetworkX graph constructor, optional (default=nx.Graph)
+       Graph type to create. If graph instance, then cleared before populated.
+
+    Returns
+    -------
+    G : NetworkX graph
+        A binomial tree of $2^n$ nodes and $2^n - 1$ edges.
+
     """
-    G = nx.empty_graph(1, create_using=create_using)
+    G = nx.empty_graph(1, create_using)
     N = 1
     for i in range(n):
-        edges = [(u + N, v + N) for (u, v) in G.edges]
+        # Use G.edges() to ensure 2-tuples. G.edges is 3-tuple for MultiGraph
+        edges = [(u + N, v + N) for (u, v) in G.edges()]
         G.add_edges_from(edges)
         G.add_edge(0, N)
         N *= 2