[前][次][番号順一覧][スレッド一覧]

ruby-changes:6976

From: matz <ko1@a...>
Date: Mon, 11 Aug 2008 19:01:02 +0900 (JST)
Subject: [ruby-changes:6976] Ruby:r18494 (trunk): * array.c (rb_ary_sample): rename #choice to #sample. in

matz	2008-08-11 19:00:47 +0900 (Mon, 11 Aug 2008)

  New Revision: 18494

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18494

  Log:
    * array.c (rb_ary_sample): rename #choice to #sample.  in
      addition, sample takes optional argument, a la #first.

  Modified files:
    trunk/ChangeLog
    trunk/array.c
    trunk/test/ruby/test_array.rb

Index: array.c
===================================================================
--- array.c	(revision 18493)
+++ array.c	(revision 18494)
@@ -2998,21 +2998,48 @@
 
 /*
  *  call-seq:
- *     array.choice        -> obj
+ *     array.sample        -> obj
+ *     array.sample(n)     -> an_array
  *  
- *  Choose a random element from an array.
+ *  Choose a random element, or the random +n+ elements, fron the array.
+ *  If the array is empty, the first form returns <code>nil</code>, and the
+ *  second form returns an empty array.
+ *  
  */
 
 
 static VALUE
-rb_ary_choice(VALUE ary)
+rb_ary_sample(int argc, VALUE *argv, VALUE ary)
 {
-    long i, j;
+    VALUE nv, result;
+    int n, len, i, j;
 
-    i = RARRAY_LEN(ary);
-    if (i == 0) return Qnil;
-    j = rb_genrand_real()*i;
-    return RARRAY_PTR(ary)[j];
+    len = RARRAY_LEN(ary); 
+    if (argc == 0) {
+	if (len == 0) return Qnil;
+	i = rb_genrand_real()*len;
+	return RARRAY_PTR(ary)[i];
+    }
+    rb_scan_args(argc, argv, "1", &nv);
+    if (len == 0) return rb_ary_new2(0);
+    n = NUM2INT(nv);
+    result = rb_ary_new2(n);
+    for (i=0; i<n; i++) {
+      retry:
+	j = rb_genrand_real()*len;
+	nv = LONG2NUM(j);
+	for (j=0; j<i; j++) {
+	    if (RARRAY_PTR(result)[j] == nv)
+		goto retry;
+	}
+	RARRAY_PTR(result)[i] = nv;
+	ARY_SET_LEN(result, i+1);
+    }
+    for (i=0; i<n; i++) {
+	nv = RARRAY_PTR(result)[i];
+	RARRAY_PTR(result)[i] = RARRAY_PTR(ary)[NUM2LONG(nv)];
+    }
+    return result;
 }
 
 
@@ -3526,7 +3553,7 @@
     rb_define_method(rb_cArray, "count", rb_ary_count, -1);
     rb_define_method(rb_cArray, "shuffle!", rb_ary_shuffle_bang, 0);
     rb_define_method(rb_cArray, "shuffle", rb_ary_shuffle, 0);
-    rb_define_method(rb_cArray, "choice", rb_ary_choice, 0);
+    rb_define_method(rb_cArray, "sample", rb_ary_sample, -1);
     rb_define_method(rb_cArray, "cycle", rb_ary_cycle, -1);
     rb_define_method(rb_cArray, "permutation", rb_ary_permutation, -1);
     rb_define_method(rb_cArray, "combination", rb_ary_combination, 1);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18493)
+++ ChangeLog	(revision 18494)
@@ -1,3 +1,8 @@
+Mon Aug 11 18:57:38 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* array.c (rb_ary_sample): rename #choice to #sample.  in
+	  addition, sample takes optional argument, a la #first.
+
 Mon Aug 11 18:28:02 2008  Narihiro Nakamura  <authorNari@g...>
 
 	* gc.c: added GC::Profiler.
Index: test/ruby/test_array.rb
===================================================================
--- test/ruby/test_array.rb	(revision 18493)
+++ test/ruby/test_array.rb	(revision 18494)
@@ -1518,9 +1518,13 @@
     end
   end
 
-  def test_choice
+  def test_sample
     100.times do
-      assert([0, 1, 2].include?([2, 1, 0].choice))
+      assert([0, 1, 2].include?([2, 1, 0].sample))
+      samples = [2, 1, 0].sample(2)
+      samples.each{|sample|
+        assert([0, 1, 2].include?(sample))
+      }
     end
   end
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]