another round of small fixes (#20)

* another round of small fixes

* remove extra line

Author: mmatera

pymathics/graph/base.py

@@ -6,17 +6,14 @@
 
 # uses networkx
 
-import base64
-import tempfile
-
 from collections import defaultdict
 from inspect import isgenerator
-from typing import Callable, Optional, Tuple
+from typing import Callable, Optional
 
 from mathics.builtin.base import AtomBuiltin, Builtin
 from mathics.core.atoms import Atom, Integer, Integer0, Integer1, Integer2, String
 from mathics.core.convert.expression import ListExpression, from_python
-from mathics.core.element import BaseElement, BoxElementMixin
+from mathics.core.element import BaseElement
 from mathics.core.expression import Expression
 from mathics.core.symbols import Symbol, SymbolList, SymbolTrue
 from mathics.core.systemsymbols import (
@@ -879,7 +876,7 @@ class DirectedEdge(Builtin):
     :Directed edge:
     https://en.wikipedia.org/wiki/Directed_graph</url> (<url>
     :NetworkX:
-    https://networkx.org/documentation/stable/reference/classes/digraph.html</url>,
+    https://networkx.org/documentation/networkx-2.8.8/reference/classes/digraph.html</url>,
     <url>
     :WMA:
     https://reference.wolfram.com/language/ref/DirectedEdge.html</url>)
@@ -900,7 +897,7 @@ class EdgeConnectivity(_NetworkXBuiltin):
     :Edge connectivity:
     https://en.wikipedia.org/wiki/Directed_graph</url> (<url>
     :NetworkX:
-    https://networkx.org/documentation/stable/reference/algorithms/\
+    https://networkx.org/documentation/networkx-2.8.8/reference/algorithms/\
     generated/networkx.algorithms.connectivity.connectivity.edge_connectivity.html</url>,
     <url>
     :WMA:
@@ -1082,9 +1079,15 @@ def eval_s_t(self, graph, s, t, expression, evaluation, options):
 
 class FindVertexCut(_NetworkXBuiltin):
     """
+    <url>:Minimum cut:https://en.wikipedia.org/wiki/Minimum_cut</url>\
+    (<url>
+    :NetworkX:
+    https://networkx.org/documentation/networkx-2.8.8/reference/algorithms/\
+generated/networkx.algorithms.connectivity.cuts.minimum_node_cut.html
+    </url>, \
     <url>
     :WMA:
-    https://reference.wolfram.com/language/ref/FindVertexCut.html</url>
+    https://reference.wolfram.com/language/ref/FindVertexCut.html</url>)
 
     <dl>
     <dt>'FindVertexCut[$g$]'

pymathics/graph/centralities.py

@@ -72,7 +72,7 @@ class BetweennessCentrality(_Centrality):
     https://en.wikipedia.org/wiki/Betweenness_centrality</url> (<url>
     :NetworkX:
     https://networkx.org/documentation/networkx-2.8.8/reference/algorithms/generated/\
-    networkx.algorithms.centrality.betweenness_centrality.html</url>,
+    networkx.algorithms.centrality.betweenness_centrality.html</url>,\
     <url>
     :WMA:
     https://reference.wolfram.com/language/ref/BetweennessCentrality.html</url>)
@@ -116,7 +116,7 @@ class ClosenessCentrality(_Centrality):
     https://en.wikipedia.org/wiki/Closeness_centrality</url> (<url>
     :NetworkX:
     https://networkx.org/documentation/networkx-2.8.8/reference/algorithms/generated/\
-    networkx.algorithms.centrality.closeness_centrality.html</url>,
+    networkx.algorithms.centrality.closeness_centrality.html</url>,\
     <url>
     :WMA:
     https://reference.wolfram.com/language/ref/ClosenessCentrality.html</url>)
@@ -164,7 +164,7 @@ class DegreeCentrality(_Centrality):
     https://en.wikipedia.org/wiki/Degree_centrality</url> (<url>
     :NetworkX:
     https://networkx.org/documentation/networkx-2.8.8/reference/algorithms/generated/\
-    networkx.algorithms.centrality.degree_centrality.html</url>,
+    networkx.algorithms.centrality.degree_centrality.html</url>,\
     <url>
     :WMA:
     https://reference.wolfram.com/language/ref/DegreeCentrality.html</url>)
@@ -222,7 +222,7 @@ class EigenvectorCentrality(_ComponentwiseCentrality):
     https://en.wikipedia.org/wiki/Eigenvector_centrality</url> (<url>
     :NetworkX:
     https://networkx.org/documentation/networkx-2.8.8/reference/algorithms\
-/generated/networkx.algorithms.centrality.eigenvector_centrality.html</url>,
+/generated/networkx.algorithms.centrality.eigenvector_centrality.html</url>,\
 <url>
     :WMA:
     https://reference.wolfram.com/language/ref/EgenvectorCentrality.html</url>)
@@ -284,7 +284,8 @@ class HITSCentrality(_Centrality):
     <url>
     :NetworkX:
     https://networkx.org/documentation/networkx-2.8.8/reference/algorithms/\
-generated/networkx.algorithms.link_analysis.hits_alg.hits.html</url>, <url>
+generated/networkx.algorithms.link_analysis.hits_alg.hits.html</url>, \
+    <url>
     :WMA:
     https://reference.wolfram.com/language/ref/HITSCentrality.html</url>
 
@@ -326,7 +327,8 @@ class KatzCentrality(_ComponentwiseCentrality):
     :NetworkX:
     https://networkx.org/documentation/networkx-2.8.8/reference/algorithms\
 /generated/networkx.algorithms.centrality.katz_centrality.html\
-#networkx.algorithms.centrality.katz_centrality</url>, <url>
+#networkx.algorithms.centrality.katz_centrality</url>, \
+    <url>
     :WMA:
     https://reference.wolfram.com/language/ref/KatzCentrality.html</url>)
 
@@ -341,8 +343,6 @@ class KatzCentrality(_ComponentwiseCentrality):
 
     >> g = Graph[{a -> b, b -> c, c -> d, d -> e, e -> c, e -> a}]
      = -Graph-
-    >> g
-     = -Graph-
     >> KatzCentrality[g, 0.2]
      = {1.25202, 1.2504, 1.5021, 1.30042, 1.26008}
 
@@ -387,7 +387,7 @@ class PageRankCentrality(_Centrality):
     https://en.wikipedia.org/wiki/Pagerank</url> (<url>
     :NetworkX:
     https://networkx.org/documentation/networkx-2.8.8/reference/algorithms\
-    /generated/networkx.algorithms.link_analysis.pagerank_alg.pagerank.html</url>,
+    /generated/networkx.algorithms.link_analysis.pagerank_alg.pagerank.html</url>,\
     <url>
     :WMA:
     https://reference.wolfram.com/language/ref/PageRankCentrality.html</url>)
@@ -401,9 +401,9 @@ class PageRankCentrality(_Centrality):
           vertices in the graph $g$ and weight $alpha$ and initial centralities $beta$.
     </dl>
 
-    # Not working, possibly because an issue in networkx
+    ## Not working, possibly because an issue in networkx
 
-    # >> g = Graph[{a -> d, b -> c, d -> c, d -> a, e -> c, d -> c}]; PageRankCentrality[g, 0.2]
+    ## >> g = Graph[{a -> d, b -> c, d -> c, d -> a, e -> c, d -> c}]; PageRankCentrality[g, 0.2]
      = {0.184502, 0.207565, 0.170664, 0.266605, 0.170664}
     """
 

pymathics/graph/operations.py

@@ -18,8 +18,12 @@
 
 class FindSpanningTree(_NetworkXBuiltin):
     """
-    <url>:Spanning Tree:https://en.wikipedia.org/wiki/Spanning_tree</url>
-    (<url>:WMA:
+    <url>:Spanning Tree:https://en.wikipedia.org/wiki/Spanning_tree</url> \
+    (<url>:NetworkX:
+    https://networkx.org/documentation/networkx-2.8.8/reference/algorithms/\
+generated/networkx.algorithms.tree.mst.minimum_spanning_edges.html
+    </url>,\
+    <url>:WMA:
     https://reference.wolfram.com/language/ref/FindSpanningTree.html
     </url>)
 

pymathics/graph/parametric.py

@@ -198,9 +198,17 @@ def eval(
 
 class CompleteGraph(_NetworkXBuiltin):
     """
+    <url>Complete Multipartite Graph:
+    https://en.wikipedia.org/wiki/Multipartite_graph
+    </url>\
+    (<url>
+    :NetworkX:
+    https://networkx.org/documentation/networkx-2.8.8/reference/\
+generated/networkx.generators.classic.complete_multipartite_graph.html
+    </url>, \
     <url>
     :WMA:https://reference.wolfram.com/language/ref/CompleteGraph.html
-    </url>
+    </url>)
     <dl>
       <dt>'CompleteGraph[$n$]'
       <dd>Returns the complete graph with $n$ vertices, $K_n$.