summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2009-04-10 04:29:23 +0000
committerRaymond Hettinger <python@rcn.com>2009-04-10 04:29:23 +0000
commitd06358fe3e74d80f64416cd274d58aa552aa373a (patch)
tree9bd94b5b494796bd6944abee3340d742c25b28fd
parentb9f1a0c2f601fad55bfc6b4f995a1739fbc957d9 (diff)
downloadcpython-git-d06358fe3e74d80f64416cd274d58aa552aa373a.tar.gz
Clarify the table entries for combinatorics.
-rw-r--r--Doc/library/itertools.rst18
1 files changed, 11 insertions, 7 deletions
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
index c0a13050e6..98c5216a28 100644
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -65,13 +65,17 @@ 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)
- ===================================== ==================== =================================================
+ ============================================== ==================== =============================================================
+ 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
+ |
+ ``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``
+ ============================================== ==================== =============================================================
.. _itertools-functions: