Tweak VertexLabels and DirectedEdges

Author: rocky

pymathics/graph/__main__.py

@@ -23,13 +23,14 @@
 from inspect import isgenerator
 
 DEFAULT_GRAPH_OPTIONS = {
-    "VertexSize": "{}",
-    "VertexStyle": "{}",
+    "DirectedEdges": "False",
     "EdgeStyle": "{}",
     "EdgeWeight": "{}",
     "GraphLayout": "{}",
-    "VertexLabels": "False",
     "PlotLabel": "Null",
+    "VertexLabels": "False",
+    "VertexSize": "{}",
+    "VertexStyle": "{}",
 }
 
 import networkx as nx
@@ -656,8 +657,8 @@ def full_new_edge_properties(new_edge_style):
         n_undirected=len(undirected_edges),
     )
 
-    G.vertex_labels = options["System`VertexLabels"]
     g = Graph(G)
+    g.vertex_labels = G.vertex_labels = options["System`VertexLabels"]
     G.title = g.title = options["System`PlotLabel"]
     return g
 

pymathics/graph/graph_generators.py

@@ -34,8 +34,8 @@ def graph_helper(
     G.graph_layout = options["System`GraphLayout"].get_string_value() or String(
         graph_layout
     )
-    G.vertex_labels = options["System`VertexLabels"]
     g = Graph(G)
+    G.vertex_labels = g.vertex_labels = options["System`VertexLabels"]
 
     if root is not None:
         G.root = g.root = root

pymathics/graph/tree.py

@@ -4,7 +4,7 @@
 
 DEFAULT_TREE_OPTIONS = {
     **DEFAULT_GRAPH_OPTIONS,
-    **{"DirectedEdges": "False", "GraphLayout": '"tree"'},
+    **{"GraphLayout": '"tree"'},
 }
 
 from mathics.builtin.base import Builtin, AtomBuiltin