7474from sage .structure .sequence import Sequence
7575from sage .modules .free_module_element import vector
7676
77- from sage .misc .superseded import deprecated_function_alias
78-
7977
8078class UnwrappingMorphism (Morphism ):
8179 r"""
@@ -324,8 +322,6 @@ def discrete_exp(self, v):
324322 # DUMB IMPLEMENTATION!
325323 return sum ([self ._gen_elements [i ] * ZZ (v [i ]) for i in range (len (v ))], self .universe ()(0 ))
326324
327- _discrete_exp = deprecated_function_alias (32384 , discrete_exp )
328-
329325 def discrete_log (self , x , gens = None ):
330326 r"""
331327 Given an element of the ambient group, attempt to express it in terms
@@ -421,8 +417,6 @@ def discrete_log(self, x, gens=None):
421417 assert x == sum (r * g for r , g in zip (res , gens ))
422418 return res
423419
424- _discrete_log = deprecated_function_alias (32384 , discrete_log )
425-
426420 def torsion_subgroup (self , n = None ):
427421 r"""
428422 Return the `n`-torsion subgroup of this additive abelian group
@@ -594,7 +588,7 @@ def _base(j, k, c):
594588
595589 assert k - j == 1
596590 aajk = subbasis (j , k )
597- assert not any (p * a for a in aajk ) # orders are in {1,p}
591+ assert not any (p * a for a in aajk ) # orders are in {1,p}
598592 idxs = [i for i , a in enumerate (aajk ) if a ]
599593
600594 rs = [([0 ], [0 ]) for i in range (len (aajk ))]
@@ -627,18 +621,18 @@ def _rec(j, k, c):
627621 return _base (j , k , c )
628622
629623 w = 2
630- js = list (range (j , k , (k - j + w - 1 ) // w )) + [k ]
624+ js = list (range (j , k , (k - j + w - 1 ) // w )) + [k ]
631625 assert len (js ) == w + 1
632626
633627 x = vector ([0 ] * len (aa ))
634628 for i in reversed (range (w )):
635629
636630 gamma = p ** (js [i ] - j ) * c - dotprod (x , subbasis (js [i ], k ))
637631
638- v = _rec (js [i ], js [i + 1 ], gamma )
632+ v = _rec (js [i ], js [i + 1 ], gamma )
639633
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 ))
634+ assert not any (q1 % q2 for q1 , q2 in zip (qq (js [i ], js [i + 1 ]), qq (js [i ], k )))
635+ x += vector (q1 // q2 * r for q1 , q2 , r in zip (qq (js [i ], js [i + 1 ]), qq (js [i ], k ), v ))
642636
643637 return x
644638
@@ -700,7 +694,7 @@ def _expand_basis_pgroup(p, alphas, vals, beta, h, rel):
700694
701695 # step 1
702696 min_r = rel [- 1 ] or float ('inf' )
703- for i in range (k - 1 ):
697+ for i in range (k - 1 ):
704698 if not rel [i ]:
705699 continue
706700 if rel [i ] < 0 :
@@ -712,16 +706,16 @@ def _expand_basis_pgroup(p, alphas, vals, beta, h, rel):
712706 if min_r == float ('inf' ):
713707 raise ValueError ('rel must have at least one nonzero entry' )
714708 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]))
709+ # assert rel[-1] == p ** val_rlast
710+ # assert not sum(r*a for r,a in zip(rel, alphas+[beta]))
717711
718712 # step 2
719713 if rel [- 1 ] == min_r :
720- for i in range (k - 1 ):
721- beta += alphas [i ] * (rel [i ]// rel [- 1 ])
714+ for i in range (k - 1 ):
715+ beta += alphas [i ] * (rel [i ] // rel [- 1 ])
722716 alphas .append (beta )
723717 vals .append (val_rlast )
724- # assert alphas[-1].order() == p**vals[-1]
718+ # assert alphas[-1].order() == p**vals[-1]
725719 return
726720
727721 # step 3
0 commit comments