# HG changeset patch
# User Nathann Cohen <nathann.cohen@gmail.com>
# Date 1364034315 -3600
# Node ID 0996caa09bb4446bab9272984cabc14d9a47c01a
# Parent 9ba68ffc259df41d694855a2646c6db8c56a40f5
Renames permgroup_element.list() to domain()
diff --git a/sage/graphs/generic_graph.py b/sage/graphs/generic_graph.py
a
|
b
|
|
15919 | 15919 | |
15920 | 15920 | Relabeling using a Sage permutation:: |
15921 | 15921 | |
| 15922 | sage: G = graphs.PathGraph(3) |
15922 | 15923 | sage: from sage.groups.perm_gps.permgroup_named import SymmetricGroup |
15923 | 15924 | sage: S = SymmetricGroup(3) |
15924 | 15925 | sage: gamma = S('(1,2)') |
… |
… |
|
16051 | 16052 | elif isinstance(perm, PermutationGroupElement): |
16052 | 16053 | n = self.order() |
16053 | 16054 | ddict = {} |
16054 | | llist = perm.list() |
16055 | 16055 | for i in xrange(1,n): |
16056 | | ddict[i] = llist[i-1]%n |
| 16056 | ddict[i] = perm(i)%n |
16057 | 16057 | if n > 0: |
16058 | | ddict[0] = llist[n-1]%n |
| 16058 | ddict[0] = perm(n)%n |
16059 | 16059 | perm = ddict |
16060 | 16060 | |
16061 | 16061 | elif callable(perm): |
diff --git a/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pyx b/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pyx
a
|
b
|
|
224 | 224 | sage: gens = [[1,2,3,0]] |
225 | 225 | sage: reps = [] |
226 | 226 | sage: for p in SymmetricGroup(4): |
227 | | ... p = [a-1 for a in p.list()] |
| 227 | ... p = [p(i)-1 for i in range(1,5)] |
228 | 228 | ... r = coset_rep(p, gens) |
229 | 229 | ... if r not in reps: |
230 | 230 | ... reps.append(r) |
… |
… |
|
233 | 233 | sage: gens = [[1,0,2,3],[0,1,3,2]] |
234 | 234 | sage: reps = [] |
235 | 235 | sage: for p in SymmetricGroup(4): |
236 | | ... p = [a-1 for a in p.list()] |
| 236 | ... p = [p(i)-1 for i in range(1,5)] |
237 | 237 | ... r = coset_rep(p, gens) |
238 | 238 | ... if r not in reps: |
239 | 239 | ... reps.append(r) |
… |
… |
|
242 | 242 | sage: gens = [[1,2,0,3]] |
243 | 243 | sage: reps = [] |
244 | 244 | sage: for p in SymmetricGroup(4): |
245 | | ... p = [a-1 for a in p.list()] |
| 245 | ... p = [p(i)-1 for i in range(1,5)] |
246 | 246 | ... r = coset_rep(p, gens) |
247 | 247 | ... if r not in reps: |
248 | 248 | ... reps.append(r) |
diff --git a/sage/groups/perm_gps/partn_ref/data_structures_pyx.pxi b/sage/groups/perm_gps/partn_ref/data_structures_pyx.pxi
a
|
b
|
|
1803 | 1803 | raise AssertionError |
1804 | 1804 | if test_contains: |
1805 | 1805 | for i from 0 <= i < 3: |
1806 | | permy = G.random_element().list() |
| 1806 | permy = G.random_element() |
1807 | 1807 | for j from 0 <= j < n: |
1808 | | perm[j] = permy[j]-1 |
| 1808 | perm[j] = permy(j+1)-1 |
1809 | 1809 | if not SC_contains(SC, 0, perm, 0): |
1810 | 1810 | print "FAIL", L |
1811 | 1811 | print 'element', permy |
diff --git a/sage/groups/perm_gps/partn_ref/double_coset.pyx b/sage/groups/perm_gps/partn_ref/double_coset.pyx
a
|
b
|
|
128 | 128 | sage: gens = [[1,2,3,0]] |
129 | 129 | sage: reps = [[0,1,2,3]] |
130 | 130 | sage: for p in SymmetricGroup(4): |
131 | | ... p = [a-1 for a in p.list()] |
| 131 | ... p = [p(i)-1 for i in range(1,5)] |
132 | 132 | ... found = False |
133 | 133 | ... for r in reps: |
134 | 134 | ... if coset_eq(p, r, gens): |
… |
… |
|
141 | 141 | sage: gens = [[1,0,2,3],[0,1,3,2]] |
142 | 142 | sage: reps = [[0,1,2,3]] |
143 | 143 | sage: for p in SymmetricGroup(4): |
144 | | ... p = [a-1 for a in p.list()] |
| 144 | ... p = [p(i)-1 for i in range(1,5)] |
145 | 145 | ... found = False |
146 | 146 | ... for r in reps: |
147 | 147 | ... if coset_eq(p, r, gens): |
… |
… |
|
154 | 154 | sage: gens = [[1,2,0,3]] |
155 | 155 | sage: reps = [[0,1,2,3]] |
156 | 156 | sage: for p in SymmetricGroup(4): |
157 | | ... p = [a-1 for a in p.list()] |
| 157 | ... p = [p(i)-1 for i in range(1,5)] |
158 | 158 | ... found = False |
159 | 159 | ... for r in reps: |
160 | 160 | ... if coset_eq(p, r, gens): |
diff --git a/sage/groups/perm_gps/partn_ref/refinement_graphs.pyx b/sage/groups/perm_gps/partn_ref/refinement_graphs.pyx
a
|
b
|
|
901 | 901 | seen[i] = 1 |
902 | 902 | return partition |
903 | 903 | else: |
904 | | n = len(gamma.list()) |
| 904 | n = len(gamma.domain()) |
905 | 905 | l = [] |
906 | 906 | for i in range(1,n+1): |
907 | 907 | orb = gamma.orbit(i) |
diff --git a/sage/groups/perm_gps/permgroup_element.pxd b/sage/groups/perm_gps/permgroup_element.pxd
a
|
b
|
|
10 | 10 | cdef __tuple |
11 | 11 | cdef PermutationGroupElement _new_c(self) |
12 | 12 | cpdef _gap_list(self) |
13 | | cpdef list(self) |
| 13 | cpdef domain(self) |
14 | 14 | cdef public __custom_name |
15 | 15 | cpdef list _act_on_list_on_position(self, list x) |
16 | 16 | cpdef ClonableIntArray _act_on_array_on_position(self, ClonableIntArray x) |
diff --git a/sage/groups/perm_gps/permgroup_element.pyx b/sage/groups/perm_gps/permgroup_element.pyx
a
|
b
|
|
67 | 67 | from sage.interfaces.all import gap, is_GapElement, is_ExpectElement |
68 | 68 | from sage.sets.finite_enumerated_set import FiniteEnumeratedSet |
69 | 69 | import sage.structure.coerce as coerce |
| 70 | from sage.misc.superseded import deprecated_function_alias |
70 | 71 | |
71 | 72 | import operator |
72 | 73 | |
… |
… |
|
497 | 498 | sage: func(*args) |
498 | 499 | (1,2,3)(4,5) |
499 | 500 | """ |
500 | | return make_permgroup_element_v2, (self._parent, self.list(), self._parent.domain()) |
| 501 | return make_permgroup_element_v2, (self._parent, self.domain(), self._parent.domain()) |
501 | 502 | |
502 | 503 | cdef PermutationGroupElement _new_c(self): |
503 | 504 | cdef PermutationGroupElement other = PY_NEW_SAME_TYPE(self) |
… |
… |
|
917 | 918 | from sage.combinat.permutation import Permutation |
918 | 919 | return Permutation(self._gap_list()).cycle_string() |
919 | 920 | |
920 | | cpdef list(self): |
| 921 | list = deprecated_function_alias(14319, domain) |
| 922 | |
| 923 | cpdef domain(self): |
921 | 924 | """ |
922 | | Returns list of the images of the integers from 1 to n under this |
923 | | permutation as a list of Python ints. |
924 | | |
| 925 | Returns the domain of self. |
| 926 | |
925 | 927 | EXAMPLES:: |
926 | | |
| 928 | |
927 | 929 | sage: G = SymmetricGroup(4) |
928 | 930 | sage: x = G([2,1,4,3]); x |
929 | 931 | (1,2)(3,4) |
930 | | sage: v = x.list(); v |
| 932 | sage: v = x.domain(); v |
931 | 933 | [2, 1, 4, 3] |
932 | 934 | sage: type(v[0]) |
933 | 935 | <type 'int'> |
934 | 936 | sage: x = G([2,1]); x |
935 | 937 | (1,2) |
936 | | sage: x.list() |
| 938 | sage: x.domain() |
937 | 939 | [2, 1, 3, 4] |
938 | 940 | |
939 | 941 | TESTS:: |
… |
… |
|
941 | 943 | sage: S = SymmetricGroup(0) |
942 | 944 | sage: x = S.one(); x |
943 | 945 | () |
944 | | sage: x.list() |
| 946 | sage: x.domain() |
945 | 947 | [] |
946 | 948 | """ |
947 | 949 | cdef int i |
… |
… |
|
991 | 993 | ('b', 'a') |
992 | 994 | """ |
993 | 995 | if self.__tuple is None: |
994 | | self.__tuple = tuple(self.list()) |
| 996 | self.__tuple = tuple(self.domain()) |
995 | 997 | return self.__tuple |
996 | 998 | |
997 | 999 | def dict(self): |