gmp 0.4.0-x86-mingw32 → 0.4.1-x86-mingw32

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/benchmark/runbench.rb

@@ -0,0 +1,165 @@
+#! /usr/bin/env ruby
+
+# Copyright 2003 Free Software Foundation, Inc.
+
+# This file is part of the GNU GMPbench.
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place - Suite 330, Boston, MA 02111-1307, USA.
+
+class String
+  def bs
+    gsub("/", "\\")
+  end
+
+  def sh_interpolate
+    gsub(/\$([A-Z]+)/) { |s| ENV[$1] }
+  end
+end
+
+puts "***** GMPbench version 0.2 *****"
+
+no_compile = false
+default = false
+gnu_bin = "/cygwin/bin/"
+gnu_bin = "/Ruby19/devkit/msys/1.0.11/bin/"
+
+while ARGV[0] =~ /^-/
+  case ARGV[0]
+  when "-g" then gnu_bin = ARGV[1]; ARGV.shift; ARGV.shift
+  when "-n" then no_compile = true;    ARGV.shift
+  else ARGV.shift
+  end
+end
+
+if RUBY_VERSION =~ /mingw/ and !( ENV["PATH"] =~ /;\.$|^\.;|;\.;/ )
+  ENV["PATH"] += ";."
+end
+
+if no_compile
+  puts "Suppressing compilation"
+else
+  unless ENV["CFLAGS"]
+    ENV["CFLAGS"] = "-O3 -fomit-frame-pointer"
+    puts "Using default CFLAGS = \"$CFLAGS\"".sh_interpolate
+    default = true
+  else
+    puts "Using CFLAGS = \"$CFLAGS\" from your environment".sh_interpolate
+  end
+  unless ENV["CC"]
+    ENV["CC"] = "gcc"
+    puts "Using default CC = \"$CC\"".sh_interpolate
+    default = true
+  else
+    puts "Using CC = \"$CC\" from your environment".sh_interpolate
+  end
+  unless ENV["LIBS"]
+    ENV["LIBS"] = "-static -lgmp"
+    puts "Using default LIBS = \"$LIBS\"".sh_interpolate
+    default = true
+  else
+    puts "Using LIBS = \"$LIBS\" from your environment".sh_interpolate
+  end
+
+  puts "Using compilation command: $CC $CFLAGS foo.c -o foo $LIBS".sh_interpolate
+  if default
+    puts "You may want to override CC, CFLAGS, and LIBS"
+  end
+
+  `#{"$CC $CFLAGS gmpver.c $LIBS".sh_interpolate}`
+  puts "Using `./a.out`"
+
+  puts "Compiling benchmarks"
+  `#{"$CC $CFLAGS gcd.c -o gcd $LIBS".sh_interpolate}`
+  `#{"$CC $CFLAGS gcdext.c -o gcdext $LIBS".sh_interpolate}`
+  `#{"$CC $CFLAGS multiply.c -o multiply $LIBS".sh_interpolate}`
+  `#{"$CC $CFLAGS divide.c -o divide $LIBS".sh_interpolate}`
+  `#{"$CC $CFLAGS rsa.c -o rsa $LIBS".sh_interpolate}`
+  `#{"$CC $CFLAGS pi.c -o pi $LIBS -lm".sh_interpolate}`
+end
+
+multiply_args   = "128 512 8192 131072 2097152 128,128 512,512 8192,8192 " +
+                  "131072,131072 2097152,2097152 15000,10000 20000,10000 " +
+                  "30000,10000 16777216,512 16777216,262144"
+multiply_weight = 1
+
+divide_args     = "8192,32 8192,64 8192,128 8192,4096 131072,65536 " +
+                  "8388608,4194304 8192,8064 16777216,262144"
+divide_weight   = 1
+
+gcd_args        = "128,128 512,512 8192,8192 131072,131072 1048576,1048576"
+gcd_weight      = 0.5
+
+gcdext_args     = "128,128 512,512 8192,8192 131072,131072 1048576,1048576"
+gcdext_weight   = 0.5
+
+rsa_args        = "512 1024 2048"
+rsa_weight      = 1
+
+pi_args         = "10000 100000 1000000"
+pi_weight       = 1
+
+#base_tests      = "multiply divide gcd gcdext"
+base_tests      = "multiply divide gcd"
+#app_tests       = "rsa pi"
+app_tests       = "rsa"
+
+tests           = "base app"
+
+puts "Running benchmarks (propagated score accuracy exceeds printed intermediates)"
+
+acc2 = 1
+n2   = 0
+tests.split(" ").each do |cat|
+  puts "  Category #{cat}"
+  tests = eval "#{cat}_tests"
+
+  acc1 = 1
+  n1   = 0
+  tests.split(" ").each do |t|
+    weight = eval "#{t}_weight"
+    puts "    Program #{t} (weight=#{weight})"
+    args   = eval "#{t}_args"
+
+    acc = 1
+    n   = 0
+    args.split(" ").each do |a|
+      ta  = `echo #{a} | #{gnu_bin}sed 's;,; ;g'`.chomp
+      printf '      %-48s', "GMPbench.#{cat}.#{t}(#{a})"
+      `ruby #{t} #{ta} > "RES-#{t}-#{a}"`
+      sed_cmd = "#{gnu_bin}sed 's;^RESULT: \\([0-9.]*\\).*$;\\1;'"
+      res_cmd = "#{gnu_bin}grep \"^RESULT\" RES-#{t}-#{a} | #{sed_cmd}"
+      res = `#{res_cmd}`
+      printf "%12s\n", `gexpr -prec 4 "#{res}"`.chomp
+      acc = `gexpr -prec 10 "#{acc} * #{res}"`
+      n   = `gexpr #{n}+1`
+    end
+
+	out  = `gexpr -prec 10 "#{acc}^(1/#{n})"`
+	printf "    %-40s%12s\n", "GMPbench.#{cat}.#{t}", `gexpr -prec 5 "#{out}"`
+	acc1 = `gexpr -prec 10 "#{acc1} * #{out}^#{weight}"`
+	n1   = `gexpr #{n1}+#{weight}`
+  end
+
+  out  = `gexpr -prec 10 "#{acc1}^(1/#{n1})"`
+  printf "  %-32s%12s\n", "GMPbench.#{cat}", `gexpr -prec 5 "#{out}"`
+  acc2 = `gexpr -prec 10 "#{acc2} * #{out}"`
+  n2   = `gexpr #{n2}+1`
+end
+
+
+out = `gexpr "#{acc2}^(1/#{n2})"`
+puts "GMPbench:         #{out}"
+
+exit 0

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: x86-mingw32
 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: []
 
@@ -71,12 +71,13 @@ files:
 - benchmark/COPYING
 - benchmark/divide
 - benchmark/gcd
-- benchmark/gexpr
 - benchmark/gexpr.c
+- benchmark/gexpr.exe
 - benchmark/multiply
 - benchmark/README
 - benchmark/rsa
 - benchmark/runbench
+- benchmark/runbench.rb
 - benchmark/version
 - CHANGELOG
 - INSTALL