Skip to content

Commit b9ad86c

Browse files
author
Release Manager
committed
gh-39625: some fixes by ruff about nested max this was scripted using ``` ruff check --fix --unsafe-fixes --output-format=concise --select PLW3301 src/sage ``` and one of the changes was then undone ### 📝 Checklist - [x] The title is concise and informative. - [x] The description explains in detail what this PR is about. URL: #39625 Reported by: Frédéric Chapoton Reviewer(s): David Coudert
2 parents 8f05564 + d7f4d7b commit b9ad86c

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

src/sage/combinat/rigged_configurations/rigged_configuration_element.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ def epsilon(self, a):
826826
a = self.parent()._rc_index_inverse[a]
827827
if not self[a]:
828828
return ZZ.zero()
829-
return Integer(-min(0, min(self[a].rigging)))
829+
return Integer(-min(0, *self[a].rigging))
830830

831831
def phi(self, a):
832832
r"""
@@ -851,7 +851,7 @@ def phi(self, a):
851851
p_inf = self.parent()._calc_vacancy_number(self, a, float("inf"))
852852
if not self[a]:
853853
return Integer(p_inf)
854-
return Integer(p_inf - min(0, min(self[a].rigging)))
854+
return Integer(p_inf - min(0, *self[a].rigging))
855855

856856
def vacancy_number(self, a, i):
857857
r"""
@@ -2315,7 +2315,7 @@ def epsilon(self, a):
23152315
if not self[a]:
23162316
epsilon = 0
23172317
else:
2318-
epsilon = -min(0, min(self[a].rigging))
2318+
epsilon = -min(0, *self[a].rigging)
23192319
n = len(self.parent()._rc_index)
23202320
if a == n-1: # -1 for indexing
23212321
epsilon *= 2
@@ -2349,7 +2349,7 @@ def phi(self, a):
23492349
if not self[a]:
23502350
phi = p_inf
23512351
else:
2352-
phi = p_inf - min(0, min(self[a].rigging))
2352+
phi = p_inf - min(0, *self[a].rigging)
23532353
n = len(self.parent()._rc_index)
23542354
if a == n-1: # -1 for indexing
23552355
phi *= 2

src/sage/combinat/set_partition.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,7 @@ def is_atomic(self) -> bool:
16381638
for S in self[1:]:
16391639
if maximum_so_far < min(S):
16401640
return False
1641-
maximum_so_far = max(maximum_so_far, max(S))
1641+
maximum_so_far = max(maximum_so_far, *S)
16421642
return True
16431643

16441644
def standardization(self):

src/sage/combinat/words/finite_word.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5538,7 +5538,7 @@ def balance(self):
55385538
abelian[lost] -= 1
55395539
abel_max[gain] = max(abel_max[gain], abelian[gain])
55405540
abel_min[lost] = min(abel_min[lost], abelian[lost])
5541-
best = max(best, max(abel_max[a] - abel_min[a] for a in alphabet))
5541+
best = max(best, *(abel_max[a] - abel_min[a] for a in alphabet))
55425542
return best
55435543

55445544
def is_balanced(self, q=1):

src/sage/homology/homology_vector_space_with_basis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ def _test_duality(self, **options):
444444
tester = self._tester(**options)
445445
dual = self.dual()
446446
dims = [a[0] for a in self._indices]
447-
for dim in range(max(max(dims), tester._max_runs) + 1):
447+
for dim in range(max(*dims, tester._max_runs) + 1):
448448
n = len(self.basis(dim))
449449
m = matrix(n, n, [a.eval(b) for a in self.basis(dim) for b in dual.basis(dim)])
450450
tester.assertEqual(m, 1, f"error in dimension {dim}")

src/sage/matroids/matroids_plot_helpers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -708,8 +708,8 @@ def tracklims(lims, x_i=[], y_i=[]):
708708
"""
709709
if lims is not None and lims[0] is not None and lims[1] is not None and \
710710
lims[2] is not None and lims[3] is not None:
711-
lims = [min(min(x_i), lims[0]), max(max(x_i), lims[1]),
712-
min(min(y_i), lims[2]), max(max(y_i), lims[3])]
711+
lims = [min(*x_i, lims[0]), max(*x_i, lims[1]),
712+
min(*y_i, lims[2]), max(*y_i, lims[3])]
713713
else:
714714
lims = [min(x_i), max(x_i), min(y_i), max(y_i)]
715715
return lims

src/sage/sat/solvers/cryptominisat.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def add_clause(self, lits):
137137
raise ValueError("0 should not appear in the clause: {}".format(lits))
138138
# cryptominisat does not handle Sage integers
139139
lits = tuple(int(i) for i in lits)
140-
self._nvars = max(self._nvars, max(abs(i) for i in lits))
140+
self._nvars = max(self._nvars, *(abs(i) for i in lits))
141141
self._solver.add_clause(lits)
142142
self._clauses.append((lits, False, None))
143143

@@ -162,7 +162,7 @@ def add_xor_clause(self, lits, rhs=True):
162162
raise ValueError("0 should not appear in the clause: {}".format(lits))
163163
# cryptominisat does not handle Sage integers
164164
lits = tuple(int(i) for i in lits)
165-
self._nvars = max(self._nvars, max(abs(i) for i in lits))
165+
self._nvars = max(self._nvars, *(abs(i) for i in lits))
166166
self._solver.add_xor_clause(lits, rhs)
167167
self._clauses.append((lits, True, rhs))
168168

src/sage/sat/solvers/picosat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def add_clause(self, lits):
130130
raise ValueError("0 should not appear in the clause: {}".format(lits))
131131
# pycosat does not handle Sage integers
132132
lits = [int(i) for i in lits]
133-
self._nvars = max(self._nvars, max(abs(i) for i in lits))
133+
self._nvars = max(self._nvars, *(abs(i) for i in lits))
134134
self._clauses.append(lits)
135135

136136
def __call__(self, assumptions=None):

0 commit comments

Comments
 (0)