1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* array.c (rb_ary_repeated_permutation): Support for repeated_permutation.size

Browse Source 
[Feature #6636]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37503 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2012-11-06 17:11:36 +00:00
parent 6bbf668d6e
commit 68c90c4a2d
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
array.c
View File

@ -26,7 +26,7 @@
VALUE rb_cArray; VALUE rb_cArray;
static ID id_cmp, id_div; static ID id_cmp, id_div, id_power;
#define ARY_DEFAULT_SIZE 16 #define ARY_DEFAULT_SIZE 16
#define ARY_MAX_SIZE (LONG_MAX / (int)sizeof(VALUE)) #define ARY_MAX_SIZE (LONG_MAX / (int)sizeof(VALUE))
@ -4552,6 +4552,19 @@ rpermute0(long n, long r, long *p, long index, VALUE values)
} }
} }
static VALUE
rb_ary_repeated_permutation_size(VALUE ary, VALUE args)
{
long n = RARRAY_LEN(ary);
long k = NUM2LONG(RARRAY_PTR(args)[0]);
if (k < 0) {
return LONG2FIX(0);
}
return rb_funcall(LONG2NUM(n), id_power, 1, LONG2NUM(k));
}
/* /*
* call-seq: * call-seq:
* ary.repeated_permutation(n) { |p| block } -> ary * ary.repeated_permutation(n) { |p| block } -> ary
@ -4581,7 +4594,7 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num)
long r, n, i; long r, n, i;
n = RARRAY_LEN(ary); /* Array length */ n = RARRAY_LEN(ary); /* Array length */
RETURN_ENUMERATOR(ary, 1, &num); /* Return Enumerator if no block */ RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_repeated_permutation_size); /* Return Enumerator if no block */
r = NUM2LONG(num); /* Permutation size from argument */ r = NUM2LONG(num); /* Permutation size from argument */
if (r < 0) { if (r < 0) {
@ -5262,4 +5275,5 @@ Init_Array(void)
id_cmp = rb_intern("<=>"); id_cmp = rb_intern("<=>");
sym_random = ID2SYM(rb_intern("random")); sym_random = ID2SYM(rb_intern("random"));
id_div = rb_intern("div"); id_div = rb_intern("div");
id_power = rb_intern("**");
} }

4
test/ruby/test_enumerator.rb
View File

@ -446,6 +446,10 @@ class TestEnumerator < Test::Unit::TestCase
assert_equal 28258808871162574166368460400, assert_equal 28258808871162574166368460400,
(1..100).to_a.combination(42).size (1..100).to_a.combination(42).size
# 1.upto(100).inject(:*) / 1.upto(42).inject(:*) / 1.upto(58).inject(:*) # 1.upto(100).inject(:*) / 1.upto(42).inject(:*) / 1.upto(58).inject(:*)
check_consistency_for_combinatorics(:repeated_permutation)
assert_equal 291733167875766667063796853374976,
(1..42).to_a.repeated_permutation(20).size # 42 ** 20
end end
end end