From f368fbc24e1b3a554068774745761d2876443e9a Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Fri, 10 Apr 2009 04:25:45 +0000 Subject: Clarify the table entries for combinatorics. --- Doc/library/itertools.rst | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst index 0b79072..85baaa3 100644 --- a/Doc/library/itertools.rst +++ b/Doc/library/itertools.rst @@ -66,14 +66,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: -- cgit v0.12