Changeset 5340:16943a99d1ba
- Timestamp:
- 06/14/07 03:12:38 (6 years ago)
- Branch:
- default
- Location:
- sage
- Files:
-
- 6 edited
-
graphs/graph.py (modified) (13 diffs)
-
graphs/graph_database.py (modified) (4 diffs)
-
graphs/graph_generators.py (modified) (25 diffs)
-
graphs/graph_isom.pyx (modified) (1 diff)
-
graphs/graph_list.py (modified) (1 diff)
-
plot/plot.py (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
sage/graphs/graph.py
r5339 r5340 21 21 (2007-06-07--09): NetworkX function wrapping 22 22 -- Michael W. Hansen (2007-06-09): Topological sort generation 23 -- Emily Kirkman, Robert L. Miller SAGE Days 4: Finished wrapping NetworkX 23 24 24 25 TUTORIAL: … … 906 907 sage: (graphs.ChvatalGraph()).cliques_get_max_clique_graph() 907 908 Graph on 24 vertices 908 sage.: ((graphs.ChvatalGraph()).cliques_get_max_clique_graph()).show(figsize=[2,2], node_size=20, vertex_labels=False)909 sage.: ((graphs.ChvatalGraph()).cliques_get_max_clique_graph()).show(figsize=[2,2], vertex_size=20, vertex_labels=False) 909 910 sage: D = DiGraph({0:[1,2,3], 1:[2], 3:[0,1]}) 910 911 sage.: D.show(figsize=[2,2]) … … 939 940 sage: (graphs.ChvatalGraph()).cliques_get_clique_bipartite() 940 941 Graph on 36 vertices 941 sage.: ((graphs.ChvatalGraph()).cliques_get_clique_bipartite()).show(figsize=[2,2], node_size=20, vertex_labels=False)942 sage.: ((graphs.ChvatalGraph()).cliques_get_clique_bipartite()).show(figsize=[2,2], vertex_size=20, vertex_labels=False) 942 943 sage: D = DiGraph({0:[1,2,3], 1:[2], 3:[0,1]}) 943 944 sage.: D.show(figsize=[2,2]) … … 2154 2155 2155 2156 def plot(self, pos=None, layout=None, vertex_labels=True, edge_labels=False, 2156 node_size=200, graph_border=False, color_dict=None, partition=None,2157 vertex_size=200, graph_border=False, color_dict=None, partition=None, 2157 2158 edge_colors=None, scaling_term=0.05, xmin=None, xmax=None): # xmin and xmax are ignored 2158 2159 """ … … 2167 2168 edge_labels -- whether to print edge(arc) labels. By default, False, but if True, the result 2168 2169 of str(l) is printed on the edge for each label l. Labels equal to None are not printed. 2169 node_size -- size of vertices displayed2170 vertex_size -- size of vertices displayed 2170 2171 graph_border -- whether to include a box around the graph 2171 2172 color_dict -- optional dictionary to specify vertex colors: each key is a color recognizable … … 2199 2200 2200 2201 sage: C = graphs.CubeGraph(8) 2201 sage: P = C.plot(vertex_labels=False, node_size=0, graph_border=True)2202 sage: P = C.plot(vertex_labels=False, vertex_size=0, graph_border=True) 2202 2203 sage: P.save('sage.png') 2203 2204 … … 2222 2223 ... if u[i] != v[i]: 2223 2224 ... edge_colors[R[i]].append((u,v,l)) 2224 sage: C.plot(vertex_labels=False, node_size=0, edge_colors=edge_colors).save('sage.png')2225 sage: C.plot(vertex_labels=False, vertex_size=0, edge_colors=edge_colors).save('sage.png') 2225 2226 2226 2227 """ … … 2253 2254 for a in range(len(pos[v])): 2254 2255 pos[v][a] = float(pos[v][a]) 2255 G = networkx_plot(self._nxg, pos=pos, vertex_labels=vertex_labels, node_size=node_size, color_dict=color_dict, edge_colors=edge_colors, graph_border=graph_border, scaling_term=scaling_term)2256 G = networkx_plot(self._nxg, pos=pos, vertex_labels=vertex_labels, vertex_size=vertex_size, color_dict=color_dict, edge_colors=edge_colors, graph_border=graph_border, scaling_term=scaling_term) 2256 2257 if edge_labels: 2257 2258 from sage.plot.plot import text … … 2265 2266 return G 2266 2267 2267 def show(self, pos=None, layout=None, vertex_labels=True, edge_labels=False, node_size=200,2268 def show(self, pos=None, layout=None, vertex_labels=True, edge_labels=False, vertex_size=200, 2268 2269 graph_border=False, color_dict=None, edge_colors=None, partition=None, 2269 2270 scaling_term=0.05, talk=False, **kwds): … … 2279 2280 edge_labels -- whether to print edge(arc) labels. By default, False, but if True, the result 2280 2281 of str(l) is printed on the edge for each label l. Labels equal to None are not printed. 2281 node_size -- size of vertices displayed2282 vertex_size -- size of vertices displayed 2282 2283 graph_border -- whether to include a box around the graph 2283 2284 color_dict -- optional dictionary to specify vertex colors: each key is a color recognizable … … 2312 2313 2313 2314 sage: C = graphs.CubeGraph(8) 2314 sage: P = C.plot(vertex_labels=False, node_size=0, graph_border=True)2315 sage: P = C.plot(vertex_labels=False, vertex_size=0, graph_border=True) 2315 2316 sage: P.save('sage.png') 2316 2317 … … 2335 2336 ... if u[i] != v[i]: 2336 2337 ... edge_colors[R[i]].append((u,v,l)) 2337 sage: C.plot(vertex_labels=False, node_size=0, edge_colors=edge_colors).save('sage.png')2338 sage: C.plot(vertex_labels=False, vertex_size=0, edge_colors=edge_colors).save('sage.png') 2338 2339 2339 2340 """ 2340 2341 if talk: 2341 node_size = 5002342 vertex_size = 500 2342 2343 if partition is None: 2343 2344 color_dict = {'#FFFFFF':self.vertices()} 2344 self.plot(pos=pos, layout=layout, vertex_labels=vertex_labels, edge_labels=edge_labels, node_size=node_size, color_dict=color_dict, edge_colors=edge_colors, graph_border=graph_border, partition=partition, scaling_term=scaling_term).show(**kwds)2345 self.plot(pos=pos, layout=layout, vertex_labels=vertex_labels, edge_labels=edge_labels, vertex_size=vertex_size, color_dict=color_dict, edge_colors=edge_colors, graph_border=graph_border, partition=partition, scaling_term=scaling_term).show(**kwds) 2345 2346 2346 2347 class Graph(GenericGraph): … … 4451 4452 sage: SD.set_arc_label(14, 15, 'v_k m.c.r.') 4452 4453 sage: posn = {1:[ 3,-3], 2:[0,2], 3:[0, 13], 4:[3,9], 5:[3,3], 6:[16, 13], 7:[6,1], 8:[6,6], 9:[6,11], 10:[9,1], 11:[10,6], 12:[13,6], 13:[16,2], 14:[10,-6], 15:[0,-10], 16:[14,-6], 17:[16,-10], 18:[6,-4]} 4453 sage: SD.plot(pos=posn, node_size=400, color_dict={'#FFFFFF':range(1,19)}, edge_labels=True).save('search_tree.png')4454 sage: SD.plot(pos=posn, vertex_size=400, color_dict={'#FFFFFF':range(1,19)}, edge_labels=True).save('search_tree.png') 4454 4455 4455 4456 """ -
sage/graphs/graph_database.py
r4713 r5340 460 460 # The following line is time consuming and should not stay: 461 461 graph6list.append(g.graph6_string()) 462 p = g.plot(layout=layout, node_size=30, vertex_labels=False, graph_border=False)462 p = g.plot(layout=layout, vertex_size=30, vertex_labels=False, graph_border=False) 463 463 p.save('%s.png'%i, figsize=[1,1]) 464 464 … … 737 737 # The following line is time consuming and should not stay: 738 738 graph6list.append(g.graph6_string()) 739 p = g.plot(layout=layout, node_size=30, vertex_labels=False, graph_border=False)739 p = g.plot(layout=layout, vertex_size=30, vertex_labels=False, graph_border=False) 740 740 p.save('%s.png'%i, figsize=[1,1]) 741 741 … … 1040 1040 # The following line is time consuming and should not stay: 1041 1041 graph6list.append(g.graph6_string()) 1042 p = g.plot(layout=layout, node_size=30, vertex_labels=False, graph_border=False)1042 p = g.plot(layout=layout, vertex_size=30, vertex_labels=False, graph_border=False) 1043 1043 p.save('%s.png'%i, figsize=[1,1]) 1044 1044 … … 1304 1304 sage: len(g) 1305 1305 1 1306 sage.: g[0].show(layout='circular',figsize=[2,2], node_size=0,graph_border=True)1306 sage.: g[0].show(layout='circular',figsize=[2,2],vertex_size=0,graph_border=True) 1307 1307 sage: g = graphs_query.get_list(degree_sequence=433211) 1308 1308 sage: graphs_list.to_graph6(g) -
sage/graphs/graph_generators.py
r5335 r5340 252 252 ... n = [] 253 253 ... for m in range(3): 254 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))254 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 255 255 ... j.append(n) 256 256 ... … … 341 341 ... n = [] 342 342 ... for m in range(3): 343 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))343 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 344 344 ... j.append(n) 345 345 ... … … 430 430 ... n = [] 431 431 ... for m in range(3): 432 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))432 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 433 433 ... j.append(n) 434 434 ... … … 447 447 ... n = [] 448 448 ... for m in range(3): 449 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))449 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 450 450 ... j.append(n) 451 451 ... … … 714 714 ... n = [] 715 715 ... for m in range(3): 716 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))716 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 717 717 ... j.append(n) 718 718 ... … … 762 762 ... n = [] 763 763 ... for m in range(3): 764 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))764 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 765 765 ... j.append(n) 766 766 ... … … 919 919 ... n = [] 920 920 ... for m in range(3): 921 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))921 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 922 922 ... j.append(n) 923 923 ... … … 936 936 ... n = [] 937 937 ... for m in range(3): 938 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))938 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 939 939 ... j.append(n) 940 940 ... … … 983 983 ... n = [] 984 984 ... for m in range(3): 985 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))985 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 986 986 ... j.append(n) 987 987 ... … … 1001 1001 ... n = [] 1002 1002 ... for m in range(3): 1003 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))1003 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 1004 1004 ... j.append(n) 1005 1005 ... … … 1065 1065 ... n = [] 1066 1066 ... for m in range(2): 1067 ... n.append(g[i + m].plot( node_size=50, vertex_labels=False))1067 ... n.append(g[i + m].plot(vertex_size=50, vertex_labels=False)) 1068 1068 ... j.append(n) 1069 1069 sage: G = sage.plot.plot.GraphicsArray(j) … … 1106 1106 ... n = [] 1107 1107 ... for m in range(3): 1108 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))1108 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 1109 1109 ... j.append(n) 1110 1110 ... … … 1149 1149 ... n = [] 1150 1150 ... for m in range(3): 1151 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))1151 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 1152 1152 ... j.append(n) 1153 1153 ... … … 1193 1193 ... n = [] 1194 1194 ... for m in range(3): 1195 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))1195 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 1196 1196 ... j.append(n) 1197 1197 ... … … 1235 1235 ... n = [] 1236 1236 ... for m in range(3): 1237 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))1237 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 1238 1238 ... j.append(n) 1239 1239 ... … … 1616 1616 ... n = [] 1617 1617 ... for m in range(3): 1618 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))1618 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 1619 1619 ... j.append(n) 1620 1620 ... … … 1634 1634 ... n = [] 1635 1635 ... for m in range(3): 1636 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))1636 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 1637 1637 ... j.append(n) 1638 1638 ... … … 1727 1727 ... n = [] 1728 1728 ... for m in range(3): 1729 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))1729 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 1730 1730 ... j.append(n) 1731 1731 ... … … 1744 1744 ... n = [] 1745 1745 ... for m in range(3): 1746 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))1746 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 1747 1747 ... j.append(n) 1748 1748 ... … … 1795 1795 ... n = [] 1796 1796 ... for m in range(3): 1797 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))1797 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 1798 1798 ... j.append(n) 1799 1799 ... … … 1803 1803 Use the plot options to display larger n-cubes 1804 1804 sage: g = graphs.CubeGraph(9) 1805 sage.: g.show(figsize=[12,12],vertex_labels=False, node_size=20)1805 sage.: g.show(figsize=[12,12],vertex_labels=False, vertex_size=20) 1806 1806 """ 1807 1807 from sage.rings.integer import Integer … … 1980 1980 ... n = [] 1981 1981 ... for m in range(3): 1982 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))1982 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 1983 1983 ... j.append(n) 1984 1984 ... … … 2029 2029 ... n = [] 2030 2030 ... for m in range(3): 2031 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))2031 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 2032 2032 ... j.append(n) 2033 2033 ... … … 2070 2070 ... n = [] 2071 2071 ... for m in range(3): 2072 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))2072 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 2073 2073 ... j.append(n) 2074 2074 ... … … 2106 2106 ... n = [] 2107 2107 ... for m in range(3): 2108 ... n.append(g[3*i + m].plot( node_size=50, vertex_labels=False))2108 ... n.append(g[3*i + m].plot(vertex_size=50, vertex_labels=False)) 2109 2109 ... j.append(n) 2110 2110 ... -
sage/graphs/graph_isom.pyx
r5318 r5340 612 612 sage: SD.set_arc_label(14, 15, 'v_k m.c.r.') 613 613 sage: posn = {1:[ 3,-3], 2:[0,2], 3:[0, 13], 4:[3,9], 5:[3,3], 6:[16, 13], 7:[6,1], 8:[6,6], 9:[6,11], 10:[9,1], 11:[10,6], 12:[13,6], 13:[16,2], 14:[10,-6], 15:[0,-10], 16:[14,-6], 17:[16,-10], 18:[6,-4]} 614 sage: SD.plot(pos=posn, node_size=400, color_dict={'#FFFFFF':range(1,19)}, edge_labels=True).save('search_tree.png')614 sage: SD.plot(pos=posn, vertex_size=400, color_dict={'#FFFFFF':range(1,19)}, edge_labels=True).save('search_tree.png') 615 615 616 616 EXAMPLES: -
sage/graphs/graph_list.py
r5333 r5340 231 231 pos = list[i].__get_pos__() 232 232 if ( pos is None ): 233 plist.append(list[i].plot(layout='circular', node_size=50, vertex_labels=False, graph_border=True))234 else: plist.append(list[i].plot(pos=pos, node_size=50, vertex_labels=False, graph_border=True))233 plist.append(list[i].plot(layout='circular', vertex_size=50, vertex_labels=False, graph_border=True)) 234 else: plist.append(list[i].plot(pos=pos, vertex_size=50, vertex_labels=False, graph_border=True)) 235 235 else: raise TypeError, 'Param list must be a list of SAGE graphs.' 236 236 -
sage/plot/plot.py
r4525 r5340 1318 1318 4: [-1.125 ,-0.50118505,] } 1319 1319 vertex_labels -- determines whether labels for nodes are plotted 1320 node_size -- node size1320 vertex_size -- node size 1321 1321 color_dict -- a dictionary specifying node colors: each key is a color recognized by 1322 1322 matplotlib, and each entry is a list of vertices. … … 1373 1373 ... if u[i] != v[i]: 1374 1374 ... edge_colors[R[i]].append((u,v,l)) 1375 sage: NGP = GraphicPrimitive_NetworkXGraph(G, pos=pos, vertex_labels=False, node_size=0, edge_colors=edge_colors)1375 sage: NGP = GraphicPrimitive_NetworkXGraph(G, pos=pos, vertex_labels=False, vertex_size=0, edge_colors=edge_colors) 1376 1376 sage: G = Graphics() 1377 1377 sage: G.append(NGP) … … 1380 1380 sage: G.save('sage.png') 1381 1381 """ 1382 def __init__(self, graph, pos=None, vertex_labels=True, node_size=300, color_dict=None, edge_colors=None, scaling_term=0.05):1382 def __init__(self, graph, pos=None, vertex_labels=True, vertex_size=300, color_dict=None, edge_colors=None, scaling_term=0.05): 1383 1383 self.__nxg = graph 1384 self.__ node_size = node_size1384 self.__vertex_size = vertex_size 1385 1385 self.__vertex_labels = vertex_labels 1386 1386 self.__color_dict = color_dict … … 1439 1439 if len(self.__nxg) != 0: 1440 1440 import networkx as NX 1441 node_size = float(self.__node_size)1441 vertex_size = float(self.__vertex_size) 1442 1442 if self.__color_dict is None: 1443 NX.draw_networkx_nodes(G=self.__nxg, pos=self.__pos, ax=subplot, node_size= node_size)1443 NX.draw_networkx_nodes(G=self.__nxg, pos=self.__pos, ax=subplot, node_size=vertex_size) 1444 1444 else: 1445 1445 for i in self.__color_dict: 1446 NX.draw_networkx_nodes(G=self.__nxg, nodelist=self.__color_dict[i], node_color=i, pos=self.__pos, ax=subplot, node_size= node_size)1446 NX.draw_networkx_nodes(G=self.__nxg, nodelist=self.__color_dict[i], node_color=i, pos=self.__pos, ax=subplot, node_size=vertex_size) 1447 1447 if self.__edge_colors is None: 1448 NX.draw_networkx_edges(G=self.__nxg, pos=self.__pos, ax=subplot, node_size= node_size)1448 NX.draw_networkx_edges(G=self.__nxg, pos=self.__pos, ax=subplot, node_size=vertex_size) 1449 1449 else: 1450 1450 for i in self.__edge_colors: 1451 NX.draw_networkx_edges(G=self.__nxg, pos=self.__pos, edgelist=self.__edge_colors[i], edge_color=i, ax=subplot, node_size= node_size)1451 NX.draw_networkx_edges(G=self.__nxg, pos=self.__pos, edgelist=self.__edge_colors[i], edge_color=i, ax=subplot, node_size=vertex_size) 1452 1452 if self.__vertex_labels: 1453 1453 labels = {} … … 2549 2549 return P 2550 2550 2551 def networkx_plot(graph, pos=None, vertex_labels=True, node_size=300, color_dict=None,2551 def networkx_plot(graph, pos=None, vertex_labels=True, vertex_size=300, color_dict=None, 2552 2552 edge_colors=None, graph_border=False, scaling_term=0.05): 2553 2553 """ … … 2564 2564 4: [-1.125 ,-0.50118505,] } 2565 2565 vertex_labels -- determines whether labels for nodes are plotted 2566 node_size -- node size2566 vertex_size -- node size 2567 2567 color_dict -- a dictionary specifying node colors: each key is a color recognized by 2568 2568 matplotlib, and each entry is a list of vertices. … … 2607 2607 ... if u[i] != v[i]: 2608 2608 ... edge_colors[R[i]].append((u,v,l)) 2609 sage: P = networkx_plot(C._nxg, pos=C.__get_pos__(), edge_colors=edge_colors, vertex_labels=False, node_size=0)2609 sage: P = networkx_plot(C._nxg, pos=C.__get_pos__(), edge_colors=edge_colors, vertex_labels=False, vertex_size=0) 2610 2610 sage: P.save('sage.png') 2611 2611 """ 2612 2612 g = Graphics() 2613 NGP = GraphicPrimitive_NetworkXGraph(graph, pos=pos, vertex_labels=vertex_labels, node_size=node_size, color_dict=color_dict, edge_colors=edge_colors, scaling_term=scaling_term)2613 NGP = GraphicPrimitive_NetworkXGraph(graph, pos=pos, vertex_labels=vertex_labels, vertex_size=vertex_size, color_dict=color_dict, edge_colors=edge_colors, scaling_term=scaling_term) 2614 2614 g.append(NGP) 2615 2615 xmin = NGP._xmin
Note: See TracChangeset
for help on using the changeset viewer.
