less experimental; deprecate .multiplication_by_m_isogeny()

Author: yyyyx4

src/sage/schemes/elliptic_curves/ell_generic.py

@@ -2324,6 +2324,7 @@ def multiplication_by_m_isogeny(self, m):
 
             sage: E = EllipticCurve('11a1')
             sage: E.multiplication_by_m_isogeny(7)
+            doctest:warning ... DeprecationWarning: ...
             Isogeny of degree 49 from Elliptic Curve defined by y^2 + y = x^3 - x^2 - 10*x - 20 over Rational Field to Elliptic Curve defined by y^2 + y = x^3 - x^2 - 10*x - 20 over Rational Field
 
         TESTS:
@@ -2363,6 +2364,9 @@ def multiplication_by_m_isogeny(self, m):
             sage: all(mu(-m) == -mu(m) for m in (1,2,3,5,7))
             True
         """
+        from sage.misc.superseded import deprecation
+        deprecation(32826, 'The .multiplication_by_m_isogeny() method is superseded by .scalar_multiplication().')
+
         mx, my = self.multiplication_by_m(m)
 
         torsion_poly = self.torsion_polynomial(abs(m)).monic()
@@ -2384,16 +2388,10 @@ def scalar_multiplication(self, m):
         :class:`sage.schemes.elliptic_curves.hom_scalar.EllipticCurveHom_scalar`
         object.
 
-        .. WARNING::
-
-            This method is currently experimental. It is intended to
-            eventually supersede :meth:`multiplication_by_m_isogeny`.
-
         EXAMPLES::
 
             sage: E = EllipticCurve('77a1')
             sage: m = E.scalar_multiplication(-7); m
-            doctest:warning ...
             Scalar-multiplication endomorphism [-7] of Elliptic Curve defined by y^2 + y = x^3 + 2*x over Rational Field
             sage: m.degree()
             49
@@ -2518,9 +2516,9 @@ def automorphisms(self, field=None):
             ....:         continue
             ....:     break
             sage: Aut = E.automorphisms()
-            sage: Aut[0] == E.multiplication_by_m_isogeny(1)
+            sage: Aut[0] == E.scalar_multiplication(1)
             True
-            sage: Aut[1] == E.multiplication_by_m_isogeny(-1)
+            sage: Aut[1] == E.scalar_multiplication(-1)
             True
             sage: sorted(Aut) == Aut
             True

src/sage/schemes/elliptic_curves/hom.py

@@ -182,8 +182,9 @@ def _richcmp_(self, other, op):
             sage: F = E.change_ring(GF(71))
             sage: wE = identity_morphism(E)
             sage: wF = identity_morphism(F)
-            sage: mE = E.multiplication_by_m_isogeny(1)
+            sage: mE = E.scalar_multiplication(1)
             sage: mF = F.multiplication_by_m_isogeny(1)
+            doctest:warning ... DeprecationWarning: ...
             sage: [mE == wE, mF == wF]
             [True, True]
             sage: [a == b for a in (wE,mE) for b in (wF,mF)]
@@ -746,7 +747,7 @@ def compare_via_evaluation(left, right):
         sage: from sage.schemes.elliptic_curves.hom_composite import EllipticCurveHom_composite
         sage: mu = EllipticCurveHom_composite.from_factors([phi, psi])
         sage: from sage.schemes.elliptic_curves.hom import compare_via_evaluation
-        sage: compare_via_evaluation(mu, E.multiplication_by_m_isogeny(7))
+        sage: compare_via_evaluation(mu, E.scalar_multiplication(7))
         True
 
     .. SEEALSO::

src/sage/schemes/elliptic_curves/hom_composite.py

@@ -350,7 +350,7 @@ def from_factors(cls, maps, E=None, strict=True):
         TESTS::
 
             sage: E = EllipticCurve('4730k1')
-            sage: EllipticCurveHom_composite.from_factors([], E) == E.multiplication_by_m_isogeny(1)
+            sage: EllipticCurveHom_composite.from_factors([], E) == E.scalar_multiplication(1)
             True
 
         ::
@@ -563,7 +563,7 @@ def _comparison_impl(left, right, op):
             sage: psi = phi.codomain().isogeny(phi(Q))
             sage: psi = psi.codomain().isomorphism_to(E) * psi
             sage: comp = psi * phi
-            sage: mu = E.multiplication_by_m_isogeny(phi.degree())
+            sage: mu = E.scalar_multiplication(phi.degree())
             sage: sum(a*comp == mu for a in E.automorphisms())
             1
 
@@ -680,9 +680,9 @@ def dual(self):
             Composite morphism of degree 9 = 3^2:
               From: Elliptic Curve defined by y^2 + x*y + 3*y = x^3 + 2*x^2 + 28339*x + 59518 over Finite Field of size 65537
               To:   Elliptic Curve defined by y^2 + x*y + 3*y = x^3 + 2*x^2 + 4*x + 5 over Finite Field of size 65537
-            sage: psi * phi == phi.domain().multiplication_by_m_isogeny(phi.degree())
+            sage: psi * phi == phi.domain().scalar_multiplication(phi.degree())
             True
-            sage: phi * psi == psi.domain().multiplication_by_m_isogeny(psi.degree())
+            sage: phi * psi == psi.domain().scalar_multiplication(psi.degree())
             True
         """
         phis = (phi.dual() for phi in self._phis[::-1])

src/sage/schemes/elliptic_curves/hom_scalar.py

@@ -4,18 +4,11 @@
 This class provides an :class:`EllipticCurveHom` instantiation for
 multiplication-by-`m` maps on elliptic curves.
 
-.. WARNING::
-
-    This module is currently considered experimental.
-    It may change in a future release without prior warning, or even
-    be removed altogether if things turn out to be unfixably broken.
-
 EXAMPLES:
 
 We can construct and evaluate scalar multiplications::
 
     sage: from sage.schemes.elliptic_curves.hom_scalar import EllipticCurveHom_scalar
-    doctest:warning ...
     sage: E = EllipticCurve('77a1')
     sage: phi = E.scalar_multiplication(5); phi
     Scalar-multiplication endomorphism [5] of Elliptic Curve defined by y^2 + y = x^3 + 2*x over Rational Field
@@ -136,8 +129,6 @@
 from sage.schemes.elliptic_curves.weierstrass_morphism import negation_morphism
 from sage.schemes.elliptic_curves.hom import EllipticCurveHom
 
-from sage.misc.superseded import experimental_warning
-experimental_warning(32826, 'EllipticCurveHom_scalar is experimental code.')
 
 class EllipticCurveHom_scalar(EllipticCurveHom):
 
@@ -393,6 +384,7 @@ def scaling_factor(self):
             sage: u == phi.formal()[1]
             True
             sage: u == E.multiplication_by_m_isogeny(5).scaling_factor()
+            doctest:warning ... DeprecationWarning: ...
             True
 
         ALGORITHM: The scaling factor equals the scalar that is being

src/sage/schemes/elliptic_curves/hom_velusqrt.py

@@ -1252,9 +1252,9 @@ def dual(self):
               To:   Elliptic Curve defined by y^2 = x^3 + 39*x + 40 over Finite Field in z2 of size 101^2
             sage: phi.dual()
             Isogeny of degree 11 from Elliptic Curve defined by y^2 = x^3 + 39*x + 40 over Finite Field in z2 of size 101^2 to Elliptic Curve defined by y^2 + x*y + y = x^3 + x^2 + x + 1 over Finite Field in z2 of size 101^2
-            sage: phi.dual() * phi == phi.domain().multiplication_by_m_isogeny(11)
+            sage: phi.dual() * phi == phi.domain().scalar_multiplication(11)
             True
-            sage: phi * phi.dual() == phi.codomain().multiplication_by_m_isogeny(11)
+            sage: phi * phi.dual() == phi.codomain().scalar_multiplication(11)
             True
         """
         # FIXME: This code fails if the degree is divisible by the characteristic.

src/sage/schemes/projective/projective_morphism.py

@@ -2705,7 +2705,7 @@ def projective_degrees(self):
             sage: k = GF(11)
             sage: E = EllipticCurve(k,[1,1])
             sage: Q = E(6,5)
-            sage: phi = E.multiplication_by_m_isogeny(2)
+            sage: phi = E.scalar_multiplication(2)
             sage: mor = phi.as_morphism()
             sage: mor.projective_degrees()
             (12, 3)
@@ -2747,7 +2747,7 @@ def degree(self):
             sage: k = GF(11)
             sage: E = EllipticCurve(k,[1,1])
             sage: Q = E(6,5)
-            sage: phi = E.multiplication_by_m_isogeny(2)
+            sage: phi = E.scalar_multiplication(2)
             sage: mor = phi.as_morphism()
             sage: mor.degree()
             4