Skip to content

Commit 2f48e28

Browse files
committed
More edits in index pages of combinatorics
1 parent 4afd043 commit 2f48e28

14 files changed

+71
-99
lines changed

src/sage/categories/enumerated_sets.py

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -34,49 +34,49 @@ class EnumeratedSets(CategoryWithAxiom):
3434
3535
The purpose of this category is threefold:
3636
37-
- to fix a common interface for all these sets;
38-
- to provide a bunch of default implementations;
39-
- to provide consistency tests.
37+
- to fix a common interface for all these sets;
38+
- to provide a bunch of default implementations;
39+
- to provide consistency tests.
4040
4141
The standard methods for an enumerated set ``S`` are:
4242
43-
- ``S.cardinality()`` -- the number of elements of the set. This
44-
is the equivalent for ``len`` on a list except that the
45-
return value is specified to be a Sage :class:`Integer` or
46-
``infinity``, instead of a Python ``int``.
43+
- ``S.cardinality()`` -- the number of elements of the set. This
44+
is the equivalent for ``len`` on a list except that the
45+
return value is specified to be a Sage :class:`Integer` or
46+
``infinity``, instead of a Python ``int``.
4747
48-
- ``iter(S)`` -- an iterator for the elements of the set;
48+
- ``iter(S)`` -- an iterator for the elements of the set;
4949
50-
- ``S.list()`` -- a fresh list of the elements of the set, when
51-
possible; raises a :exc:`NotImplementedError` if the list is
52-
predictably too large to be expanded in memory.
50+
- ``S.list()`` -- a fresh list of the elements of the set, when
51+
possible; raises a :exc:`NotImplementedError` if the list is
52+
predictably too large to be expanded in memory.
5353
54-
- ``S.tuple()`` -- a tuple of the elements of the set, when
55-
possible; raises a :exc:`NotImplementedError` if the tuple is
56-
predictably too large to be expanded in memory.
54+
- ``S.tuple()`` -- a tuple of the elements of the set, when
55+
possible; raises a :exc:`NotImplementedError` if the tuple is
56+
predictably too large to be expanded in memory.
5757
58-
- ``S.unrank(n)`` -- the ``n``-th element of the set when ``n`` is a sage
59-
``Integer``. This is the equivalent for ``l[n]`` on a list.
58+
- ``S.unrank(n)`` -- the ``n``-th element of the set when ``n`` is a sage
59+
``Integer``. This is the equivalent for ``l[n]`` on a list.
6060
61-
- ``S.rank(e)`` -- the position of the element ``e`` in the set;
62-
This is equivalent to ``l.index(e)`` for a list except that
63-
the return value is specified to be a Sage :class:`Integer`,
64-
instead of a Python ``int``.
61+
- ``S.rank(e)`` -- the position of the element ``e`` in the set;
62+
This is equivalent to ``l.index(e)`` for a list except that
63+
the return value is specified to be a Sage :class:`Integer`,
64+
instead of a Python ``int``.
6565
66-
- ``S.first()`` -- the first object of the set; it is equivalent to
67-
``S.unrank(0)``.
66+
- ``S.first()`` -- the first object of the set; it is equivalent to
67+
``S.unrank(0)``.
6868
69-
- ``S.next(e)`` -- the object of the set which follows ``e``; it is
70-
equivalent to ``S.unrank(S.rank(e) + 1)``.
69+
- ``S.next(e)`` -- the object of the set which follows ``e``; it is
70+
equivalent to ``S.unrank(S.rank(e) + 1)``.
7171
72-
- ``S.random_element()`` -- a random generator for an element of
73-
the set. Unless otherwise stated, and for finite enumerated
74-
sets, the probability is uniform.
72+
- ``S.random_element()`` -- a random generator for an element of
73+
the set. Unless otherwise stated, and for finite enumerated
74+
sets, the probability is uniform.
7575
7676
For examples and tests see:
7777
78-
- ``FiniteEnumeratedSets().example()``
79-
- ``InfiniteEnumeratedSets().example()``
78+
- ``FiniteEnumeratedSets().example()``
79+
- ``InfiniteEnumeratedSets().example()``
8080
8181
EXAMPLES::
8282

src/sage/combinat/affine_permutation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# sage.doctest: needs sage.combinat sage.groups
22
r"""
3-
Affine Permutations
3+
Affine permutations
44
"""
55

66
# ****************************************************************************

src/sage/combinat/combinat.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ def narayana_number(n: Integer, k: Integer) -> Integer:
464464
465465
- ``n`` -- integer
466466
467-
- ``k`` -- integer between ``0`` and ``n - 1``
467+
- ``k`` -- integer between `0` and `n - 1`
468468
469469
OUTPUT: integer
470470
@@ -762,8 +762,6 @@ def lucas_number2(n, P, Q):
762762
`L^{(2)}_2 = P` and the recurrence relation
763763
`L^{(2)}_{n+2} = P \cdot L^{(2)}_{n+1} - Q \cdot L^{(2)}_n`.
764764
765-
Wraps GAP's Lucas(...)[2].
766-
767765
INPUT:
768766
769767
- ``n`` -- integer
@@ -1683,10 +1681,10 @@ def _tuples_native(S, k):
16831681

16841682
def number_of_tuples(S, k, algorithm='naive') -> Integer:
16851683
"""
1686-
Return the size of ``tuples(S, k)`` when `S` is a set. More
1687-
generally, return the size of ``tuples(set(S), k)``. (So,
1688-
unlike :meth:`tuples`, this method removes redundant entries from
1689-
`S`.)
1684+
Return the size of ``tuples(S, k)`` for a set `S`.
1685+
1686+
`S` is first converted to a set. Hence, unlike :meth:`tuples`, this method
1687+
removes redundant entries from `S`.
16901688
16911689
INPUT:
16921690

src/sage/combinat/dlx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Exact Cover Problem via Dancing Links
2+
Exact cover problem via dancing links
33
"""
44
# dlx.py
55
# Copyright (c) 2006,2008 Antti Ajanki <[email protected]>

src/sage/combinat/dyck_word.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
r"""
2-
Dyck Words
2+
Dyck words
33
44
A class of an object enumerated by the
55
:func:`Catalan numbers<sage.combinat.combinat.catalan_number>`,

src/sage/combinat/enumerated_sets.py

Lines changed: 15 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
"""
22
Enumerated sets and combinatorial objects
33
4-
.. TODO:: Proofread / point to the main classes rather than the modules
5-
6-
Categories
7-
----------
8-
9-
- :class:`EnumeratedSets`, :class:`FiniteEnumeratedSets`
10-
114
Basic enumerated sets
125
---------------------
136
@@ -46,8 +39,8 @@
4639
- :ref:`sage.combinat.debruijn_sequence`
4740
- :ref:`sage.combinat.shuffle`
4841
49-
Permutations, ...
50-
-----------------
42+
Permutations and arrangements
43+
-----------------------------
5144
5245
- :ref:`sage.combinat.permutation`
5346
- :ref:`sage.combinat.permutation_cython`
@@ -63,18 +56,13 @@
6356
- :ref:`sage.combinat.integer_vectors_mod_permgroup`
6457
- :ref:`sage.combinat.rsk`
6558
66-
Partitions, tableaux, ...
67-
-------------------------
68-
69-
See: :ref:`sage.combinat.catalog_partitions`
70-
7159
Polyominoes
7260
-----------
7361
74-
See: :ref:`sage.combinat.parallelogram_polyomino`
62+
- :ref:`sage.combinat.parallelogram_polyomino`
7563
76-
Integer matrices, ...
77-
---------------------
64+
Integer matrices and arrays
65+
---------------------------
7866
7967
- :ref:`sage.combinat.integer_matrices`
8068
- :ref:`sage.combinat.matrices.hadamard_matrix`
@@ -85,11 +73,6 @@
8573
- :ref:`sage.combinat.restricted_growth`
8674
- :ref:`sage.combinat.vector_partition`
8775
88-
.. SEEALSO::
89-
90-
- :class:`MatrixSpace`
91-
- :ref:`sage.groups.matrix_gps.catalog`
92-
9376
Subsets and set partitions
9477
--------------------------
9578
@@ -117,33 +100,24 @@
117100
- :ref:`sage.combinat.graph_path`
118101
- :ref:`sage.combinat.perfect_matching`
119102
120-
Backtracking solvers and generic enumerated sets
121-
------------------------------------------------
103+
Miscellaneous enumerated sets
104+
-----------------------------
122105
123-
.. TODO::
106+
- :class:`~sage.combinat.integer_lists.invlex.IntegerListsLex`
107+
- :class:`~sage.combinat.integer_vectors_mod_permgroup.IntegerVectorsModPermutationGroup`
108+
- :ref:`sage.combinat.gray_codes`
109+
- :class:`~sage.combinat.gelfand_tsetlin_patterns.GelfandTsetlinPattern`, :class:`~sage.combinat.gelfand_tsetlin_patterns.GelfandTsetlinPatterns`
110+
- :class:`~sage.combinat.knutson_tao_puzzles.KnutsonTaoPuzzleSolver`
111+
- :func:`LatticePolytope`
124112
125-
Do we want a separate section, possibly more proeminent, for
126-
backtracking solvers?
113+
Backtracking solvers
114+
--------------------
127115
128116
- :func:`~sage.sets.recursively_enumerated_set.RecursivelyEnumeratedSet`
129117
- :class:`~sage.combinat.backtrack.GenericBacktracker`
130118
- :mod:`sage.parallel.map_reduce`
131119
- :ref:`sage.combinat.tiling`
132120
- :ref:`sage.combinat.dlx`
133121
- :ref:`sage.combinat.matrices.dlxcpp`
134-
- :ref:`sage.combinat.species.all`
135-
- :class:`~sage.combinat.integer_lists.IntegerListsLex`
136-
- :class:`~sage.combinat.integer_vectors_mod_permgroup.IntegerVectorsModPermutationGroup`
137-
138-
Low level enumerated sets
139-
-------------------------
140-
141-
- :ref:`sage.combinat.gray_codes`
142-
143-
Misc enumerated sets
144-
--------------------
145122
146-
- :class:`~sage.combinat.gelfand_tsetlin_patterns.GelfandTsetlinPattern`, :class:`~sage.combinat.gelfand_tsetlin_patterns.GelfandTsetlinPatterns`
147-
- :class:`~sage.combinat.knutson_tao_puzzles.KnutsonTaoPuzzleSolver`
148-
- :func:`LatticePolytope`
149123
"""

src/sage/combinat/parking_functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
r"""
2-
Parking Functions
2+
Parking functions
33
44
INFORMALLY (reference [Beck]_):
55

src/sage/combinat/ribbon_tableau.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
r"""
2-
Ribbon Tableaux
2+
Ribbon tableaux
33
"""
44
# ****************************************************************************
55
# Copyright (C) 2007 Mike Hansen <[email protected]>,

src/sage/combinat/skew_partition.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
r"""
2-
Skew Partitions
2+
Skew partitions
33
44
A skew partition ``skp`` of size `n` is a pair of
55
partitions `[p_1, p_2]` where `p_1` is a

src/sage/combinat/skew_tableau.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
r"""
2-
Skew Tableaux
2+
Skew tableaux
33
44
AUTHORS:
55

src/sage/combinat/superpartition.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
r"""
2-
Super Partitions
3-
4-
AUTHORS:
5-
6-
- Mike Zabrocki
2+
Super partitions
73
84
A super partition of size `n` and fermionic sector `m` is a
95
pair consisting of a strict partition of some integer `r` of
@@ -62,6 +58,10 @@
6258
REFERENCES:
6359
6460
- [JL2016]_
61+
62+
AUTHORS:
63+
64+
- Mike Zabrocki
6565
"""
6666

6767
# ****************************************************************************

src/sage/combinat/tiling.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# sage.doctest: needs sage.combinat sage.modules
22
r"""
3-
Tiling Solver
3+
Tiling solver
44
5-
Tiling a n-dimensional polyomino with n-dimensional polyominoes.
5+
Tiling a `n`-dimensional polyomino with n-dimensional polyominoes.
66
77
This module defines two classes:
88

src/sage/combinat/words/all.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
1616
Main classes and functions meant to be used by the user:
1717
18-
:func:`~sage.combinat.words.word.Word`,
19-
:class:`~sage.combinat.words.words.FiniteWords`,
20-
:class:`~sage.combinat.words.words.InfiniteWords`,
21-
:func:`~sage.combinat.words.words.Words`,
22-
:func:`~sage.combinat.words.alphabet.Alphabet`,
23-
:class:`~sage.combinat.words.morphism.WordMorphism`,
24-
:class:`~sage.combinat.words.paths.WordPaths`.
18+
:func:`~sage.combinat.words.word.Word`,
19+
:class:`~sage.combinat.words.words.FiniteWords`,
20+
:class:`~sage.combinat.words.words.InfiniteWords`,
21+
:func:`~sage.combinat.words.words.Words`,
22+
:func:`~sage.combinat.words.alphabet.Alphabet`,
23+
:class:`~sage.combinat.words.morphism.WordMorphism`,
24+
:class:`~sage.combinat.words.paths.WordPaths`.
2525
2626
A list of common words can be accessed through ``words.<tab>`` and are listed in
2727
the :ref:`words catalog <sage.combinat.words.word_generators>`.

src/sage/combinat/words/suffix_trees.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
r"""
2-
Suffix Tries and Suffix Trees
2+
Suffix tries and Suffix trees
33
"""
44
# ****************************************************************************
55
# Copyright (C) 2008 Franco Saliola <[email protected]>

0 commit comments

Comments
 (0)