Changeset 5710:20c50f991598

Timestamp:

08/12/07 12:01:55 (6 years ago)

Author:

Bobby Moretti <moretti@…>

Branch:

default

Message:

Made 3d colored plotting work, thanks to Robert's help

Location:

sage

Files:

• graphs/graph.py (modified) (13 diffs)
• groups/group.pyx (modified) (1 diff)

sage/graphs/graph.py

@@ -24 +24 @@
     -- Emily Kirkman (2007-07-21): Genus (including circular planar, all
         embeddings and all planar embeddings), all paths, interior paths
+    -- Bobby Moretti (2007-08-12): fixed up plotting of graphs with
+       edge colors differentiated by label
 
 TUTORIAL:
@@ -2163 +2165 @@
 
     ### Visualization
+    def _color_by_label(self, format='hex'):
+        """
+        Logic for coloring by label (factored out from plot() for use
+        in 3d plots, etc)
+        """
+        from sage.plot.plot import rainbow
+        edge_labels = []
+        if self.is_directed():
+            iterator = self.arc_iterator
+        else:
+            iterator = self.edge_iterator
+        for e in iterator():
+            i = 0
+            while i < len(edge_labels):
+                if not edge_labels[i][0][2] == e[2]:
+                    i += 1
+                else:
+                    edge_labels[i].append(e)
+                    break
+            if i == len(edge_labels):
+                edge_labels.append([e])
+        num_labels = len(edge_labels)
+        r = rainbow(num_labels, format=format)
+        edge_colors = {}
+        for i in range(num_labels):
+            edge_colors[r[i]] = edge_labels[i]
+        return edge_colors     
 
     def plot(self, pos=None, layout=None, vertex_labels=True,\
@@ -2243 +2272 @@
 
         """
-        from sage.plot.plot import networkx_plot, rainbow
+        from sage.plot.plot import networkx_plot
         import networkx
         if vertex_colors is None:
@@ -2295 +2324 @@
 
         if color_by_label:
-            edge_labels = []
-            if self.is_directed():
-                iterator = self.arc_iterator
-            else:
-                iterator = self.edge_iterator
-            for e in iterator():
-                i = 0
-                while i < len(edge_labels):
-                    if not edge_labels[i][0][2] == e[2]:
-                        i += 1
-                    else:
-                        edge_labels[i].append(e)
-                        break
-                if i == len(edge_labels):
-                    edge_labels.append([e])
-            num_labels = len(edge_labels)
-            R = rainbow(num_labels)
-            edge_colors = {}
-            for i in range(num_labels):
-                edge_colors[R[i]] = edge_labels[i]
-                
+            edge_colors = self._color_by_label()
+        
         G = networkx_plot(self._nxg, pos=pos, vertex_labels=vertex_labels, vertex_size=vertex_size, vertex_colors=vertex_colors, edge_colors=edge_colors, graph_border=graph_border, scaling_term=scaling_term)
         if edge_labels:
@@ -3988 +3998 @@
                vertex_colors=None, vertex_size=0.06,
                edge_colors=None, edge_size=0.02,
-               pos3d=None, iterations=50, **kwds):
+               pos3d=None, iterations=50, color_by_label=False, **kwds):
         """
         Plots the graph using Tachyon, and returns a Tachyon object containing
@@ -4030 +4040 @@
                                         vertex_size=vertex_size, pos3d=pos3d, iterations=iterations, **kwds)
         edges = self.edges()
+
+        if color_by_label:
+            if edge_colors is  None:
+                # do the coloring
+                edge_colors = self._color_by_label(format='rgbtuple')
+
         if edge_colors is None:
             edge_colors = { (0,0,0) : edges }
 
         i = 0
+                        
         for color in edge_colors:
             i += 1
@@ -4039 +4056 @@
             for u, v, l in edge_colors[color]:
                 TT.fcylinder( (pos3d[u][0],pos3d[u][1],pos3d[u][2]), (pos3d[v][0],pos3d[v][1],pos3d[v][2]), edge_size,'edge_color_%d'%i)
+        
         return TT
 
@@ -4044 +4062 @@
                vertex_colors=None, vertex_size=0.06,
                edge_colors=None, edge_size=0.02,
-               pos3d=None, iterations=50, **kwds):
+               pos3d=None, iterations=50, color_by_label=False, **kwds):
         """
         Plots the graph using Tachyon, and shows the resulting plot.
@@ -4082 +4100 @@
 
         """
-        self.plot3d(bgcolor=bgcolor, vertex_colors=vertex_colors, edge_colors=edge_colors, vertex_size=vertex_size, edge_size=edge_size, iterations=iterations).show(**kwds)
+        self.plot3d(bgcolor=bgcolor, vertex_colors=vertex_colors,
+                    edge_colors=edge_colors, vertex_size=vertex_size,
+                    edge_size=edge_size, iterations=iterations,
+                    color_by_label=color_by_label).show(**kwds)
     
     ### Connected components
@@ -5310 +5331 @@
                arc_size=0.02,
                arc_size2=0.0325,
-               arc_colors=None, pos3d=None, **kwds):
+               arc_colors=None, pos3d=None,
+               color_by_label=False, **kwds):
         """
         Plots the graph using Tachyon, and returns a Tachyon object containing
@@ -5353 +5375 @@
                                         vertex_size=vertex_size, pos3d=pos3d, **kwds)
         arcs = self.arcs()
+        i = 0
+
+        if color_by_label:
+            if arc_colors is None:
+                arc_colors = self._color_by_label(format='rgbtuple')
+
         if arc_colors is None:
             arc_colors = { (0,0,0) : arcs }
         
-        i = 0
         for color in arc_colors:
             i += 1
@@ -5373 +5400 @@
                arc_size=0.02,
                arc_size2=0.0325,
-               arc_colors=None, pos3d=None, **kwds):
+               arc_colors=None,
+               pos3d=None, color_by_label=False, **kwds):
         """
         Plots the graph using Tachyon, and shows the resulting plot.
@@ -5412 +5440 @@
 
         """
-        self.plot3d(bgcolor=bgcolor, vertex_colors=vertex_colors, vertex_size=vertex_size, arc_size=arc_size, arc_size2=arc_size2, arc_colors=arc_colors, **kwds).show()
+        
+        self.plot3d(bgcolor=bgcolor, vertex_colors=vertex_colors,
+                    vertex_size=vertex_size, arc_size=arc_size,
+                    arc_size2=arc_size2, arc_colors=arc_colors,
+                    color_by_label=color_by_label, **kwds).show()
 
     ### Connected components

sage/groups/group.pyx

@@ -128 +128 @@
         return True
 
-    def cayley_graph(self, label=False):
+    def cayley_graph(self):
         """
-        Computes the cayley graph 
+        Returns the cayley graph for this finite group, as a SAGE
+        DiGraph object. To plot the graph with with different colors
+
+        EXAMPLES:
+            sage: D4 = DihedralGroup(4); D4
+            Dihedral group of order 8 as a permutation group
+            sage: show(D4.cayley_graph(), color_by_label=True, edge_labels=True)
+        
+            sage: A5 = AlternatingGroup(5); A5
+            Alternating group of order 5!/2 as a permutation group
+            sage: G = A5.cayley_graph()
+            sage: G.show3d(color_by_label=True, arc_size=0.01, arc_size2=0.02, vertex_size=0.03)
+            sage: G.show3d(vertex_size=0.03, arc_size=0.01, arc_size2=0.02, vertex_colors={(1,1,1):x.vertices()}, bgcolor=(0,0,0), color_by_label=True, xres=700, yres=700, iterations=200) # long time
+
+        AUTHOR:
+            -- (2007-08-10) Bobby Moretti
         """
         from sage.graphs.graph import DiGraph