gmp 0.6.19 → 0.6.31

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.6.31:
+  * Added GMP::Z#rootrem and tests
+
 0.6.19:
   * Added GMP::Z#congruent? and tests
   * Added GMP::Z#export and GMP::Z.import and _minimal_ tests

data/README.html

@@ -98,7 +98,7 @@ by me: gmp gem 0.5.47 on:</p>
         GMP 5.0.1 (3.0.0)</td>
   </tr>
   <tr>
-    <td rowspan="4">Mac OS X 10.6.8 on x86_64 (64-bit)</td>
+    <td rowspan="3">Mac OS X 10.6.8 on x86_64 (64-bit)</td>
     <td>(MRI) Ruby 1.8.7</td>
     <td>GMP 4.3.2 (2.4.2)<br />
         GMP 5.0.5 (3.1.1)</td>
@@ -253,6 +253,7 @@ GMP::Z
   tmod,fmod,cmod           truncate, floor and ceil modulus
   &gt;&gt;                       shift right, floor
   divisible?(b)            true if divisible by b
+  congruent?(c,d)          true if congruent to c modulus d
   **                       power
   powmod                   power modulo
   \[\],\[\]=                   testing and setting bits (as booleans)
@@ -287,6 +288,10 @@ GMP::Z
   remove(n)                remove all occurences of factor n
   popcount                 the number of bits equal to 1
   hamdist                  the hamming distance between two integers
+  out_raw                  output to IO object
+  inp_raw                  input from IO object
+  export                   export to a byte array (String)
+  import                   import from a byte array (String)
   sizeinbase(b)            digits in base b
   size_in_bin              digits in binary
   size                     number of limbs
@@ -409,7 +414,7 @@ a  #=&gt; 30
 
 <ul>
 <li><a href="https://github.com/srawlins/gmp">This README</a></li>
-<li>Loren Segal and the guys at RubyGems.org are badasses: <a href="http://rubydoc.info/gems/gmp/frames">YARDoc</a>.</li>
+<li>Loren Segal and the guys at RubyGems.org are awesome: <a href="http://rubydoc.info/gems/gmp/frames">YARDoc</a>.</li>
 <li>There should be a manual.pdf <a href="https://github.com/srawlins/gmp/blob/master/manual.pdf">here</a>. I spend waaay too much time working on this, but it looks very pretty.</li>
 <li><a href="https://github.com/srawlins/gmp/blob/master/CHANGELOG">CHANGELOG</a></li>
 </ul>
@@ -433,11 +438,21 @@ MPFR=no-mpfr rake report
 
 <h2>Known Issues</h2>
 
-<ul>
-<li>Don&#39;t call <code>GMP::RandState(:lc_2exp_size)</code>. Give a 2nd arg.</li>
-<li>Don&#39;t use multiple assignment (<code>a = b = GMP::Z(0)</code>) with functional mappings.</li>
-<li>JRuby has some interesting bugs and flickering tests. GMP::Z(GMP::GMP<em>NUMB</em>MAX) for example, blows up.</li>
-</ul>
+<p>Don&#39;t call <code>GMP::RandState(:lc_2exp_size)</code>. Give a 2nd arg.
+Don&#39;t use multiple assignment (<code>a = b = GMP::Z(0)</code>) with functional mappings:</p>
+
+<p><code>ruby
+    &gt;&gt; a = b = GMP::Z(0)
+    =&gt; 0
+    &gt;&gt; GMP::Z.mul(a, GMP::Z(2), GMP::Z(3))
+    =&gt; nil
+    &gt;&gt; a
+    =&gt; 6
+    &gt;&gt; b
+    =&gt; 6
+</code></p>
+
+<p>JRuby has some interesting bugs and flickering tests. GMP::Z(GMP::GMP<em>NUMB</em>MAX) for example, blows up.</p>
 
 <h2>Precision</h2>
 
@@ -457,7 +472,7 @@ MPFR=no-mpfr rake report
 <h2>Todo</h2>
 
 <ul>
-<li><code>GMP::Z#to_d_2exp</code>, <code>#congruent?</code>, <code>#rootrem</code>, <code>#kronecker</code>, <code>#bin</code>, <code>#fib2</code>, <code>#lucnum</code>, <code>#lucnum2</code>, <code>#combit</code>, <code>#fits_x?</code></li>
+<li><code>GMP::Z#to_d_2exp</code>, <code>#rootrem</code>, <code>#kronecker</code>, <code>#bin</code>, <code>#fib2</code>, <code>#lucnum</code>, <code>#lucnum2</code>, <code>#combit</code>, <code>#fits_x?</code></li>
 <li><code>GMP::Q#to_s(base)</code>, <code>GMP::F#to_s(base)</code> (test it!)</li>
 <li>benchmark pi</li>
 <li>a butt-load of functional mappings. 47-ish sets.</li>

data/README.markdown

@@ -271,8 +271,9 @@ Methods
       square?                  is perfect square
       sqrt                     square root
       sqrt!                    change the object into its square root
-      sqrtrem                  square root, remainder
+      sqrtrem                  square root, with remainder
       root(n)                  nth root
+      rootrem(n)               nth root, with remainder
       probab_prime?            0 if composite, 1 if probably prime, 2 if
                                certainly prime
       nextprime                next *probable* prime
@@ -432,9 +433,22 @@ You can also use the following shiny new rake tasks:
 Known Issues
 ------------
 
-* Don't call `GMP::RandState(:lc_2exp_size)`. Give a 2nd arg.
-* Don't use multiple assignment (`a = b = GMP::Z(0)`) with functional mappings.
-* JRuby has some interesting bugs and flickering tests. GMP::Z(GMP::GMP_NUMB_MAX) for example, blows up.
+Don't call `GMP::RandState(:lc_2exp_size)`. Give a 2nd arg.
+
+Don't use multiple assignment (`a = b = GMP::Z(0)`) with functional mappings:
+
+```ruby
+    >> a = b = GMP::Z(0)
+    => 0
+    >> GMP::Z.mul(a, GMP::Z(2), GMP::Z(3))
+    => nil
+    >> a
+    => 6
+    >> b
+    => 6
+```
+
+JRuby has some interesting bugs and flickering tests. GMP::Z(GMP::GMP_NUMB_MAX) for example, blows up.
 
 Precision
 ---------
@@ -450,12 +464,12 @@ Precision argument, and default_precision will be rounded up to whatever GMP thi
 Benchmarking
 ------------
 
-Please see [performance](performance.md)
+Please see [performance](https://github.com/srawlins/gmp/blob/master/performance.md) on GitHub.
 
 Todo
 ----
 
-* `GMP::Z#to_d_2exp`, `#rootrem`, `#kronecker`, `#bin`, `#fib2`, `#lucnum`, `#lucnum2`, `#combit`, `#fits_x?`
+* `GMP::Z#to_d_2exp`, `#kronecker`, `#bin`, `#fib2`, `#lucnum`, `#lucnum2`, `#combit`, `#fits_x?`
 * `GMP::Q#to_s(base)`, `GMP::F#to_s(base)` (test it!)
 * benchmark pi
 * a butt-load of functional mappings. 47-ish sets.
@@ -463,14 +477,14 @@ Todo
 * beef up `r_gmpq_initialize`; I don't like to rely on `mpz_set_value`.
 * finish compile-results.rb
 * New in MPFR 3.1.0: mpfr_frexp, mpfr_grandom, mpfr_z_sub, divide-by-zero exception (?)
-* benchmark different orderings of type checks
+* JRuby doesn't like some MPFR stuff, specifically sqrt tests fail.
+* Rubinius in 1.9 mode fails a sprintf test in a minor way.
 
 The below are inherited from Tomasz. I will go through these and see which are
 still relevant, and which I understand.
 
 * `mpz_fits_*` and 31 vs. 32 integer variables
 * fix all sign issues (don't know what these are)
-* `to_s` vs. `inspect`
 * check if `mpz_addmul_ui` would optimize some statements
 * some system that allows using denref and numref as normal ruby objects
 * takeover code that replaces all `Bignums` with `GMP::Z`

data/ext/extconf.rb

@@ -26,12 +26,23 @@ end
 end
 
 unless have_macro('SIZEOF_INTPTR_T')
-  check_sizeof('intptr_t')
+  check_sizeof('intptr_t', 'ruby.h')
 end
 
+# Need check for which ruby vm to see how to require various things
+if (begin; Rubinius; rescue NameError; end) != nil
+  $CFLAGS += ' -DRUBY_ENGINE_RBX'
+end
+
+if (begin; JRuby; rescue NameError; end) != nil
+  $CFLAGS += ' -DRUBY_ENGINE_JRUBY'
+end
+
+
 $CFLAGS += ' -Wall -W -O6 -g'
 if ok
   create_makefile('gmp')
 else
   raise "Unable to build, correct above errors and rerun"
 end
+

data/ext/gmpf.c

@@ -168,7 +168,7 @@ void mpf_set_value(MP_FLOAT *self_val, VALUE arg)
     r_mpf_set_z(self_val, arg_val_z);
   } else if (FLOAT_P(arg)) {
     mpfr_set_d(self_val, NUM2DBL(arg), __gmp_default_rounding_mode);
-  } else if (FIXNUM_P(arg)) {
+  } else if (TYPE (arg) == T_FIXNUM) {
     mpf_set_si(self_val, FIX2NUM(arg));
   } else if (STRING_P(arg)) {
     result = mpfr_set_str(self_val, StringValuePtr(arg), 10, __gmp_default_rounding_mode);

data/ext/gmpz.c

@@ -1,7 +1,10 @@
 #include <gmpz.h>
 #include <gmpq.h>
 #include <gmpf.h>
+
+#ifdef HAVE_RUBY_IO_H
 #include <ruby/io.h>
+#endif
 
 /*
  * Document-class: GMP::Z
@@ -717,17 +720,17 @@ void mpz_set_value(MP_INT *target, VALUE source, int base)
 {
   MP_INT *source_val;
 
-  if (GMPZ_P(source)) {
-    mpz_get_struct(source, source_val);
-    mpz_set(target, source_val);
-  } else if (FIXNUM_P(source)) {
-    mpz_set_si(target, FIX2NUM(source));
-  } else if (STRING_P(source)) {
-    mpz_set_str(target, StringValuePtr(source), base);
-  } else if (BIGNUM_P(source)) {
-    mpz_set_bignum(target, source);
+  if (GMPZ_P (source)) {
+    mpz_get_struct (source, source_val);
+    mpz_set (target, source_val);
+  } else if (TYPE (source) == T_FIXNUM) {
+    mpz_set_si (target, FIX2NUM (source));
+  } else if (STRING_P (source)) {
+    mpz_set_str (target, StringValuePtr (source), base);
+  } else if (BIGNUM_P (source)) {
+    mpz_set_bignum (target, source);
   } else {
-    rb_raise(rb_eTypeError, "Don't know how to convert %s into GMP_Z", rb_class2name(rb_class_of(source)));
+    rb_raise (rb_eTypeError, "Don't know how to convert %s into GMP_Z", rb_class2name (rb_class_of (source)));
   }
 }
 
@@ -788,12 +791,19 @@ VALUE r_gmpz_to_i(VALUE self)
   char *str;
   VALUE res;
 
-  mpz_get_struct(self, self_val);
-  if (mpz_fits_slong_p(self_val))
-    return rb_int2inum(mpz_get_si(self_val));
-  str = mpz_get_str(NULL, 0, self_val);
-  res = rb_cstr2inum(str, 10);
-  free(str);
+  mpz_get_struct (self, self_val);
+  if (mpz_fits_slong_p (self_val)) {
+#ifdef RUBY_ENGINE_JRUBY
+    /* JRuby has this as INT2FIX which is no good. Patch. */
+    return FIXABLE (mpz_get_si (self_val)) ? LONG2FIX (mpz_get_si (self_val)) : rb_ll2inum (mpz_get_si (self_val));
+#else
+    return rb_int2inum (mpz_get_si (self_val));
+#endif
+  }
+
+  str = mpz_get_str (NULL, 0, self_val);
+  res = rb_cstr2inum (str, 10);
+  free (str);
   return res;
 }
 
@@ -1126,41 +1136,41 @@ static VALUE r_gmpz_addmul_self(VALUE self, VALUE b, VALUE c)
   MP_INT *self_val, *b_val, *c_val;
   int free_b_val = 0;
 
-  if (GMPZ_P(b)) {
-    mpz_get_struct(b, b_val);
-  } else if (FIXNUM_P(b)) {
-    mpz_temp_alloc(b_val);
-    mpz_init_set_si(b_val, FIX2NUM(b));
+  if (GMPZ_P (b)) {
+    mpz_get_struct (b, b_val);
+  } else if (FIXNUM_P (b)) {
+    mpz_temp_alloc (b_val);
+    mpz_init_set_si (b_val, FIX2NUM (b));
     free_b_val = 1;
-  } else if (BIGNUM_P(b)) {
-    mpz_temp_from_bignum(b_val, b);
+  } else if (BIGNUM_P (b)) {
+    mpz_temp_from_bignum (b_val, b);
     free_b_val = 1;
   } else {
-    typeerror_as(ZXB, "addend");
+    typeerror_as (ZXB, "addend");
   }
-  mpz_get_struct(self, self_val);
+  mpz_get_struct (self, self_val);
 
-  if (GMPZ_P(c)) {
-    mpz_get_struct(c, c_val);
-    mpz_addmul(self_val, b_val, c_val);
-  } else if (FIXNUM_P(c)) {
-    if (FIX2NUM(c) < 0)
+  if (GMPZ_P (c)) {
+    mpz_get_struct (c, c_val);
+    mpz_addmul (self_val, b_val, c_val);
+  } else if (TYPE (c) == T_FIXNUM) {
+    if (FIX2NUM (c) < 0)
     {
-      if (free_b_val) { mpz_temp_free(b_val); }
-      rb_raise(rb_eRangeError, "multiplicand (Fixnum) must be nonnegative");
+      if (free_b_val) { mpz_temp_free (b_val); }
+      rb_raise (rb_eRangeError, "multiplicand (Fixnum) must be nonnegative");
     }
-    mpz_addmul_ui(self_val, b_val, FIX2NUM(c));
-  } else if (BIGNUM_P(c)) {
-    mpz_temp_from_bignum(c_val, c);
-    mpz_addmul(self_val, b_val, c_val);
-    mpz_temp_free(c_val);
+    mpz_addmul_ui (self_val, b_val, FIX2NUM (c));
+  } else if (BIGNUM_P (c)) {
+    mpz_temp_from_bignum (c_val, c);
+    mpz_addmul (self_val, b_val, c_val);
+    mpz_temp_free (c_val);
   } else {
     if (free_b_val)
-      mpz_temp_free(b_val);
-    typeerror_as(ZXB, "multiplicand");
+      mpz_temp_free (b_val);
+    typeerror_as (ZXB, "multiplicand");
   }
   if (free_b_val)
-    mpz_temp_free(b_val);
+    mpz_temp_free (b_val);
   return self;
 }
 
@@ -1194,27 +1204,28 @@ static VALUE r_gmpz_submul_self(VALUE self, VALUE b, VALUE c)
   }
   mpz_get_struct(self, self_val);
 
-  if (GMPZ_P(c)) {
-    mpz_get_struct(c, c_val);
-    mpz_submul(self_val, b_val, c_val);
-  } else if (FIXNUM_P(c)) {
-    if (FIX2NUM(c) < 0)
+  if (GMPZ_P (c)) {
+    mpz_get_struct (c, c_val);
+    mpz_submul (self_val, b_val, c_val);
+  } else if (TYPE (c) == T_FIXNUM) {
+    if (FIX2NUM (c) < 0)
     {
-      if (free_b_val) { mpz_temp_free(b_val); }
-      rb_raise(rb_eRangeError, "multiplicand (Fixnum) must be nonnegative");
+      if (free_b_val) { mpz_temp_free (b_val); }
+      rb_raise (rb_eRangeError, "multiplicand (Fixnum) must be nonnegative");
     }
-    mpz_submul_ui(self_val, b_val, FIX2NUM(c));
-  } else if (BIGNUM_P(c)) {
-    mpz_temp_from_bignum(c_val, c);
-    mpz_submul(self_val, b_val, c_val);
-    mpz_temp_free(c_val);
+    mpz_submul_ui (self_val, b_val, FIX2NUM (c));
+  } else if (BIGNUM_P (c)) {
+    mpz_temp_from_bignum (c_val, c);
+    mpz_submul (self_val, b_val, c_val);
+    mpz_temp_free (c_val);
   } else {
     if (free_b_val)
-      mpz_temp_free(b_val);
-    typeerror_as(ZXB, "multiplicand");
+      mpz_temp_free (b_val);
+  //  rb_raise (rb_eTypeError, "base must be a Fixnum between 2 and 62, not a %s.", rb_class2name (rb_class_of (c)));
+    typeerror_as (ZXB, "multiplicand");
   }
   if (free_b_val)
-    mpz_temp_free(b_val);
+    mpz_temp_free (b_val);
   return self;
 }
 
@@ -1504,22 +1515,22 @@ static VALUE r_gmpz_divisible(VALUE self, VALUE arg)
   mpz_get_struct (self, self_val);
 
   if (FIXNUM_P (arg) && FIX2NUM (arg) > 0) {
-    mpz_temp_alloc(arg_val);
-    mpz_init_set_ui(arg_val, FIX2NUM(arg));
+    mpz_temp_alloc (arg_val);
+    mpz_init_set_ui (arg_val, FIX2NUM (arg));
     res = mpz_divisible_ui_p (self_val, FIX2NUM (arg));
-    mpz_temp_free(arg_val);
-  } else if (FIXNUM_P (arg)) {
-    mpz_temp_alloc(arg_val);
+    mpz_temp_free (arg_val);
+  } else if (TYPE (arg) == T_FIXNUM) {
+    mpz_temp_alloc (arg_val);
     mpz_make_struct_init (arg, arg_val);
-    mpz_init_set_si(arg_val, FIX2NUM(arg));
+    mpz_init_set_si (arg_val, FIX2NUM (arg));
     res = mpz_divisible_p (self_val, arg_val);
-    mpz_temp_free(arg_val);
+    mpz_temp_free (arg_val);
   } else if (BIGNUM_P (arg)) {
-    mpz_temp_from_bignum(arg_val, arg);
+    mpz_temp_from_bignum (arg_val, arg);
     res = mpz_divisible_p (self_val, arg_val);
-    mpz_temp_free(arg_val);
+    mpz_temp_free (arg_val);
   } else if (GMPZ_P (arg)) {
-    mpz_get_struct(arg, arg_val);
+    mpz_get_struct (arg, arg_val);
     res = mpz_divisible_p (self_val, arg_val);
   } else {
     typeerror_as (ZXB, "argument");
@@ -1705,6 +1716,45 @@ VALUE r_gmpz_powm(VALUE self, VALUE exp, VALUE mod)
  */
 DEFUN_INT_F_UL(root,mpz_root,"root number")
 
+
+/*
+ * Document-method: rootrem
+ *
+ * call-seq:
+ *   a.rootrem(b)
+ *
+ * Returns the truncated integer part of the <i>b</i>th root of _a_, and the remainder, _a - root**b_.
+ */
+static VALUE r_gmpz_rootrem(VALUE self_val, VALUE exp_val)
+{
+  MP_INT *self, *root, *rem;
+  VALUE root_val, rem_val, ary;
+  unsigned long exp;
+
+  if (FIXNUM_P(exp_val)) {
+    if (FIX2NUM(exp_val) < 0)
+      rb_raise(rb_eRangeError, "root number out of range");
+    exp = FIX2NUM(exp_val);
+  } else if (GMPZ_P(exp_val)) {
+    mpz_get_struct(exp_val, root);
+    if (!mpz_fits_ulong_p(root))
+      rb_raise(rb_eRangeError, "root number out of range");
+    exp = mpz_get_ui(root);
+    if (exp_val == 0)
+      rb_raise(rb_eRangeError, "root number out of range");
+  } else {
+    typeerror_as(ZX, "root number");
+  }
+
+  mpz_make_struct_init(root_val, root);
+  mpz_make_struct_init(rem_val, rem);
+  mpz_get_struct(self_val, self);
+  mpz_rootrem(root, rem, self, exp);
+
+  ary = rb_ary_new3 (2, root_val, rem_val);
+  return ary;
+}
+
 /*
  * Document-method: sqrt
  *
@@ -1896,7 +1946,7 @@ VALUE r_gmpz_gcdext(VALUE self, VALUE arg)
     mpz_make_struct_init (s, s_val);
     mpz_make_struct_init (t, t_val);
     mpz_temp_alloc (arg_val);
-    mpz_init_set_ui (arg_val, FIX2NUM(arg));
+    mpz_init_set_ui (arg_val, FIX2NUM (arg));
     free_arg_val = 1;
     mpz_gcdext (res_val, s_val, t_val, self_val, arg_val);
   } else if (BIGNUM_P (arg)) {
@@ -2235,7 +2285,7 @@ DEFUN_INT_SINGLETON_UI(2fac,       mpz_2fac_ui)
  * Document-method: GMP::Z.mfac
  *
  * call-seq:
- *   GMP::Z.mfac(n)
+ *   GMP::Z.mfac(n, m)
  *
  * Returns <i>n!^(m)</i>, the m-multi-factorial of _n_.
  *
@@ -2262,7 +2312,7 @@ DEFUN_INT_SINGLETON_UIUI(mfac,     mpz_mfac_uiui)
  * call-seq:
  *   GMP::Z.primorial(n)
  *
- * Returns the primorial _n_.
+ * Returns the primorial of _n_.
  *
  * Examples:
  * * GMP::Z.primorial(0)  #=>   1
@@ -2747,6 +2797,7 @@ VALUE r_gmpz_getbit(VALUE self, VALUE bitnr)
  *
  * Return the number of bytes written, or if an error occurred, return 0.
  */
+#ifdef HAVE_RUBY_IO_H
 VALUE r_gmpz_out_raw(VALUE self, VALUE stream)
 {
   MP_INT *self_val;
@@ -2783,6 +2834,7 @@ VALUE r_gmpzsg_inp_raw(VALUE klass, VALUE a_val, VALUE stream_val)
   stream = rb_io_stdio_file (RFILE (stream_val)->fptr);
   return INT2FIX (mpz_inp_raw (a, stream));
 }
+#endif
 
 
 /**********************************************************************
@@ -3037,12 +3089,13 @@ void init_gmpz()
   rb_define_method(cGMP_Z,           "powmod", r_gmpz_powm, 2);
 
   // Integer Roots
-  rb_define_method(cGMP_Z, "root",    r_gmpz_root, 1);
-  rb_define_method(cGMP_Z, "sqrt",    r_gmpz_sqrt, 0);
+  rb_define_method(cGMP_Z, "root",    r_gmpz_root,      1);
+  rb_define_method(cGMP_Z, "rootrem", r_gmpz_rootrem,   1);
+  rb_define_method(cGMP_Z, "sqrt",    r_gmpz_sqrt,      0);
   rb_define_method(cGMP_Z, "sqrt!",   r_gmpz_sqrt_self, 0);
-  rb_define_method(cGMP_Z, "sqrtrem", r_gmpz_sqrtrem, 0);
+  rb_define_method(cGMP_Z, "sqrtrem", r_gmpz_sqrtrem,   0);
   rb_define_method(cGMP_Z, "square?", r_gmpz_is_square, 0);
-  rb_define_method(cGMP_Z, "power?",  r_gmpz_is_power, 0);
+  rb_define_method(cGMP_Z, "power?",  r_gmpz_is_power,  0);
   // Functional Mappings
   rb_define_singleton_method(cGMP_Z, "sqrt", r_gmpzsg_sqrt, 2);
 
@@ -3103,9 +3156,11 @@ void init_gmpz()
   rb_define_singleton_method(cGMP_Z, "com", r_gmpzsg_com, 2);
 
   // I/O of Integers
+#ifdef HAVE_RUBY_IO_H
   rb_define_method(cGMP_Z, "out_raw", r_gmpz_out_raw, 1);
   // Functional Mapping
   rb_define_singleton_method(cGMP_Z, "inp_raw", r_gmpzsg_inp_raw, 2);
+#endif
 
   // Integer Import and Export
   rb_define_singleton_method(cGMP_Z, "import", r_gmpzsg_import, -1);

data/ext/ruby_gmp.h

@@ -116,7 +116,7 @@ typedef __gmp_randstate_struct MP_RANDSTATE;
 #endif
 
 #ifdef FIXNUM_WIDTH       /* RBX check */
-#if (((8*SIZEOF_INTPTR_T) - TAG_FIXNUM_SHIFT -1) == 63) /* 64-bit */
+#if (((8*SIZEOF_INTPTR_T) - TAG_FIXNUM_SHIFT -1) > 60) /* 64-bit */
 #define FIX2NUM(x) FIX2LONG(x)
 #else                        /* 32-bit */
 #define FIX2NUM(x) FIX2INT(x)

data/test/gmp_tprintf.rb

@@ -33,7 +33,7 @@ unless RUBY_VERSION =~ /^1.8/
       assert(fmt.size < MAX_OUTPUT)
       got = GMP.sprintf(fmt, *args)
 
-      assert_equal(want, got, "GMP.sprintf() generates correct output.")
+      assert_equal(want, got, "GMP.sprintf(#{fmt}, #{args.join(', ')}) generates correct output.")
     end
 
     def check_one(want, fmt, *args)

data/test/gmp_troot.rb

@@ -0,0 +1,58 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+
+class GMP_TRoot < Test::Unit::TestCase
+  RS = GMP::RandState.new(11213)
+  Reps = 500
+
+  def one_test(root1, x2, nth, i)
+    root2, rem2 = x2.rootrem(nth)
+    temp = root1 ** nth
+    temp2 = temp + rem2
+
+    assert_equal(root1, root2, "rootrem should produce the correct root for: #{x2}.rootrem(#{nth})")
+    assert_equal(x2,    temp2, "rootrem should produce the correct remainder for: #{x2}.rootrem(#{nth})")
+
+    if nth > 1
+      assert_false((temp > 1  &&  ! temp.power?), "error in perfect_power?")
+    end
+
+    if nth <= 10_000 && x2 > 0
+      temp2 = root1 + 1
+      temp2 = temp2 ** nth
+
+      # Is square of (result + 1) <= argument?
+      assert_true(temp2 > x2, "square of (result + 1) should not be less than or equal to argument")
+    end
+  end
+
+  def test_root
+    bs = GMP::Z()
+    s2 = GMP::Z()
+    root1 = GMP::Z()
+
+    x2 = GMP::Z("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80000000000000000000000000000000000000000000000000000000000000002", 16)
+    root1 = x2.root(2)
+    one_test(root1, x2, 2, -1)
+
+    (0...Reps).each do |i|
+      size = RS.urandomb(32)
+      size = RS.urandomb((size % 17 + 2).to_i)
+      x2 = RS.rrandomb(size.to_i + 10)
+
+      size = RS.urandomb(15)
+      #nth = mpz_getlimbn (bs, 0) % mpz_sizeinbase (x2, 2) + 2;
+      nth = (size % 32).to_i % x2.size_in_bin + 2
+      root1 = x2.root(nth)
+
+      size = RS.urandomb(4)
+
+      # With 50% probability, set x2 near a perfect power.
+      one_test(root1, x2, nth, i)
+      if (nth & 1 != 0)  &&  (size & 2 != 0)
+        x2.neg!
+        root1.neg!
+        one_test(root1, x2, nth, i)
+      end
+    end
+  end
+end

data/test/mpfr_tsqrt.rb

@@ -12,19 +12,19 @@ class MPFR_TSQRT < Test::Unit::TestCase
     return 0 if exp < 0
     f.to_s[2..(index_e-1)][0,exp]
   end
-  
+
   def check24(as, rnd_mode, qs)
     q = GMP::F(as, 24)
     q = q.sqrt(rnd_mode)
     assert_equal(q, GMP::F(qs), "Sqrt of #{as} (prec 24) should be #{qs}.")
   end
-  
+
   def check_diverse(as, p, qs)
     q = GMP::F(as, p)
     q = q.sqrt
     assert_equal(integer_component(q), qs)
   end
-  
+
   def check_float
     check24("70368760954880.0", GMP::GMP_RNDN, "8.388609e6")
     check24("281474943156224.0", GMP::GMP_RNDN, "1.6777215e7")
@@ -36,7 +36,7 @@ class MPFR_TSQRT < Test::Unit::TestCase
     check24("70368794509312.0", GMP::GMP_RNDN, "8.388611e6")
     check24("281474876047360.0", GMP::GMP_RNDN, "1.6777213e7")
     check24("91214552498176.0", GMP::GMP_RNDN, "9.550631e6")
-    
+
     check24("70368760954880.0", GMP::GMP_RNDZ, "8.388608e6")
     check24("281474943156224.0", GMP::GMP_RNDZ, "1.6777214e7")
     check24("70368777732096.0", GMP::GMP_RNDZ, "8.388609e6")
@@ -70,46 +70,46 @@ class MPFR_TSQRT < Test::Unit::TestCase
     check24("281474876047360.0", GMP::GMP_RNDD, "1.6777212e7")
     check24("91214552498176.0", GMP::GMP_RNDD, "9.550631e6")
   end
-  
+
   def special
     x = GMP::F(0b1010000010100011011001010101010010001100001101011101110001011001 / 2, 64)  # Ruby 0b does not support e,
     y = x.sqrt(GMP::GMP_RNDN, 32)                                                           # ie 0b11e-2 = 0.75 doesnt work
     #assert_equal(2405743844, y, "Error for n^2+n+1/2 with n=2405743843")  # Pending
-    
+
     x = GMP::F(0b10100000101000110110010101010100100011000011010111011100010110001 / 4, 65)
     y = x.sqrt(GMP::GMP_RNDN, 32)
     #assert_equal(2405743844, y, "Error for n^2+n+1/4 with n=2405743843")  # Pending
-    
+
     x = GMP::F(0b101000001010001101100101010101001000110000110101110111000101100011 / 8, 66)
     y = x.sqrt(GMP::GMP_RNDN, 32)
     #assert_equal(2405743844, y, "Error for n^2+n+1/4+1/8 with n=2405743843")  # Pending
-    
+
     x = GMP::F(0b101000001010001101100101010101001000110000110101110111000101100001 / 8, 66)
     y = x.sqrt(GMP::GMP_RNDN, 32)
     assert_equal(2405743843, y, "Error for n^2+n+1/8 with n=2405743843")
-    
+
     #####
     ##### Inexact flag test. Not implemented.
-    
+
     #####
     ##### Test uses mpfr_nexttoinf. Not implemented.
-    
+
     # Not an accurate test at all. Reassigning z generates a new mpfr object.
     x = GMP::F(1)
     z = GMP::F(-1)
     z = x.sqrt(GMP::GMP_RNDN)
-    
+
     #z = GMP::F(0.1011010100000100100100100110011001011100100100000011000111011001011101101101110000110100001000100001100001011000E1, 160)
     #x = z.sqrt
     # z = x.sqrt
     # x.prec = 53
   end
-  
+
   def check_inexact(prec)
     x = @rand_state.mpfr_urandomb(p)
-    
+
   end
-  
+
   def property1(p, rounding)
     x = @rand_state.mpfr_urandomb(p)
     y = @rand_state.mpfr_urandomb(p)
@@ -117,53 +117,53 @@ class MPFR_TSQRT < Test::Unit::TestCase
     z = x / z.sqrt(rounding)
     assert_between(-1, 1, z, "-1 <= x/sqrt(x^2+y^2) <= 1 should hold.")
   end
-  
+
   def property2(p, rounding)
     x = @rand_state.mpfr_urandomb(p)
     y = (x * x).sqrt(rounding)
     assert_true(x == y, "sqrt(#{x.to_s}^2) should be #{x.to_s}, but is #{y.to_s} (rounding: #{GMP::F.default_rounding_mode.inspect}, prec: #{p.to_s}).")
   end
-  
+
   def check3(as, rounding, qs)
     q = GMP::F(as, 53)
     q = q.sqrt(rounding)
     assert_equal(GMP::F(qs), q, "Sqrt of -0.0 should be something like 0.0.")
   end
-  
+
   def check4(as, rounding, qs)
     q = GMP::F(as, 53)
     q = q.sqrt(rounding)
     assert_equal(q, GMP::F(qs, GMP::F.default_prec, 16), "Sqrt of #{as} should be #{qs}.")
   end
-  
+
   def test_prec
     (GMP::MPFR_PREC_MIN..128).each do |p|
       property1(p, GMP::GMP_RNDN)
       property1(p, GMP::GMP_RNDU)
       property2(p, GMP::GMP_RNDN)
     end
-    
+
     check_diverse("635030154261163106768013773815762607450069292760790610550915652722277604820131530404842415587328",
                   160,
                   "796887792767063979679855997149887366668464780637")
     special
     #check_nan
-    
+
     (2...200).each do |p|
       200.times do
         #check_inexact p
       end
     end
     check_float
-    
+
     check3("-0.0", GMP::GMP_RNDN, "0.0")
-    
+
     check4("6.37983013646045901440e+32", GMP::GMP_RNDN, "5.9bc5036d09e0c@13")
     check4("1.0", GMP::GMP_RNDN, "1")
     check4("1.0", GMP::GMP_RNDZ, "1")
     check4("3.725290298461914062500000e-9", GMP::GMP_RNDN, "4@-4")
     check4("3.725290298461914062500000e-9", GMP::GMP_RNDZ, "4@-4")
-    
+
     check4("1190456976439861.0", GMP::GMP_RNDZ, "2.0e7957873529a@6")
     check4("1219027943874417664.0", GMP::GMP_RNDZ, "4.1cf2af0e6a534@7")
     # the following examples are bugs in Cygnus compiler/system, found by

data/test/tc_z_io.rb

@@ -1,6 +1,10 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 require 'fileutils'
 
+if (RUBY_DESCRIPTION =~ /rubinius/i and RUBY_VERSION =~ /^1.8/) ||
+   (RUBY_DESCRIPTION =~ /jruby/i)
+  # Sorry charlie
+else
 class TC_Z_IO < Test::Unit::TestCase
   def setup
     @two_pow_100   = GMP::Z.pow(GMP::Z(2), 100)
@@ -48,3 +52,4 @@ class TC_Z_IO < Test::Unit::TestCase
     FileUtils.rm('test_io_raw')
   end
 end
+end

data/test/unit_tests.rb

@@ -37,6 +37,7 @@ require './gmp_tcong'
 require './gmp_tgcd'
 require './gmp_tlcm'
 require './gmp_tprintf'
+require './gmp_troot'
 
 begin
   GMP::MPFR_VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmp
 version: !ruby/object:Gem::Version
-  version: 0.6.19
+  version: 0.6.31
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies: []
 description: gmp - providing Ruby bindings to the GMP library.
 email:
@@ -40,6 +40,7 @@ files:
 - test/gmp_tgcd.rb
 - test/gmp_tlcm.rb
 - test/gmp_tprintf.rb
+- test/gmp_troot.rb
 - test/mpfr_tcbrt.rb
 - test/mpfr_tconst_euler.rb
 - test/mpfr_tisnan.rb
@@ -89,6 +90,7 @@ files:
 - test/README
 - test/test_unit/assertions.rb
 - benchmark/benchmark-results-5.0.5_1.9.3_0.6.7.ods
+- benchmark/benchmark-results-5.1.0_0.6.19.ods
 - CHANGELOG
 - INSTALL
 - README.html
@@ -96,9 +98,9 @@ files:
 - manual.pdf
 - manual.tex
 - FEATURES.html
-- performance.md
-- performance.html
-- performance.pdf
+- performance.2012.md
+- performance.2012.html
+- performance.2012.pdf
 homepage: http://github.com/srawlins/gmp
 licenses: []
 post_install_message: