Skip to content

Commit 6d739ee

Browse files
author
Release Manager
committed
gh-40778: remove some deprecated aliases in abelian groups deprecated in #32384 ### 📝 Checklist - [x] The title is concise and informative. - [x] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. URL: #40778 Reported by: Frédéric Chapoton Reviewer(s): David Coudert
2 parents 283edfa + 43342d2 commit 6d739ee

File tree

1 file changed

+11
-38
lines changed

1 file changed

+11
-38
lines changed

src/sage/groups/additive_abelian/additive_abelian_wrapper.py

Lines changed: 11 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@
7474
from sage.structure.sequence import Sequence
7575
from sage.modules.free_module_element import vector
7676

77-
from sage.misc.superseded import deprecated_function_alias
78-
7977

8078
class UnwrappingMorphism(Morphism):
8179
r"""
@@ -308,24 +306,13 @@ def discrete_exp(self, v):
308306
sage: el = A.random_element()
309307
sage: A.discrete_exp(A.discrete_log(el)) == el
310308
True
311-
312-
TESTS:
313-
314-
Check that :meth:`_discrete_exp` still works (for now)::
315-
316-
sage: A._discrete_exp(list(range(1,6)))
317-
doctest:warning ...
318-
DeprecationWarning: _discrete_exp is deprecated. ...
319-
(1, 2, 3, 4, 5)
320309
"""
321310
from sage.misc.verbose import verbose
322311
v = self.V()(v)
323312
verbose("Calling discrete exp on %s" % v)
324313
# DUMB IMPLEMENTATION!
325314
return sum([self._gen_elements[i] * ZZ(v[i]) for i in range(len(v))], self.universe()(0))
326315

327-
_discrete_exp = deprecated_function_alias(32384, discrete_exp)
328-
329316
def discrete_log(self, x, gens=None):
330317
r"""
331318
Given an element of the ambient group, attempt to express it in terms
@@ -374,18 +361,6 @@ def discrete_log(self, x, gens=None):
374361
Traceback (most recent call last):
375362
...
376363
NotImplementedError: No black-box discrete log for infinite abelian groups
377-
378-
TESTS:
379-
380-
Check that :meth:`_discrete_log` still works (for now)::
381-
382-
sage: orders = [2, 2*3, 2*3*5, 2*3*5*7, 2*3*5*7*11]
383-
sage: G = AdditiveAbelianGroup(orders)
384-
sage: A = AdditiveAbelianGroupWrapper(G.0.parent(), G.gens(), orders)
385-
sage: A._discrete_log(sum(i*g for i,g in enumerate(G.gens(),1)))
386-
doctest:warning ...
387-
DeprecationWarning: _discrete_log is deprecated. ...
388-
(1, 2, 3, 4, 5)
389364
"""
390365
from sage.arith.misc import CRT_list
391366
from sage.rings.infinity import Infinity
@@ -421,8 +396,6 @@ def discrete_log(self, x, gens=None):
421396
assert x == sum(r * g for r, g in zip(res, gens))
422397
return res
423398

424-
_discrete_log = deprecated_function_alias(32384, discrete_log)
425-
426399
def torsion_subgroup(self, n=None):
427400
r"""
428401
Return the `n`-torsion subgroup of this additive abelian group
@@ -594,7 +567,7 @@ def _base(j, k, c):
594567

595568
assert k - j == 1
596569
aajk = subbasis(j, k)
597-
assert not any(p*a for a in aajk) # orders are in {1,p}
570+
assert not any(p * a for a in aajk) # orders are in {1,p}
598571
idxs = [i for i, a in enumerate(aajk) if a]
599572

600573
rs = [([0], [0]) for i in range(len(aajk))]
@@ -627,18 +600,18 @@ def _rec(j, k, c):
627600
return _base(j, k, c)
628601

629602
w = 2
630-
js = list(range(j, k, (k-j+w-1) // w)) + [k]
603+
js = list(range(j, k, (k - j + w - 1) // w)) + [k]
631604
assert len(js) == w + 1
632605

633606
x = vector([0] * len(aa))
634607
for i in reversed(range(w)):
635608

636609
gamma = p ** (js[i] - j) * c - dotprod(x, subbasis(js[i], k))
637610

638-
v = _rec(js[i], js[i+1], gamma)
611+
v = _rec(js[i], js[i + 1], gamma)
639612

640-
assert not any(q1 % q2 for q1, q2 in zip(qq(js[i], js[i+1]), qq(js[i], k)))
641-
x += vector(q1 // q2 * r for q1, q2, r in zip(qq(js[i], js[i+1]), qq(js[i], k), v))
613+
assert not any(q1 % q2 for q1, q2 in zip(qq(js[i], js[i + 1]), qq(js[i], k)))
614+
x += vector(q1 // q2 * r for q1, q2, r in zip(qq(js[i], js[i + 1]), qq(js[i], k), v))
642615

643616
return x
644617

@@ -700,7 +673,7 @@ def _expand_basis_pgroup(p, alphas, vals, beta, h, rel):
700673

701674
# step 1
702675
min_r = rel[-1] or float('inf')
703-
for i in range(k-1):
676+
for i in range(k - 1):
704677
if not rel[i]:
705678
continue
706679
if rel[i] < 0:
@@ -712,16 +685,16 @@ def _expand_basis_pgroup(p, alphas, vals, beta, h, rel):
712685
if min_r == float('inf'):
713686
raise ValueError('rel must have at least one nonzero entry')
714687
val_rlast = rel[-1].valuation(p)
715-
# assert rel[-1] == p ** val_rlast
716-
# assert not sum(r*a for r,a in zip(rel, alphas+[beta]))
688+
# assert rel[-1] == p ** val_rlast
689+
# assert not sum(r*a for r,a in zip(rel, alphas+[beta]))
717690

718691
# step 2
719692
if rel[-1] == min_r:
720-
for i in range(k-1):
721-
beta += alphas[i] * (rel[i]//rel[-1])
693+
for i in range(k - 1):
694+
beta += alphas[i] * (rel[i] // rel[-1])
722695
alphas.append(beta)
723696
vals.append(val_rlast)
724-
# assert alphas[-1].order() == p**vals[-1]
697+
# assert alphas[-1].order() == p**vals[-1]
725698
return
726699

727700
# step 3

0 commit comments

Comments
 (0)