Skip to content

Commit 8b8f67a

Browse files
author
Release Manager
committed
Trac #33889: get rid of some range(0,*) in pyx files
We replace some `range(0, a)` by `range(a)`, occasionally replacing `xrange` by `range` or a list by an iterator. URL: https://trac.sagemath.org/33889 Reported by: chapoton Ticket author(s): Frédéric Chapoton Reviewer(s): Samuel Lelièvre
2 parents 8d8c044 + d2a9eb6 commit 8b8f67a

File tree

7 files changed

+25
-26
lines changed

7 files changed

+25
-26
lines changed

src/sage/coding/binary_code.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3927,7 +3927,7 @@ cdef class BinaryCodeClassifier:
39273927
39283928
sage: soc_iter = codes.databases.self_orthogonal_binary_codes(12, 6, 4)
39293929
sage: L = list(soc_iter)
3930-
sage: for n in range(0, 13):
3930+
sage: for n in range(13):
39313931
....: s = 'n=%2d : '%n
39323932
....: for k in range(1,7):
39333933
....: s += '%3d '%len([C for C in L if C.length() == n and C.dimension() == k])

src/sage/geometry/integral_points.pyx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ from sage.matrix.matrix_integer_dense cimport Matrix_integer_dense
4949
## # R*Rinv == diagonal_matrix([d]*D.ncols() + [0]*(D.nrows()-D.ncols()))
5050
## # If R is full rank, this is Rinv = matrix(ZZ, R.inverse() * d)
5151
## Dinv = D.transpose()
52-
## for i in range(0,D.ncols()):
52+
## for i in range(D.ncols()):
5353
## Dinv[i,i] = d/D[i,i]
5454
## Rinv = V * Dinv * U
5555
##
5656
## gens = []
57-
## for b in CartesianProduct(*[ range(0,i) for i in e ]):
57+
## for b in CartesianProduct(*[ range(i) for i in e ]):
5858
## # this is our generator modulo the lattice spanned by the rays
5959
## gen_mod_rays = sum( b_i*u_i for b_i, u_i in zip(b,u) )
6060
## q_times_d = Rinv * gen_mod_rays
@@ -175,7 +175,7 @@ cpdef tuple ray_matrix_normal_form(R):
175175
if d == ZZ.zero():
176176
raise ValueError('The spanning points are not linearly independent!')
177177
cdef int i
178-
Dinv = diagonal_matrix(ZZ, [ d // e[i] for i in range(0,D.ncols()) ])
178+
Dinv = diagonal_matrix(ZZ, [ d // e[i] for i in range(D.ncols()) ])
179179
VDinv = V * Dinv
180180
return (e, d, VDinv)
181181

@@ -224,20 +224,20 @@ cpdef tuple loop_over_parallelotope_points(e, d, Matrix_integer_dense VDinv,
224224
cdef list gens = []
225225
gen = lattice(ZZ.zero())
226226
cdef Vector_integer_dense q_times_d = vector(ZZ, dim)
227-
for base in itertools.product(*[ range(0,i) for i in e ]):
228-
for i in range(0, dim):
227+
for base in itertools.product(*[ range(i) for i in e ]):
228+
for i in range(dim):
229229
s = ZZ.zero()
230-
for j in range(0, dim):
230+
for j in range(dim):
231231
s += VDinv.get_unsafe(i,j) * base[j]
232232
q_times_d.set_unsafe(i, s % d)
233-
for i in range(0, ambient_dim):
233+
for i in range(ambient_dim):
234234
s = ZZ.zero()
235-
for j in range(0, dim):
235+
for j in range(dim):
236236
s += R.get_unsafe(i,j) * q_times_d.get_unsafe(j)
237237
gen[i] = s / d
238238
if A is not None:
239239
s = ZZ.zero()
240-
for i in range(0, ambient_dim):
240+
for i in range(ambient_dim):
241241
s += A[i] * gen[i]
242242
if s > b:
243243
continue
@@ -341,7 +341,7 @@ cdef translate_points(v_list, Vector_integer_dense delta):
341341
cdef int dim = delta.degree()
342342
cdef int i
343343
for v in v_list:
344-
for i in range(0,dim):
344+
for i in range(dim):
345345
v[i] -= delta.get_unsafe(i)
346346

347347

@@ -549,7 +549,7 @@ cpdef rectangular_box_points(list box_min, list box_max,
549549
assert not (count_only and return_saturated)
550550
cdef int d = len(box_min)
551551
cdef int i, j
552-
cdef list diameter = sorted([ (box_max[i]-box_min[i], i) for i in range(0,d) ],
552+
cdef list diameter = sorted([ (box_max[i]-box_min[i], i) for i in range(d) ],
553553
reverse=True)
554554
cdef list diameter_value = [x[0] for x in diameter]
555555
cdef list diameter_index = [x[1] for x in diameter]
@@ -790,7 +790,7 @@ cdef class Inequality_generic:
790790
'generic: (2, 3, 7) x + -5 >= 0'
791791
"""
792792
s = 'generic: ('
793-
s += ', '.join([str(self.A[i]) for i in range(0,len(self.A))])
793+
s += ', '.join(str(self.A[i]) for i in range(len(self.A)))
794794
s += ') x + ' + str(self.b) + ' >= 0'
795795
return s
796796

src/sage/libs/mpmath/ext_impl.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2036,7 +2036,7 @@ cdef MPF_hypsum(MPF *a, MPF *b, int p, int q, param_types, str ztype, coeffs, z,
20362036
mpz_set_complex_tuple_fixed(ZRE, ZIM, z, wp)
20372037
else:
20382038
mpz_set_tuple_fixed(ZRE, z, wp)
2039-
for i in range(0,p):
2039+
for i in range(p):
20402040
sig_check()
20412041
if param_types[i] == 'Z':
20422042
mpz_init(AINT[aint])

src/sage/matroids/matroid.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2351,7 +2351,7 @@ cdef class Matroid(SageObject):
23512351
False
23522352
"""
23532353
E = list(self.groundset())
2354-
for i in xrange(0, len(E) + 1):
2354+
for i in range(len(E) + 1):
23552355
for X in combinations(E, i):
23562356
XX = frozenset(X)
23572357
rX = self._rank(XX)

src/sage/rings/polynomial/real_roots.pyx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2109,14 +2109,14 @@ def bernstein_up(d1, d2, s=None):
21092109
MS = MatrixSpace(QQ, s, d1+1, sparse=False)
21102110
m = MS()
21112111
scale = factorial(d2)/factorial(d2-d1)
2112-
for b in range(0, d1+1):
2112+
for b in range(d1 + 1):
21132113
scale2 = scale / binomial(d1, b)
21142114
if (d1 - b) & 1 == 1:
21152115
scale2 = -scale2
21162116
scale2 = ~scale2
2117-
for a in range(0, s):
2117+
for a in range(s):
21182118
ra = ZZ(subsample_vec(a, s, d2 + 1))
2119-
m[a, b] = prod([ra-i for i in range(0, b)]) * prod([ra-i for i in range(d2-d1+b+1, d2+1)]) * scale2
2119+
m[a, b] = prod([ra-i for i in range(b)]) * prod([ra-i for i in range(d2-d1+b+1, d2+1)]) * scale2
21202120

21212121
return m
21222122

@@ -4369,7 +4369,7 @@ def to_bernstein(p, low=0, high=1, degree=None):
43694369
raise ValueError('Bernstein degree must be at least polynomial degree')
43704370
vs = ZZ ** (degree + 1)
43714371
c = vs(0)
4372-
for i in range(0, p.degree() + 1):
4372+
for i in range(p.degree() + 1):
43734373
c[i] = p[i]
43744374
scale = ZZ(1)
43754375
if low == 0:
@@ -4385,7 +4385,8 @@ def to_bernstein(p, low=0, high=1, degree=None):
43854385
reverse_intvec(c)
43864386
taylor_shift1_intvec(c)
43874387
reverse_intvec(c)
4388-
return ([c[k] / binomial(degree, k) for k in range(0, degree+1)], scale)
4388+
return ([c[k] / binomial(degree, k) for k in range(degree + 1)], scale)
4389+
43894390

43904391
def to_bernstein_warp(p):
43914392
"""
@@ -4399,14 +4400,12 @@ def to_bernstein_warp(p):
43994400
sage: to_bernstein_warp(1 + x + x^2 + x^3 + x^4 + x^5)
44004401
[1, 1/5, 1/10, 1/10, 1/5, 1]
44014402
"""
4402-
44034403
c = p.list()
4404-
44054404
for i in range(len(c)):
44064405
c[i] = c[i] / binomial(len(c) - 1, i)
4407-
44084406
return c
44094407

4408+
44104409
def bernstein_expand(Vector_integer_dense c, int d2):
44114410
"""
44124411
Given an integer vector representing a Bernstein polynomial p, and

src/sage/sets/recursively_enumerated_set.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ convention is that the generated elements are the ``s := f(n)``, except when
273273
....: st = set(st) # make a copy
274274
....: if st:
275275
....: el = st.pop()
276-
....: for i in range(0, len(lst)+1):
276+
....: for i in range(len(lst)+1):
277277
....: yield (lst[0:i]+[el]+lst[i:], st)
278278
sage: list(children(([1,2], {3,7,9})))
279279
[([9, 1, 2], {3, 7}), ([1, 9, 2], {3, 7}), ([1, 2, 9], {3, 7})]

src/sage/structure/element.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -823,8 +823,8 @@ cdef class Element(SageObject):
823823
variables=[]
824824
# use "gen" instead of "gens" as a ParentWithGens is not
825825
# required to have the latter
826-
for i in xrange(0,ngens):
827-
gen=parent.gen(i)
826+
for i in range(ngens):
827+
gen = parent.gen(i)
828828
if str(gen) in kwds:
829829
variables.append(kwds[str(gen)])
830830
elif in_dict and gen in in_dict:

0 commit comments

Comments
 (0)