Changeset 7775:630e737e0546

Timestamp:

12/15/07 11:40:10 (5 years ago)

Author:

R. L. Miller <rlmillster@…>

Branch:

default

Message:

important bug fix for codes and graphs

Location:

sage

Files:

• coding/binary_code.pyx (modified) (7 diffs)
• graphs/graph_generators.py (modified) (1 diff)
• graphs/graph_isom.pyx (modified) (2 diffs)

sage/coding/binary_code.pyx

@@ -1766 +1766 @@
             1
             sage: P._refine(3, [[0,1]], B)
-            558
+            583
             sage: P._split_vertex(2, 4)
             2
             sage: P._refine(4, [[0,2]], B)
-            1713
+            1754
             sage: P._split_vertex(3, 5)
             3
@@ -1848 +1848 @@
                         r = j
                         while True:
-                            if r == 0 or self.col_lvls[r-1] == k:
+                            if r == j or self.col_lvls[r-1] == k:
                                 if r != t:
                                     alpha[alpha_length] = r
@@ -1888 +1888 @@
                         r = j
                         while True:
-                            if r == 0 or self.wd_lvls[r-1] == k:
+                            if r == j or self.wd_lvls[r-1] == k:
                                 if r != t_w:
                                     alpha[alpha_length] = r^flag
@@ -1967 +1967 @@
             1
             sage: P._refine(2, [[0,1]], B)
-            558
+            583
             sage: P._split_vertex(2, 3)
             2
             sage: P._refine(3, [[0,2]], B)
-            1713
+            1754
             sage: P._split_vertex(4, 4)
             4
@@ -2102 +2102 @@
             1
             sage: P._refine(2, [[0,1]], B)
-            558
+            583
             sage: P._split_vertex(2, 3)
             2
             sage: P._refine(3, [[0,2]], B)
-            1713
+            1754
             sage: P._split_vertex(4, 4)
             4
@@ -2245 +2245 @@
         
         EXAMPLES:
+            sage: import sage.coding.binary_code
+            sage: from sage.coding.binary_code import *
+            sage: BC = BinaryCodeClassifier()
+
             sage: M = Matrix(GF(2),[\
             ... [1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],\
@@ -2251 +2255 @@
             ... [0,0,1,1,0,0,1,1,0,0,1,1,0,0,1,1],\
             ... [0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1]])
-            sage: import sage.coding.binary_code
-            sage: from sage.coding.binary_code import *
             sage: B = BinaryCode(M)
-            sage: BC = BinaryCodeClassifier()
             sage: gens, labeling = BC._aut_gp_and_can_label(B)
-            sage: S = SymmetricGroup(16)
+            sage: S = SymmetricGroup(M.ncols())
             sage: L = [S([x+1 for x in g]) for g in gens]
             sage: PermutationGroup(L).order()
             322560
+
+            sage: M = Matrix(GF(2),[\
+            ... [1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0],\
+            ... [0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0],\
+            ... [0,0,0,0,0,1,0,1,0,0,0,1,1,1,1,1,1],\
+            ... [0,0,0,1,1,0,0,0,0,1,1,0,1,1,0,1,1]])
+            sage: B = BinaryCode(M)
+            sage: gens, labeling = BC._aut_gp_and_can_label(B)
+            sage: S = SymmetricGroup(M.ncols())
+            sage: L = [S([x+1 for x in g]) for g in gens]
+            sage: PermutationGroup(L).order()
+            2304
 
         """

sage/graphs/graph_generators.py

@@ -2733 +2733 @@
             sage: L = list( graphs(8, lambda G: G.is_bipartite()) )
             sage: len(L)
-            142
+            143
         
         Sloane A000088:

sage/graphs/graph_isom.pyx

@@ -581 +581 @@
                     r = j
                     while True:
-                        if r == 0 or self.levels[r-1] == k:
+                        if r == j or self.levels[r-1] == k:
                             if r != t:
                                 alpha[s] = r
@@ -625 +625 @@
                     r = j
                     while True:
-                        if r == 0 or self.levels[r-1] == k:
+                        if r == j or self.levels[r-1] == k:
                             if r != t:
                                 alpha[s] = r