gmp 0.4.1-x86-mingw32 → 0.4.3-x86-mingw32

data/CHANGELOG

@@ -1,6 +1,20 @@
+0.4.3:
+  * Support for MPFR on Windows introduced. gmp-x86-mswin32 gem should be used.
+  * Removed compilation warnings when using MPFR
+  * Added constants GMP::GMP_CC, GMP::GMP_CFLAGS, and GMP::GMP_BITS_PER_LIMB.
+  * Added constant GMP::MPFR_VERSION.
+  * Added MPFR rounding constants. These will be changed soon though.
+  * Added MPFR tests adapted straight from the MPFR library, just tsqrt so far.
+  * Added 3x MPFR functions: sec(), csc(), cot().
+  * Added function existence tests from
+  * Unit test results: 78 tests, 1025 assertions, 0 failures, 0 errors
+  * Unit test results: 72 tests, 593 assertions, 0 failures, 0 errors  (w/o MPFR)
+
 0.4.1:
   * Fixed some gem dates
+  * Fixed gmp.so in x86-mswin32 gem
   * Added urandomm(), documentation, and tests.
+  * Unit test results: 70 tests, 577 assertions, 0 failures, 0 errors
 
 0.4.0:
   * Support for Windows introduced. gmp-x86-mswin32 gem should be used.

data/README.rdoc

@@ -63,7 +63,8 @@ by me: gmp gem 0.4.0 on:
   |                                     | (MRI) Ruby 1.9.1  |           |
   +-------------------------------------+-------------------+-----------+
 
-<b>Note:</b> To get this running on Mac OS X (32-bit), I compiled GMP 4.3.1 with:
+<b>Note:</b> To get this running on Mac OS X (32-bit), I compiled GMP 4.3.1
+with:
   ./configure ABI=32 --disable-dependency-tracking
 
 =Authors
@@ -71,9 +72,25 @@ by me: gmp gem 0.4.0 on:
 * Tomasz Wegrzanowski
 * srawlins
 
+=Constants
+
+The GMP module includes the following constants. Mathematical constants, such
+as pi, are defined under class methods of GMP::F, listed below.
+
+  GMP::GMP_VERSION        #=> A string like "5.0.1"
+  GMP::GMP_CC             #=> The compiler used to compile GMP
+  GMP::GMP_CFLAGS         #=> The CFLAGS used to compile GMP
+  GMP::GMP_BITS_PER_LIMB  #=> The number of bits per limb
+  (if MPFR is available)
+  GMP::MPFR_VERSION       #=> A string like "2.4.2"
+  GMP::GMP_RNDN           #=> The constant representing "round to nearest"
+  GMP::GMP_RNDZ           #=> The constant representing "round toward zero"
+  GMP::GMP_RNDU           #=> The constant representing "round toward plus infinity"
+  GMP::GMP_RNDD           #=> The constant representing "round toward minus infinity"
+
 =Classes
 
-The module GMP is provided with following classes:
+The GMP module is provided with following classes:
 * GMP::Z - infinite precision integer numbers
 * GMP::Q - infinite precision rational numbers
 * GMP::F - arbitrary precision floating point numbers
@@ -190,19 +207,39 @@ You can also call them as:
     prec                     get precision
     floor,ceil,trunc         nearest integer, GMP::F is returned, not GMP::Z
     floor!,ceil!,trunc!      in-place nearest integer
-  GMP::F (only if MPFR is available)
-    exp                      e^object
-    expm1                    the same as (object.exp) - 1, with better
-                             precision
+  GMP::RandState
+    seed(integer)            seed the generator with a Fixnum or GMP::Z
+    urandomb(fixnum)         get uniformly distributed random number between 0
+                             and 2^fixnum-1, inclusive
+    urandomm(integer)        get uniformly distributed random number between 0
+                             and integer-1, inclusive
+  GMP (timing functions for GMPbench (0.2))
+    cputime                  milliseconds of cpu time since Ruby start
+    time                     times the execution of a block
+  
+  *only if MPFR is available*
+  class methods of GMP::F
+    const_log2               returns the natural log of 2
+    const_pi                 returns pi
+    const_euler              returns euler
+    const_catalan            returns catalan
+  GMP::F
+    sqrt                     square root of the object
+    **                       power
     log                      natural logarithm of object
     log2                     binary logarithm of object
     log10                    decimal logarithm of object
+    exp                      e^object
     log1p                    the same as (object + 1).log, with better
                              precision
-    sqrt                     square root of the object
+    expm1                    the same as (object.exp) - 1, with better
+                             precision
     cos                      \
     sin                      |
     tan                      |
+    sec                      |
+    csc                      |
+    cot                      |
     acos                     |
     asin                     |
     atan                     | trigonometric functions
@@ -216,14 +253,9 @@ You can also call them as:
     infinite?                | type of floating point number
     finite?                  |
     number?                  /
-    **                       power
   GMP::RandState
-    seed(integer)            seed the generator with a Fixnum or GMP::Z
-    urandomb(fixnum)         get uniformly distributed random number between 0
-                             and 2^fixnum-1, inclusive
-  GMP (timing functions for GMPbench (0.2))
-    cputime                  milliseconds of cpu time since Ruby start
-    time                     times the execution of a block
+    mpfr_urandomb(fixnum)    get uniformly distributed random floating-point
+                             number within 0 <= rop < 1
     
 
 =Testing
@@ -251,8 +283,9 @@ If there is no explicit precision, highest precision of all GMP::F arguments is
 used. That doesn't ensure that result will be exact. For details, consult any
 paper about floating point arithmetics.
 
-Default precision can be explicitely set by passing 0 to GMP::F.new(). In
-particular, you can set precision of copy of GMP::F object by:
+Default precision can be explicitely set by passing 0 as the second argument
+for to GMP::F.new(). In particular, you can set precision of copy of GMP::F
+object by:
   new_obj = GMP::F.new(old_obj, 0)
 
 Precision argument, and default_precision will be rounded up to whatever GMP
@@ -331,7 +364,6 @@ These are inherited from Tomasz. I will go through these and see which are
 still relevant.
 
 * mpz_fits_* and 31 vs. 32 integer variables
-* all appropriate module and class methods if there are any to add
 * fix all sign issues (don't know what these are)
 * floats with precision control
 * to_s vs. inspect

data/benchmark/runbench.rb

@@ -1,165 +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
+#! /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