@@ -908,7 +908,7 @@ def digraph(self, subset=None, index_set=None):
908
908
child = x .f (i )
909
909
if child is None or child not in subset :
910
910
continue
911
- d [x ][child ]= i
911
+ d [x ][child ] = i
912
912
G = DiGraph (d )
913
913
from sage .graphs .dot2tex_utils import have_dot2tex
914
914
if have_dot2tex ():
@@ -1057,12 +1057,12 @@ def metapost(self, filename, thicklines=False, labels=True, scaling_factor=1.0,
1057
1057
c2 = int (35 * tallness * scaling_factor )
1058
1058
c3 = int (12 * scaling_factor )
1059
1059
c4 = int (- 12 * scaling_factor )
1060
- outstring = "verbatimtex\n \\ magnification=600\n etex\n \n beginfig(-1);\n sx:=35; sy:=30;\n \n z1000=(%d,0);\n z1001=(%d,%d);\n z1002=(%d,%d);\n z2001=(-3,3);\n z2002=(3,3);\n z2003=(0,-3);\n z2004=(7,0);\n z2005=(0,7);\n z2006=(-7,0);\n z2007=(0,7);\n \n " % (c0 ,c1 ,c2 ,c3 ,c4 )
1060
+ outstring = "verbatimtex\n \\ magnification=600\n etex\n \n beginfig(-1);\n sx:=35; sy:=30;\n \n z1000=(%d,0);\n z1001=(%d,%d);\n z1002=(%d,%d);\n z2001=(-3,3);\n z2002=(3,3);\n z2003=(0,-3);\n z2004=(7,0);\n z2005=(0,7);\n z2006=(-7,0);\n z2007=(0,7);\n \n " % (c0 ,c1 ,c2 ,c3 ,c4 )
1061
1061
else :
1062
1062
if labels :
1063
- outstring = "verbatimtex\n \\ magnification=600\n etex\n \n beginfig(-1);\n \n sx := %d;\n sy=%d;\n \n z1000=(2*sx,0);\n z1001=(-sx,sy);\n z1002=(-16,-10);\n \n z2001=(0,-3);\n z2002=(-5,3);\n z2003=(0,3);\n z2004=(5,3);\n z2005=(10,1);\n z2006=(0,10);\n z2007=(-10,1);\n z2008=(0,-8);\n \n " % (int (scaling_factor * 40 ),int (tallness * scaling_factor * 40 ))
1063
+ outstring = "verbatimtex\n \\ magnification=600\n etex\n \n beginfig(-1);\n \n sx := %d;\n sy=%d;\n \n z1000=(2*sx,0);\n z1001=(-sx,sy);\n z1002=(-16,-10);\n \n z2001=(0,-3);\n z2002=(-5,3);\n z2003=(0,3);\n z2004=(5,3);\n z2005=(10,1);\n z2006=(0,10);\n z2007=(-10,1);\n z2008=(0,-8);\n \n " % (int (scaling_factor * 40 ),int (tallness * scaling_factor * 40 ))
1064
1064
else :
1065
- outstring = "beginfig(-1);\n \n sx := %d;\n sy := %d;\n \n z1000=(2*sx,0);\n z1001=(-sx,sy);\n z1002=(-5,-5);\n \n z1003=(10,10);\n \n " % (int (scaling_factor * 35 ),int (tallness * scaling_factor * 35 ))
1065
+ outstring = "beginfig(-1);\n \n sx := %d;\n sy := %d;\n \n z1000=(2*sx,0);\n z1001=(-sx,sy);\n z1002=(-5,-5);\n \n z1003=(10,10);\n \n " % (int (scaling_factor * 35 ),int (tallness * scaling_factor * 35 ))
1066
1066
for i in range (size ):
1067
1067
if self .cartan_type ()[0 ] == 'A' :
1068
1068
[a1 ,a2 ,a3 ] = string_data [i ]
@@ -1079,12 +1079,12 @@ def metapost(self, filename, thicklines=False, labels=True, scaling_factor=1.0,
1079
1079
if b1 + b3 == a1 + a3 and b2 + b4 == a2 + a4 :
1080
1080
shift += 1
1081
1081
if self .cartan_type ()[0 ] == 'A' :
1082
- outstring = outstring + "z%d=%d*z1000+%d*z1001+%d*z1002;\n " % (i ,a1 + a3 ,a2 ,shift )
1082
+ outstring = outstring + "z%d=%d*z1000+%d*z1001+%d*z1002;\n " % (i ,a1 + a3 ,a2 ,shift )
1083
1083
else :
1084
- outstring = outstring + "z%d=%d*z1000+%d*z1001+%d*z1002;\n " % (i ,a1 + a3 ,a2 + a4 ,shift )
1084
+ outstring = outstring + "z%d=%d*z1000+%d*z1001+%d*z1002;\n " % (i ,a1 + a3 ,a2 + a4 ,shift )
1085
1085
outstring = outstring + "\n "
1086
1086
if thicklines :
1087
- outstring = outstring + "pickup pencircle scaled 2\n \n "
1087
+ outstring = outstring + "pickup pencircle scaled 2\n \n "
1088
1088
for i in range (size ):
1089
1089
for j in range (1 ,3 ):
1090
1090
dest = self .list ()[i ].f (j )
@@ -1096,19 +1096,19 @@ def metapost(self, filename, thicklines=False, labels=True, scaling_factor=1.0,
1096
1096
col = "green; "
1097
1097
if self .cartan_type ()[0 ] == 'A' :
1098
1098
[a1 ,a2 ,a3 ] = string_data [i ] # included to facilitate hand editing of the .mp file
1099
- outstring = outstring + "draw z%d--z%d withcolor %s %% %d %d %d\n " % (i ,dest ,col ,a1 ,a2 ,a3 )
1099
+ outstring = outstring + "draw z%d--z%d withcolor %s %% %d %d %d\n " % (i ,dest ,col ,a1 ,a2 ,a3 )
1100
1100
else :
1101
1101
[a1 ,a2 ,a3 ,a4 ] = string_data [i ]
1102
- outstring = outstring + "draw z%d--z%d withcolor %s %% %d %d %d %d\n " % (i ,dest ,col ,a1 ,a2 ,a3 ,a4 )
1102
+ outstring = outstring + "draw z%d--z%d withcolor %s %% %d %d %d %d\n " % (i ,dest ,col ,a1 ,a2 ,a3 ,a4 )
1103
1103
outstring += "\n pickup pencircle scaled 3;\n \n "
1104
1104
for i in range (self .cardinality ()):
1105
1105
if labels :
1106
1106
if self .cartan_type ()[0 ] == 'A' :
1107
- outstring = outstring + "pickup pencircle scaled 15;\n fill z%d+z2004..z%d+z2006..z%d+z2006..z%d+z2007..cycle withcolor white;\n label(btex %d etex, z%d+z2001);\n label(btex %d etex, z%d+z2002);\n label(btex %d etex, z%d+z2003);\n pickup pencircle scaled .5;\n draw z%d+z2004..z%d+z2006..z%d+z2006..z%d+z2007..cycle;\n " % (i ,i ,i ,i ,string_data [i ][2 ],i ,string_data [i ][1 ],i ,string_data [i ][0 ],i ,i ,i ,i ,i )
1107
+ outstring = outstring + "pickup pencircle scaled 15;\n fill z%d+z2004..z%d+z2006..z%d+z2006..z%d+z2007..cycle withcolor white;\n label(btex %d etex, z%d+z2001);\n label(btex %d etex, z%d+z2002);\n label(btex %d etex, z%d+z2003);\n pickup pencircle scaled .5;\n draw z%d+z2004..z%d+z2006..z%d+z2006..z%d+z2007..cycle;\n " % (i ,i ,i ,i ,string_data [i ][2 ],i ,string_data [i ][1 ],i ,string_data [i ][0 ],i ,i ,i ,i ,i )
1108
1108
else :
1109
- outstring = outstring + "%%%d %d %d %d\n pickup pencircle scaled 1;\n fill z%d+z2005..z%d+z2006..z%d+z2007..z%d+z2008..cycle withcolor white;\n label(btex %d etex, z%d+z2001);\n label(btex %d etex, z%d+z2002);\n label(btex %d etex, z%d+z2003);\n label(btex %d etex, z%d+z2004);\n pickup pencircle scaled .5;\n draw z%d+z2005..z%d+z2006..z%d+z2007..z%d+z2008..cycle;\n \n " % (string_data [i ][0 ],string_data [i ][1 ],string_data [i ][2 ],string_data [i ][3 ],i ,i ,i ,i ,string_data [i ][0 ],i ,string_data [i ][1 ],i ,string_data [i ][2 ],i ,string_data [i ][3 ],i ,i ,i ,i ,i )
1109
+ outstring = outstring + "%%%d %d %d %d\n pickup pencircle scaled 1;\n fill z%d+z2005..z%d+z2006..z%d+z2007..z%d+z2008..cycle withcolor white;\n label(btex %d etex, z%d+z2001);\n label(btex %d etex, z%d+z2002);\n label(btex %d etex, z%d+z2003);\n label(btex %d etex, z%d+z2004);\n pickup pencircle scaled .5;\n draw z%d+z2005..z%d+z2006..z%d+z2007..z%d+z2008..cycle;\n \n " % (string_data [i ][0 ],string_data [i ][1 ],string_data [i ][2 ],string_data [i ][3 ],i ,i ,i ,i ,string_data [i ][0 ],i ,string_data [i ][1 ],i ,string_data [i ][2 ],i ,string_data [i ][3 ],i ,i ,i ,i ,i )
1110
1110
else :
1111
- outstring += "drawdot z%d;\n " % i
1111
+ outstring += "drawdot z%d;\n " % i
1112
1112
outstring += "\n endfig;\n \n end;\n \n "
1113
1113
1114
1114
f = open (filename , 'w' )
@@ -1153,8 +1153,8 @@ def dot_tex(self):
1153
1153
else :
1154
1154
option = ""
1155
1155
(source , target ) = (x , child )
1156
- result += " " + vertex_key (source ) + " -> " + vertex_key (target )+ " [ " + option + "label = \" \" , texlbl = \" " + quoted_latex (i )+ "\" ];\n "
1157
- result += "}"
1156
+ result += " " + vertex_key (source ) + " -> " + vertex_key (target ) + " [ " + option + "label = \" \" , texlbl = \" " + quoted_latex (i )+ "\" ];\n "
1157
+ result += "}"
1158
1158
return result
1159
1159
1160
1160
def plot (self , ** options ):
0 commit comments