more fixes for E228 and E225 in combinat and some other folders

Author: fchapoton

src/sage/combinat/affine_permutation.py

@@ -394,7 +394,7 @@ def grassmannian_quotient(self, i=0, side='right'):
         while not (D == [i] or D == []):
             m = D[0]
             if m == i:
-                m=D[1]
+                m = D[1]
             if side == 'right':
                 fin = fin.apply_simple_reflection(m, side='left')
                 gr = gr.apply_simple_reflection(m, side='right')
@@ -470,7 +470,7 @@ def value(self, i, base_window=False):
         if base_window:
             self[i-1]
         window = (i-1) // (self.k+1)
-        return self[(i-1)%(self.k+1)] + window*(self.k+1)
+        return self[(i-1) % (self.k+1)] + window*(self.k+1)
 
     def position(self, i):
         r"""
@@ -518,7 +518,7 @@ def apply_simple_reflection_right(self, i):
         if j == 0:
             a = l[0]
             l[0] = l[-1] - (self.k+1)
-            l[-1] = a +(self.k+1)
+            l[-1] = a + (self.k+1)
         else:
             a = l[j-1]
             l[j-1] = l[j]
@@ -589,7 +589,7 @@ def has_right_descent(self, i) -> bool:
             sage: p.has_right_descent(0)
             False
         """
-        return self.value(i)>self.value(i+1)
+        return self.value(i) > self.value(i+1)
 
     def has_left_descent(self, i) -> bool:
         r"""
@@ -708,20 +708,20 @@ def maximal_cyclic_factor(self, typ='decreasing', side='right', verbose=False):
             j = i
             for _ in range(1, self.k):
                 if (typ[0],side[0]) == ('d', 'r'):
-                    j=(j+1)%(k+1)
+                    j = (j+1) % (k+1)
                 if (typ[0],side[0]) == ('i', 'r'):
-                    j=(j-1)%(k+1)
+                    j = (j-1) % (k+1)
                 if (typ[0],side[0]) == ('d', 'l'):
-                    j=(j-1)%(k+1)
+                    j = (j-1) % (k+1)
                 if (typ[0],side[0]) == ('i', 'l'):
-                    j=(j+1)%(k+1)
+                    j = (j+1) % (k+1)
                 if y.has_descent(j, side):
-                    y=y.apply_simple_reflection(j,side)
-                    T.append(j%(k+1))
+                    y = y.apply_simple_reflection(j,side)
+                    T.append(j % (k+1))
             if verbose:
                 print(i, T)
             if len(T) > len(best_T):
-                best_T=T
+                best_T = T
         #if (typ[0],side[0])==('i','r'): best_T.reverse()
         #if (typ[0],side[0])==('d','l'): best_T.reverse()
         #if typ[0]=='d': best_T.reverse()
@@ -791,7 +791,7 @@ def maximal_cyclic_decomposition(self, typ='decreasing', side='right', verbose=F
                     y = y.apply_simple_reflection_left(i)
             if verbose:
                 print(S, y.length())
-        if side[0]=='r':
+        if side[0] == 'r':
             listy.reverse()
         return listy
 
@@ -848,13 +848,13 @@ def to_lehmer_code(self, typ='decreasing', side='right'):
             #value than the number in position i.  Then cyclically shift
             #the resulting vector.
             for i in range(self.k+1):
-                a=self(i)
+                a = self(i)
                 for j in range(i-self.k, i):
-                    b=self(j)
+                    b = self(j)
                     # A small rotation is necessary for the reduced word from
                     # the Lehmer code to match the element.
                     if a < b:
-                        code[i-1]+=((b-a)//(self.k+1)+1)
+                        code[i-1] += ((b-a)//(self.k+1)+1)
         elif typ[0] == 'i' and side[0] == 'l':
             #Find number of positions to the right of i smaller than i, then
             #cyclically shift the resulting vector.
@@ -866,7 +866,7 @@ def to_lehmer_code(self, typ='decreasing', side='right'):
                     #the lehmer code to match the element.
                     if b < i:
                         code[i-1] += (i-b) // (self.k+1) + 1
-        elif typ[0] == 'd' and side[0]=='l':
+        elif typ[0] == 'd' and side[0] == 'l':
             #Find number of positions to the left of i larger than i.
             for i in range(self.k+1):
                 pos = self.position(i)
@@ -1029,7 +1029,7 @@ def tableau_of_word(self, w, typ='decreasing', side='right', alpha=None):
         if x0.length() != len(w):
             raise ValueError("word was not reduced")
         if alpha is None:
-            alpha=Composition([1 for i in w])
+            alpha = Composition([1 for i in w])
         else:
             if sum(alpha) != len(w):
                 raise ValueError("size of alpha must match length of w")
@@ -1647,7 +1647,7 @@ def check(self):
         if not len(self) == 6:
             raise ValueError("length of list must be 6")
         #Check that we have an even number of 'big' elements left of the 7th entry.
-        s = sum(i//6 - (i%6 == 0) for i in self if i > 6)
+        s = sum(i//6 - (i % 6 == 0) for i in self if i > 6)
         if s % 2:
             raise ValueError("type G affine permutations have an even number of"
                              " entries greater than 6 to the left of the 7th position")
@@ -1678,7 +1678,7 @@ def value(self, i, base_window=False):
         if base_window:
             self[i-1]
         window = (i-1) // N
-        return self[(i-1)%N] + window*(N)
+        return self[(i-1) % N] + window*(N)
 
     def position(self, i):
         r"""
@@ -1758,28 +1758,28 @@ def apply_simple_reflection_left(self, i):
         l = []
         if i == 1:
             for m in range(6):
-                res=self[m]%6
-                if res==1 or res==3 or res==5:
+                res = self[m] % 6
+                if res == 1 or res == 3 or res == 5:
                     l.append(self[m]+1)
-                elif res==2 or res==4 or res==0:
+                elif res == 2 or res == 4 or res == 0:
                     l.append(self[m]-1)
                 else:
                     l.append(self[m])
         elif i == 2:
             for m in range(6):
-                res=self[m]%6
-                if res==2 or res==4:
+                res = self[m] % 6
+                if res == 2 or res == 4:
                     l.append(self[m]+1)
-                elif res==3 or res==5:
+                elif res == 3 or res == 5:
                     l.append(self[m]-1)
                 else:
                     l.append(self[m])
         elif i == 0:
             for m in range(6):
-                res=self[m]%6
-                if res==1 or res==2:
+                res = self[m] % 6
+                if res == 1 or res == 2:
                     l.append(self[m]-2)
-                elif res==5 or res==0:
+                elif res == 5 or res == 0:
                     l.append(self[m]+2)
                 else:
                     l.append(self[m])
@@ -1983,9 +1983,9 @@ def AffinePermutationGroup(cartan_type):
         Type G affine permutation with window [0, 4, -1, 8, 3, 7]
     """
     ct = CartanType(cartan_type)
-    if ct.letter=='A':
+    if ct.letter == 'A':
         return AffinePermutationGroupTypeA(ct)
-    if ct.letter=='B':
+    if ct.letter == 'B':
         return AffinePermutationGroupTypeB(ct)
     if ct.letter == 'C':
         return AffinePermutationGroupTypeC(ct)
@@ -2140,7 +2140,7 @@ def index_set(self):
         """
         return self.cartan_type().index_set()
 
-    _index_set=index_set
+    _index_set = index_set
 
     def reflection_index_set(self):
         r"""

src/sage/combinat/integer_vector.py

@@ -111,8 +111,8 @@ def is_gale_ryser(r,s):
     # builds the corresponding partitions, i.e.
     # removes the 0 and sorts the sequences
     from sage.combinat.partition import Partition
-    r2 = Partition(sorted([x for x in r if x>0], reverse=True))
-    s2 = Partition(sorted([x for x in s if x>0], reverse=True))
+    r2 = Partition(sorted([x for x in r if x > 0], reverse=True))
+    s2 = Partition(sorted([x for x in s if x > 0], reverse=True))
 
     # If the two sequences only contained zeroes
     if len(r2) == 0 and len(s2) == 0:
@@ -361,13 +361,13 @@ def gale_ryser_theorem(p1, p2, algorithm="gale",
 
     elif algorithm == "gale":
         from sage.numerical.mip import MixedIntegerLinearProgram
-        k1, k2=len(p1), len(p2)
+        k1, k2 = len(p1), len(p2)
         p = MixedIntegerLinearProgram(solver=solver)
         b = p.new_variable(binary=True)
         for (i,c) in enumerate(p1):
-            p.add_constraint(p.sum([b[i,j] for j in range(k2)]) ==c)
+            p.add_constraint(p.sum([b[i,j] for j in range(k2)]) == c)
         for (i,c) in enumerate(p2):
-            p.add_constraint(p.sum([b[j,i] for j in range(k1)]) ==c)
+            p.add_constraint(p.sum([b[j,i] for j in range(k1)]) == c)
         p.set_objective(None)
         p.solve()
         b = p.get_values(b, convert=ZZ, tolerance=integrality_tolerance)

src/sage/combinat/integer_vectors_mod_permgroup.py

@@ -431,8 +431,8 @@ def is_canonical(self, v, check=True):
             False
         """
         if check:
-            assert isinstance(v, (ClonableIntArray, list)), '%s should be a list or a integer vector'%v
-            assert (self.n == len(v)), '%s should be of length %s'%(v, self.n)
+            assert isinstance(v, (ClonableIntArray, list)), '%s should be a list or a integer vector' % v
+            assert (self.n == len(v)), '%s should be of length %s' % (v, self.n)
             for p in v:
                 assert (p == NN(p)), 'Elements of %s should be integers' % v
         return is_canonical(self._sgs, self.element_class(self, list(v), check=False))
@@ -473,7 +473,7 @@ def __call__(self, v, check=True):
             if v.parent() is self:
                 return v
             else:
-                raise ValueError('%s should be a Python list of integer'%(v))
+                raise ValueError('%s should be a Python list of integer' % (v))
         except Exception:
             return self.element_class(self, list(v), check=check)
 
@@ -499,7 +499,7 @@ def orbit(self, v):
             sage: I.orbit([1,1,1,1])
             {[1, 1, 1, 1]}
         """
-        assert isinstance(v, (list, ClonableIntArray)), '%s should be a Python list or an element of %s'%(v, self)
+        assert isinstance(v, (list, ClonableIntArray)), '%s should be a Python list or an element of %s' % (v, self)
         try:
             if v.parent() is self:
                 return orbit(self._sgs, v)
@@ -720,7 +720,7 @@ def __call__(self, v, check=True):
             if v.parent() is self:
                 return v
             else:
-                raise ValueError('%s should be a Python list of integer'%(v))
+                raise ValueError('%s should be a Python list of integer' % (v))
         except Exception:
             return self.element_class(self, list(v), check=check)