gmp 0.4.0 → 0.4.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.4.1:
+  * Fixed some gem dates
+  * Added urandomm(), documentation, and tests.
+
 0.4.0:
   * Support for Windows introduced. gmp-x86-mswin32 gem should be used.
   * All tests should pass under Windows.

data/ext/gmprandstate.c

@@ -90,7 +90,7 @@ VALUE r_gmprandstatesg_new(int argc, VALUE *argv, VALUE klass)
       rb_raise(rb_eArgError, "size must be within [0..128]");
     int rv = gmp_randinit_lc_2exp_size(rs_val, size_val);
     if (rv == 0)
-      rb_raise(rb_eArgError, "could not gmp_randinit_lc_2exp_size with %d", size_val);
+      rb_raise(rb_eArgError, "could not gmp_randinit_lc_2exp_size with %lu", size_val);
   }
   
   if (free_a_val) { mpz_temp_free(a_val); }
@@ -193,7 +193,7 @@ VALUE r_gmprandstate_urandomb(VALUE self, VALUE arg)
 
   mprandstate_get_struct(self,self_val);
   
-   if (FIXNUM_P(arg)) {
+  if (FIXNUM_P(arg)) {
     mpz_make_struct_init(res, res_val);
     mpz_urandomb(res_val, self_val, FIX2INT(arg));
   } else {
@@ -203,6 +203,43 @@ VALUE r_gmprandstate_urandomb(VALUE self, VALUE arg)
   return res;
 }
 
+/*
+ * call-seq:
+ *   rand_state.urandomm(fixnum)
+ *
+ * From the GMP Manual:
+ *
+ * Generate a uniformly distributed random integer in the range 0 to
+ * fixnum-1, inclusive. 
+ */
+VALUE r_gmprandstate_urandomm(VALUE self, VALUE arg)
+{
+  MP_RANDSTATE *self_val;
+  MP_INT *res_val, *arg_val;
+  int free_arg_val = 0;
+  VALUE res;
+
+  mprandstate_get_struct(self,self_val);
+  
+  if (GMPZ_P(arg)) {
+    mpz_get_struct(arg, arg_val);
+  } else if (FIXNUM_P(arg)) {
+    mpz_temp_alloc(arg_val);
+    mpz_init_set_ui(arg_val, FIX2INT(arg));
+    free_arg_val = 1;
+  } else if (BIGNUM_P(arg)) {
+    mpz_temp_from_bignum(arg_val, arg);
+    free_arg_val = 1;
+  } else {
+    typeerror_as(ZXB, "arg");
+  }
+  
+  mpz_make_struct_init(res, res_val);
+  mpz_urandomm(res_val, self_val, arg_val);
+  if (free_arg_val) { mpz_temp_free(arg_val); }
+  
+  return res;
+}
 
 void init_gmprandstate()
 {
@@ -220,5 +257,5 @@ void init_gmprandstate()
   
   // Integer Random Numbers
   rb_define_method(cGMP_RandState, "urandomb", r_gmprandstate_urandomb, 1);
-  
+  rb_define_method(cGMP_RandState, "urandomm", r_gmprandstate_urandomm, 1);
 }

data/ext/ruby_gmp.h

@@ -224,6 +224,7 @@ extern VALUE r_gmprandstate_seed(VALUE self, VALUE arg);
 
 // Integer Random Numbers
 extern VALUE r_gmprandstate_urandomb(VALUE self, VALUE arg);
+extern VALUE r_gmprandstate_urandomm(VALUE self, VALUE arg);
 
 
 /* from gmpbench_timing.c */

data/manual.tex

@@ -28,8 +28,8 @@
 \huge{gmp} &\\
 \midrule[3pt]
 \multicolumn{2}{r}{\large{Ruby bindings to the GMP library}}\\
-\multicolumn{2}{r}{\large{Edition 0.4.0}}\\
-\multicolumn{2}{r}{\large{26 February 2010}}
+\multicolumn{2}{r}{\large{Edition 0.4.1}}\\
+\multicolumn{2}{r}{\large{1 March 2010}}
 \end{tabular}
 
 \vfill

data/test/tc_random.rb

@@ -22,6 +22,25 @@ class TC_Random < Test::Unit::TestCase
     end
   end
   
+  def test_urandomm
+    @a = GMP::RandState.new
+    @a.seed(8675309)
+    g1 = [21, 849, 6428, 7329, 288845, 7712337,  9, 613, 5710, 3880, 246305, 9623186,
+          22,  47, 5055, 5189,  32571, 2585012, 19, 415, 4940, 3658, 248890, 2180120]
+    n1 = [32, 1024, 6563, 11213, 362880, 9699690]
+    g1.size.times do |i|
+      assert_equal(g1[i], @a.urandomm(n1[i%6]), "GMP::RandState should urandomm predictably.")
+    end
+    
+    @b = GMP::RandState.new
+    @b.seed(67898771)
+    g2 = [    1,     2,     3,    182,    393,  1232,    238,   10168,  10671,   28310,
+          72259, 70015, 27964, 363191, 371324, 66644, 188620, 1241121, 263944, 1357676]
+    g2.size.times do |i|
+      assert_equal(g2[i], @b.urandomm(GMP::Z(i**5+5)), "GMP::RandState should urandomb predictably.")
+    end
+  end
+  
   def test_reseed
     @c = GMP::RandState.new
     @c.seed(1000)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gmp
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Tomasz Wegrzanowski
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-03 00:00:00 -07:00
+date: 2010-03-01 00:00:00 -07:00
 default_executable: 
 dependencies: []