summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2009-04-10 04:27:37 (GMT)
committerRaymond Hettinger <python@rcn.com>2009-04-10 04:27:37 (GMT)
commit175cb23bb9796cc2e0cfe6b33b3fa6c1b89c4912 (patch)
treedf8b498a62ad0fe1dfbc0c65782cfe41949bae33 /Doc/library
parentbf1537cd3cb96d8fec624aaff91b7c6de55c13d8 (diff)
downloadcpython-175cb23bb9796cc2e0cfe6b33b3fa6c1b89c4912.zip
cpython-175cb23bb9796cc2e0cfe6b33b3fa6c1b89c4912.tar.gz
cpython-175cb23bb9796cc2e0cfe6b33b3fa6c1b89c4912.tar.bz2
Clarify the table entries for combinatorics.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/itertools.rst21
1 files changed, 13 insertions, 8 deletions
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
index 2cfc779..68ce02c 100644
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -61,14 +61,19 @@ operator can be mapped across two vectors to form an efficient dot-product:
**Combinatoric generators:**
- ===================================== ==================== =================================================
- Iterator Arguments Results
- ===================================== ==================== =================================================
- :func:`product` p, q, ... [repeat=1] cartesian product
- :func:`permutations` p[, r] r-length permutations (without repeated elements)
- :func:`combinations` p[, r] r-length combinations (sorted and no repeats)
- :func:`combinations_with_replacement` p[, r] r-length combinations (sorted but with repeats)
- ===================================== ==================== =================================================
+ ============================================== ==================== =============================================================
+ Iterator Arguments Results
+ ============================================== ==================== =============================================================
+ :func:`product` p, q, ... [repeat=1] cartesian product, equivalent to a nested for-loop
+ :func:`permutations` p[, r] r-length tuples, all possible orderings, no repeated elements
+ :func:`combinations` p[, r] r-length tuples, in sorted order, no repeated elements
+ :func:`combinations_with_replacement` p[, r] r-length tuples, in sorted order, with repeated elements
+ |
+ ``product('ABCD', repeat=2)`` ``AA AB AC AD BA BB BC BD CA CB CC CD DA DB DC DD``
+ ``permutations('ABCD', 2)`` ``AB AC AD BA BC BD CA CB CD DA DB DC``
+ ``combinations('ABCD', 2)`` ``AB AC AD BC BD CD``
+ ``combinations_with_replacement('ABCD', 2)`` ``AA AB AC AD BB BC BD CC CD DD``
+ ============================================== ==================== =============================================================
.. _itertools-functions: