Skip to content

Commit b8b7cbd

Browse files
committed
Some documentation clean-up
1 parent 39ebbe4 commit b8b7cbd

File tree

4 files changed

+34
-52
lines changed

4 files changed

+34
-52
lines changed

src/sage/libs/eclib/interface.py

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -267,21 +267,28 @@ def two_descent(self, verbose=True, selmer_only=False, first_limit=20,
267267
268268
- ``selmer_only`` -- boolean (default: ``False``); ``selmer_only`` switch
269269
270-
- ``first_limit`` -- integer (default: 20); bound on `|x|+|z|` in
271-
quartic point search
272-
273-
- ``second_limit`` -- integer (default: 8); bound on
274-
`\log \max(|x|,|z|)`, i.e. logarithmic
275-
276-
- ``n_aux`` -- integer (default: -1); (only relevant for general
277-
2-descent when 2-torsion trivial) number of primes used for
278-
quartic search. ``n_aux=-1`` causes default (8) to be used.
279-
Increase for curves of higher rank.
280-
281-
- ``second_descent`` -- boolean (default: ``True``); (only relevant
282-
for curves with 2-torsion, where mwrank uses descent via
283-
2-isogeny) flag determining whether or not to do second
284-
descent. *Default strongly recommended.*
270+
- ``first_limit`` -- integer (default: 20); naive height bound on
271+
first point search on quartic homogeneous spaces (before
272+
testing local solubility; very simple search with no
273+
overheads).
274+
275+
- ``second_limit`` -- integer (default: 8); naive height bound on
276+
second point search on quartic homogeneous spaces (after
277+
testing local solubility; sieve-assisted search)
278+
279+
- ``n_aux`` -- integer (default: -1); if positive, the number of
280+
auxiliary primes used in sieve-assisted search for quartics.
281+
If -1 (the default) use a default value (set in the eclib
282+
code in ``src/qrank/mrank1.cc`` in DEFAULT_NAUX: currently 8).
283+
Only relevant for curves with no 2-torsion, where full
284+
2-descent is carried out. Worth increasing for curves
285+
expected to be of rank > 6 to one or two more than the
286+
expected rank.
287+
288+
- ``second_descent`` -- boolean (default: ``True``); flag specifying
289+
whether or not a second descent will be carried out. Only relevant
290+
for curves with 2-torsion. Recommended left as the default except for
291+
experts interested in details of Selmer groups.
285292
286293
OUTPUT: nothing
287294

src/sage/libs/eclib/mwrank.pyx

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -992,29 +992,11 @@ cdef class _two_descent:
992992
points. Useful as a faster way of getting an upper bound on
993993
the rank.
994994
995-
- ``firstlim`` -- integer (default: 20); naive height bound on
996-
first point search on quartic homogeneous spaces (before
997-
testing local solubility; very simple search with no
998-
overheads).
999-
1000-
- ``secondlim`` -- integer (default: 8); naive height bound on
1001-
second point search on quartic homogeneous spaces (after
1002-
testing local solubility; sieve-assisted search)
1003-
1004-
- ``n_aux`` -- integer (default: -1); if positive, the number of
1005-
auxiliary primes used in sieve-assisted search for quartics.
1006-
If -1 (the default) use a default value (set in the eclib
1007-
code in ``src/qrank/mrank1.cc`` in DEFAULT_NAUX: currently 8).
1008-
Only relevant for curves with no 2-torsion, where full
1009-
2-descent is carried out. Worth increasing for curves
1010-
expected to be of rank > 6 to one or two more than the
1011-
expected rank.
1012-
1013-
- ``second_descent`` -- integer (default: 1); flag specifying
1014-
whether or not a second descent will be carried out (yes if
1015-
1, the default; no if 0). Only relevant for curves with
1016-
2-torsion. Recommended left as the default except for
1017-
experts interested in details of Selmer groups.
995+
- ``firstlim``, ``secondlim``, ``n_aux``, ``second_descent`` --
996+
see ``first_limit``, ``second_limit``, ``n_aux``, ``second_descent``
997+
respectively in :meth:`~sage.libs.eclib.interface.mwrank_EllipticCurve.two_descent`
998+
(although ``second_descent`` here is ``1`` or ``0`` instead of ``True`` or ``False``
999+
respectively)
10181000
10191001
OUTPUT: none
10201002

src/sage/modules/free_module_element.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4047,7 +4047,7 @@ cdef class FreeModuleElement(Vector): # abstract base class
40474047
Differentiate with respect to var by differentiating each element
40484048
with respect to var.
40494049

4050-
.. seealso:
4050+
.. SEEALSO::
40514051

40524052
:meth:`derivative`
40534053

src/sage/schemes/elliptic_curves/ell_rational_field.py

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -808,16 +808,8 @@ def two_descent(self, verbose=True,
808808
809809
- ``selmer_only`` -- boolean (default: ``False``); selmer_only switch
810810
811-
- ``first_limit`` -- (default: 20) firstlim is bound
812-
on x+z second_limit- (default: 8) secondlim is bound on log max
813-
x,z , i.e. logarithmic
814-
815-
- ``n_aux`` -- (default: -1) n_aux only relevant for
816-
general 2-descent when 2-torsion trivial; n_aux=-1 causes default
817-
to be used (depends on method)
818-
819-
- ``second_descent`` -- (default: ``True``)
820-
second_descent only relevant for descent via 2-isogeny
811+
- ``first_limit``, ``second_limit``, ``n_aux``, ``second_descent`` --
812+
see :meth:`~sage.libs.eclib.interface.mwrank_EllipticCurve.two_descent`
821813
822814
OUTPUT:
823815
@@ -2256,9 +2248,9 @@ def gens(self, proof=None, **kwds):
22562248
22572249
- ``algorithm`` -- one of the following:
22582250
2259-
- ``'mwrank_shell'`` -- default; call mwrank shell command
2251+
- ``'mwrank_lib'`` -- default; call mwrank C library
22602252
2261-
- ``'mwrank_lib'`` -- call mwrank C library
2253+
- ``'mwrank_shell'`` -- call mwrank shell command
22622254
22632255
- ``'pari'`` -- use ellrank in pari
22642256
@@ -2268,7 +2260,8 @@ def gens(self, proof=None, **kwds):
22682260
- ``use_database`` -- boolean (default: ``True``); if ``True``, attempts to
22692261
find curve and gens in the (optional) database
22702262
2271-
- ``descent_second_limit`` -- (default: 12) used in 2-descent
2263+
- ``descent_second_limit`` -- (default: 12) used in 2-descent. See ``second_limit``
2264+
in :meth:`~sage.libs.eclib.interface.mwrank_EllipticCurve.two_descent`
22722265
22732266
- ``sat_bound`` -- (default: 1000) bound on primes used in
22742267
saturation. If the computed bound on the index of the

0 commit comments

Comments
 (0)