Skip to content

Commit

Permalink
* array.c (rb_ary_repeated_combination): Support for repeated_combina…
Browse files Browse the repository at this point in the history
…tion.size

  [Feature ruby#6636]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
marcandre committed Nov 6, 2012
1 parent 68c90c4 commit ba59365
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
13 changes: 12 additions & 1 deletion array.c
Original file line number Diff line number Diff line change
Expand Up @@ -4645,6 +4645,17 @@ rcombinate0(long n, long r, long *p, long index, long rest, VALUE values)
}
}

static VALUE
rb_ary_repeated_combination_size(VALUE ary, VALUE args)
{
long n = RARRAY_LEN(ary);
long k = NUM2LONG(RARRAY_PTR(args)[0]);
if (k == 0) {
return LONG2FIX(1);
}
return binomial_coefficient(k, n + k - 1);
}

/*
* call-seq:
* ary.repeated_combination(n) { |c| block } -> ary
Expand Down Expand Up @@ -4678,7 +4689,7 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
long n, i, len;

n = NUM2LONG(num); /* Combination size from argument */
RETURN_ENUMERATOR(ary, 1, &num); /* Return Enumerator if no block */
RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_repeated_combination_size); /* Return enumerator if no block */
len = RARRAY_LEN(ary);
if (n < 0) {
/* yield nothing */
Expand Down
5 changes: 5 additions & 0 deletions test/ruby/test_enumerator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,11 @@ def test_size_for_array_combinatorics
check_consistency_for_combinatorics(:repeated_permutation)
assert_equal 291733167875766667063796853374976,
(1..42).to_a.repeated_permutation(20).size # 42 ** 20

check_consistency_for_combinatorics(:repeated_combination)
assert_equal 28258808871162574166368460400,
(1..59).to_a.repeated_combination(42).size
# 1.upto(100).inject(:*) / 1.upto(42).inject(:*) / 1.upto(58).inject(:*)
end
end

0 comments on commit ba59365

Please sign in to comment.