Allow more networkx generators

also MATPLOTLAB -> NETWORKX

Author: rocky

pymathics/graph/__main__.py

@@ -23,7 +23,7 @@
 
 from inspect import isgenerator
 
-WL_MARKER_TO_MATPLOTLIB = {
+WL_MARKER_TO_NETWORKX = {
     "Circle": "o",
     "Diamond": "D",
     "Square": "s",
@@ -35,13 +35,13 @@
     # And many others. Is there a list somewhere?
 }
 
-WL_COLOR_TO_MATPLOTLIB = {
+WL_COLOR_TO_NETWORKX = {
     "Green": "g",
     "Blue": "b",
     # And many others. Is there a list somewhere?
 }
 
-WL_LAYOUT_TO_MATPLOTLIB = {
+WL_LAYOUT_TO_NETWORKX = {
     "CircularEmbedding": "circular",
     "SpiralEmbedding": "spiral",
     "SpectralEmbedding": "spectral",
@@ -86,7 +86,7 @@ def _process_graph_options(g, options: dict) -> None:
         else "Circle"
     )
 
-    g.G.node_shape = g.node_shape = WL_MARKER_TO_MATPLOTLIB.get(shape, shape)
+    g.G.node_shape = g.node_shape = WL_MARKER_TO_NETWORKX.get(shape, shape)
 
     color = (
         options["System`VertexStyle"].get_string_value()
@@ -100,9 +100,9 @@ def _process_graph_options(g, options: dict) -> None:
         else ""
     )
 
-    g.G.graph_layout = g.graph_layout = WL_LAYOUT_TO_MATPLOTLIB.get(g.graph_layout, g.graph_layout)
+    g.G.graph_layout = g.graph_layout = WL_LAYOUT_TO_NETWORKX.get(g.graph_layout, g.graph_layout)
 
-    g.G.node_color = g.node_color = WL_COLOR_TO_MATPLOTLIB.get(color, color)
+    g.G.node_color = g.node_color = WL_COLOR_TO_NETWORKX.get(color, color)
 
     g.G.title = g.title = (
         options["System`PlotLabel"].get_string_value()

pymathics/graph/generators.py

@@ -9,7 +9,7 @@
 
 from pymathics.graph.__main__ import (
     Graph,
-    WL_MARKER_TO_MATPLOTLIB,
+    WL_MARKER_TO_NETWORKX,
     _NetworkXBuiltin,
     _convert_networkx_graph,
     _graph_from_list,
@@ -643,6 +643,17 @@ def apply(self, name, expression, evaluation, options):
         "%(name)s[name_String, OptionsPattern[%(name)s]]"
         py_name = name.get_string_value()
         fn, layout = WL_TO_NETWORKX_FN.get(py_name, (None, None))
+        if not fn:
+            if not py_name.endswith("_graph"):
+                py_name += "_graph"
+            if py_name in ("LCF_graph", "make_small_graph"):
+                # These graphs require parameters
+                return
+            import inspect
+            fn = dict(inspect.getmembers(nx, inspect.isfunction)).get(py_name, None)
+            # parameters = inspect.signature(nx.diamond_graph).parameters.values()
+            # if len([p for p in list(parameters) if p.kind in [inspect.Parameter.POSITIONAL_ONLY, inspect.Parameter.POSITIONAL_OR_KEYWORD]]) != 0:
+            #     return
         if fn:
             g = graph_helper(fn, options, False, layout)
             g.G.name = py_name

pymathics/graph/tree.py

@@ -1,5 +1,5 @@
 import networkx as nx
-from pymathics.graph.__main__ import Graph, _graph_from_list, DEFAULT_GRAPH_OPTIONS, _NetworkXBuiltin, WL_MARKER_TO_MATPLOTLIB
+from pymathics.graph.__main__ import Graph, _graph_from_list, DEFAULT_GRAPH_OPTIONS, _NetworkXBuiltin, WL_MARKER_TO_NETWORKX
 from mathics.core.expression import String, Symbol
 
 DEFAULT_TREE_OPTIONS = {