gmp 0.6.47 → 0.7.19

data/ext/mprnd.c

@@ -11,8 +11,8 @@ VALUE r_mprndsg_new(int argc, VALUE *argv, VALUE klass)
   (void)klass;
   res_value = 0;
 
-  mprnd_make_struct(res, res_value);
-  rb_obj_call_init(res, argc, argv);
+  mprnd_make_struct (res, res_value);
+  rb_obj_call_init (res, argc, argv);
   return res;
 }
 
@@ -27,68 +27,77 @@ VALUE r_mprnd_initialize(int argc, VALUE *argv, VALUE self)
     prefix = "GMP";
   else
     prefix = "MPFR";
-  switch (FIX2INT(mode)) {
+  switch (FIX2INT (mode)) {
   case 0:
-    sprintf(name_val, "%s_RNDN", prefix);
-    ieee754 = rb_str_new2("roundTiesToEven");
+    sprintf (name_val, "%s_RNDN", prefix);
+    ieee754 = rb_str_new2 ("roundTiesToEven");
     break;
   case 1:
-    sprintf(name_val, "%s_RNDZ", prefix);
-    ieee754 = rb_str_new2("roundTowardZero");
+    sprintf (name_val, "%s_RNDZ", prefix);
+    ieee754 = rb_str_new2 ("roundTowardZero");
     break;
   case 2:
-    sprintf(name_val, "%s_RNDU", prefix);
-    ieee754 = rb_str_new2("roundTowardPositive");
+    sprintf (name_val, "%s_RNDU", prefix);
+    ieee754 = rb_str_new2 ("roundTowardPositive");
     break;
   case 3:
-    sprintf(name_val, "%s_RNDD", prefix);
-    ieee754 = rb_str_new2("roundTowardNegative");
+    sprintf (name_val, "%s_RNDD", prefix);
+    ieee754 = rb_str_new2 ("roundTowardNegative");
     break;
   case 4:
-    sprintf(name_val, "%s_RNDA", prefix);
-    ieee754 = rb_str_new2("roundAwayFromZero");
+    sprintf (name_val, "%s_RNDA", prefix);
+    ieee754 = rb_str_new2 ("roundAwayFromZero");
     break;
   default:
-    sprintf(name_val, "%s_RNDN", prefix);
-    ieee754 = rb_str_new2("roundTiesToEven");
+    sprintf (name_val, "%s_RNDN", prefix);
+    ieee754 = rb_str_new2 ("roundTiesToEven");
   }
-  name = rb_str_new2(name_val);
-  rb_iv_set(self, "@mode",    mode);
-  rb_iv_set(self, "@name", name);
-  rb_iv_set(self, "@ieee754", ieee754);
+  name = rb_str_new2 (name_val);
+  rb_iv_set (self, "@mode",    mode);
+  rb_iv_set (self, "@name", name);
+  rb_iv_set (self, "@ieee754", ieee754);
   return Qnil;
 }
 
 VALUE r_mprnd_inspect(VALUE self)
 {
-  return rb_iv_get(self, "@name");
+  return rb_iv_get (self, "@name");
 }
 
 void init_gmprnd()
 {
-  ID new_id = rb_intern("new");
-  mGMP = rb_define_module("GMP");
+  ID new_id = rb_intern ("new");
+  mGMP = rb_define_module ("GMP");
 
-  cGMP_Rnd = rb_define_class_under(mGMP, "Rnd", rb_cObject);
+  cGMP_Rnd = rb_define_class_under (mGMP, "Rnd", rb_cObject);
 
-  rb_define_singleton_method(cGMP_Rnd, "new", r_mprndsg_new, -1);
-  rb_define_method(cGMP_Rnd, "initialize", r_mprnd_initialize, -1);
-  rb_define_method(cGMP_Rnd, "inspect", r_mprnd_inspect, 0);
+  rb_define_singleton_method (cGMP_Rnd, "new", r_mprndsg_new, -1);
+  rb_define_method (cGMP_Rnd, "initialize", r_mprnd_initialize, -1);
+  rb_define_method (cGMP_Rnd, "inspect", r_mprnd_inspect, 0);
 
   rb_define_attr (cGMP_Rnd, "mode",    1, 0);
   rb_define_attr (cGMP_Rnd, "name",    1, 0);
   rb_define_attr (cGMP_Rnd, "ieee754", 1, 0);
 
-  rb_define_const(mGMP, "GMP_RNDN", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX(0)));
-  rb_define_const(mGMP, "GMP_RNDZ", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX(1)));
-  rb_define_const(mGMP, "GMP_RNDU", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX(2)));
-  rb_define_const(mGMP, "GMP_RNDD", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX(3)));
+  /* GMP_RNDN: MPFR rounding mode roundTiesToEven for MPFR < 3.0 */
+  rb_define_const (mGMP, "GMP_RNDN", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX (0)));
+  /* GMP_RNDZ: MPFR rounding mode roundTowardZero for MPFR < 3.0 */
+  rb_define_const (mGMP, "GMP_RNDZ", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX (1)));
+  /* GMP_RNDU: MPFR rounding mode roundTowardPositive for MPFR < 3.0 */
+  rb_define_const (mGMP, "GMP_RNDU", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX (2)));
+  /* GMP_RNDD: MPFR rounding mode roundTowardNegative for MPFR < 3.0 */
+  rb_define_const (mGMP, "GMP_RNDD", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX (3)));
   /* MPFR 3.0.0 */
-  rb_define_const(mGMP, "MPFR_RNDN", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX(0)));
-  rb_define_const(mGMP, "MPFR_RNDZ", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX(1)));
-  rb_define_const(mGMP, "MPFR_RNDU", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX(2)));
-  rb_define_const(mGMP, "MPFR_RNDD", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX(3)));
-  rb_define_const(mGMP, "MPFR_RNDA", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX(4)));
+  /* MPFR_RNDN: MPFR rounding mode roundTiesToEven */
+  rb_define_const (mGMP, "MPFR_RNDN", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX (0)));
+  /* MPFR_RNDZ: MPFR rounding mode roundTowardZero */
+  rb_define_const (mGMP, "MPFR_RNDZ", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX (1)));
+  /* MPFR_RNDU: MPFR rounding mode roundTowardPositive */
+  rb_define_const (mGMP, "MPFR_RNDU", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX (2)));
+  /* MPFR_RNDU: MPFR rounding mode roundTowardNegative */
+  rb_define_const (mGMP, "MPFR_RNDD", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX (3)));
+  /* MPFR_RNDA: MPFR rounding mode roundAwayFromZero */
+  rb_define_const (mGMP, "MPFR_RNDA", rb_funcall (cGMP_Rnd, new_id, 1, INT2FIX (4)));
   /* end MPFR 3.0.0 */
 }
 

data/ext/ruby_gmp.h

@@ -94,12 +94,12 @@ typedef __gmp_randstate_struct MP_RANDSTATE;
 
 #if defined(MPFR) && defined(HAVE_MPFR_H)
 #define mpf_get_struct_prec(ruby_var,c_var,prec) {  \
-  mpf_get_struct (ruby_var,c_var);                  \
+  mpf_get_struct (ruby_var, c_var);                 \
   prec = mpfr_get_prec (c_var);                     \
 }
 #define mpf_make_struct_init(ruby_var,c_var,prec) {  \
-  mpf_make_struct (ruby_var,c_var);                  \
-  mpfr_init2 (c_var,prec);                           \
+  mpf_make_struct (ruby_var, c_var);                 \
+  mpfr_init2 (c_var, prec);                          \
 }
 #define mpf_temp_init(var,prec) { mpf_temp_alloc(var); mpfr_init2(var,prec); }
 #define mpf_temp_free(var) { mpfr_clear(var); free(var); }
@@ -264,8 +264,8 @@ extern int mpq_cmp_value(MP_RAT *OP, VALUE arg);
 extern VALUE r_gmpq_sgn(VALUE self);
 
 // Applying Integer Functions
-extern VALUE r_gmpq_num(VALUE self);
-extern VALUE r_gmpq_den(VALUE self);
+extern VALUE r_gmpq_get_num(VALUE self);
+extern VALUE r_gmpq_get_den(VALUE self);
 
 // _unsorted_
 
@@ -307,7 +307,7 @@ extern int mpf_cmp_value(MP_FLOAT *OP, VALUE arg);
 
 // MPFR
 #ifdef MPFR
-  extern void mpf_set_value2(MP_FLOAT *self_val, VALUE arg, int base);
+  extern void mpf_set_value2(MP_FLOAT *self_val, VALUE arg, int base, mp_rnd_t rnd_mode_val);
 
   extern VALUE r_gmpfr_sqrt(int argc, VALUE *argv, VALUE self);
   extern VALUE r_gmpfr_rec_sqrt(int argc, VALUE *argv, VALUE self);

data/manual.tex

@@ -34,8 +34,8 @@
 \huge{gmp} &\\
 \midrule[3pt]
 \multicolumn{2}{r}{\large{Ruby bindings to the GMP library}}\\
-\multicolumn{2}{r}{\large{Edition 0.6.47}}\\
-\multicolumn{2}{r}{\large{31 December 2013}}
+\multicolumn{2}{r}{\large{Edition 0.7.19}}\\
+\multicolumn{2}{r}{\large{12 March 2014}}
 \end{tabular}
 
 \vfill

data/test/mpfr_thypot.rb

@@ -0,0 +1,60 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+
+class MpfrTHypot < Test::Unit::TestCase
+  def test_special
+    x = GMP::F.nan
+    y = GMP::F.new
+    assert_equal(GMP::F.nan, x.hypot(y), "NaN.hypot(...) is NaN")
+
+    x = GMP::F.inf
+    y = GMP::F.inf(-1)
+    assert_equal(GMP::F.inf, x.hypot(y), "Inf.hypot(-Inf) is Inf")
+
+    x = GMP::F.nan
+    y = GMP::F.inf(-1)
+    assert_equal(GMP::F.inf, x.hypot(y), "NaN.hypot(-Inf) is Inf")
+  end
+
+  def test_large
+    x = GMP::F(21)
+    y = GMP::F(28)
+    z = GMP::F(35)
+
+    # TODO: need mpfr_mul_2ui!!!
+  end
+
+  def small_tests
+    x = GMP::F.new_2exp(1, GMP::F.emin-1, 8)
+    y = GMP::F.new_2exp(1, GMP::F.emin-1, 8)
+    z1 = GMP::F.new(2, 8)
+    z1 = z1.sqrt * x
+    z2 = x.hypot(y)
+
+    assert_equal(z1, z2, "x.hypot(y) should == sqrt(2) * x")
+  end
+
+  def large_small_tests
+    x = GMP::F.new_2exp(1, GMP::F.emax/2, 3)
+    y = GMP::F.new_2exp(1, -1, 2)
+    z = x.hypot(y)
+
+    assert_equal(x, z, "hypot... something abount large_small")
+  end
+
+  def test_hypot
+    small_tests
+    large_small_tests
+
+    emin = GMP::F.emin
+    emax = GMP::F.emax
+    GMP::F.emin = GMP::F.emin_min
+    GMP::F.emax = GMP::F.emax_max
+
+    if GMP::F.emin != emin || GMP::F.emax != emax
+      small_tests
+      large_small_tests
+      GMP::F.emin = emin
+      GMP::F.emax = emax
+    end
+  end
+end

data/test/tc_cmp.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
-class TC_Cmp < Test::Unit::TestCase
+class TcCmp < Test::Unit::TestCase
   def setup
     @_64bit = 1_000_000_000_000.is_a? Fixnum
     @a=GMP::Z.new(180)

data/test/tc_constants.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
-class TC_Constants < Test::Unit::TestCase
+class TcConstants < Test::Unit::TestCase
   def test_constants
     assert_instance_of(String, GMP::GMP_VERSION,       "GMP::GMP_VERSION should be a String")
     assert_instance_of(String, GMP::GMP_CC,            "GMP::GMP_CC should be a String")

data/test/tc_division.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
-class TC_division < Test::Unit::TestCase
+class TcDivision < Test::Unit::TestCase
   def setup
     @a = GMP::Z.new(5)
     @b = GMP::Z.new(7)

data/test/tc_f_abs_neg.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
-class TC_f_abs_neg < Test::Unit::TestCase
+class TcFloatAbsNeg < Test::Unit::TestCase
   def setup
     @a=GMP::F.new(3.14)
     @b=GMP::F.new()

data/test/tc_f_arithmetics_coersion.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
-class TC_F_arithmetics_coersion < Test::Unit::TestCase
+class TcFloatArithmeticsCoersion < Test::Unit::TestCase
   def setup
     @a = GMP::F.new(3.14, 100)
     @b = GMP::F.new(2.71, 200)

data/test/tc_f_precision.rb

@@ -1,7 +1,8 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
-class TC_precision < Test::Unit::TestCase
+class TcFloatPrecision < Test::Unit::TestCase
   def setup
+    # TODO: um... what?
     begin
       GMP::MPFR_VERSION
       @initial_default_prec = GMP::F.default_prec

data/test/tc_f_to_s.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
-class TC_F_to_s < Test::Unit::TestCase
+class TcFloatToS < Test::Unit::TestCase
   def setup
     @initial_default_prec = GMP::F.default_prec
   end

data/test/tc_hashes.rb

@@ -1,9 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
-class TC_Hashes < Test::Unit::TestCase
-  def setup
-  end
-  
+class TcHashes < Test::Unit::TestCase
   def test_z_hashes
     h = {}
     h[GMP::Z(131)] = [GMP::Z(41), GMP::Z(43), GMP::Z(47)]

data/test/tc_mpfr_cmp.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
-class TC_MPFR_Cmp < Test::Unit::TestCase
+class TcMpfrCmp < Test::Unit::TestCase
   def setup
     @neg_inf = GMP::F(0).log  # -Inf
     @inf = -@neg_inf          # Inf

data/test/tc_mpfr_constants.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
-class TC_MPFR_Constants < Test::Unit::TestCase
+class TcMpfrConstants < Test::Unit::TestCase
   def test_mpfr_constants
     assert_instance_of(String,   GMP::MPFR_VERSION,  "GMP::MPFR_VERSION should be a String")
     assert_instance_of(Fixnum,   GMP::MPFR_PREC_MIN, "GMP::MPFR_PREC_MIN should be a Fixnum")

data/test/tc_mpfr_functions.rb

@@ -1,11 +1,11 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
-class TC_MPFR_Functions < Test::Unit::TestCase
+class TcMpfrFunctions < Test::Unit::TestCase
   def setup
     @a = GMP::F(1)
     @b = GMP::F(2)
   end
-  
+
   def test_const_existence
     constants = ["const_log2", "const_pi", "const_euler", "const_catalan"]
 
@@ -30,7 +30,7 @@ class TC_MPFR_Functions < Test::Unit::TestCase
       }
     end
   end
-  
+
   def test_function_existence
     assert_nothing_raised("GMP::F.nan? should be callable.") { @a.nan? }
     assert_nothing_raised("GMP::F.infinite? should be callable.") { @a.infinite? }
@@ -43,7 +43,7 @@ class TC_MPFR_Functions < Test::Unit::TestCase
     assert_nothing_raised("GMP::F.sqrt should be callable.") { @a.sqrt }
     assert_nothing_raised("GMP::F.rec_sqrt should be callable.") { @a.rec_sqrt }
     assert_nothing_raised("GMP::F.cbrt should be callable.") { @a.cbrt }
-    
+
     assert_nothing_raised("GMP::F.log should be callable.") { @a.log }
     assert_nothing_raised("GMP::F.log2 should be callable.") { @a.log2 }
     assert_nothing_raised("GMP::F.log10 should be callable.") { @a.log10 }
@@ -61,7 +61,8 @@ class TC_MPFR_Functions < Test::Unit::TestCase
     assert_nothing_raised("GMP::F.asin should be callable.") { @a.asin }
     assert_nothing_raised("GMP::F.atan should be callable.") { @a.atan }
     assert_nothing_raised("GMP::F.atan2 should be callable.") { @a.atan2(@b) }
-    
+    assert_nothing_raised("GMP::F.atan2 should be callable with float arg") { @a.atan2(2.0) }
+
     assert_nothing_raised("GMP::F.cosh should be callable.") { @a.cosh }
     assert_nothing_raised("GMP::F.sinh should be callable.") { @a.sinh }
     assert_nothing_raised("GMP::F.tanh should be callable.") { @a.tanh }
@@ -72,14 +73,14 @@ class TC_MPFR_Functions < Test::Unit::TestCase
     assert_nothing_raised("GMP::F.acosh should be callable.") { @a.acosh }
     assert_nothing_raised("GMP::F.asinh should be callable.") { @a.asinh }
     assert_nothing_raised("GMP::F.atanh should be callable.") { @a.atanh }
-    
+
     assert_nothing_raised("GMP::F.log1p should be callable.") { @a.log1p }
     assert_nothing_raised("GMP::F.expm1 should be callable.") { @a.expm1 }
     assert_nothing_raised("GMP::F.eint should be callable.") { @a.eint }
     assert_nothing_raised("GMP::F.li2 should be callable.") { @a.li2 }
     assert_nothing_raised("GMP::F.gamma should be callable.") { @a.gamma }
     assert_nothing_raised("GMP::F.lngamma should be callable.") { @a.lngamma }
-    #assert_nothing_raised("GMP::F.lgamma should be callable.") { @a.lgamma }
+    # TODO: assert_nothing_raised("GMP::F.lgamma should be callable.") { @a.lgamma }
     if GMP::MPFR_VERSION >= "3.0.0"
     assert_nothing_raised("GMP::F.digamma should be callable.") { @a.digamma }
     end
@@ -98,11 +99,40 @@ class TC_MPFR_Functions < Test::Unit::TestCase
     assert_nothing_raised("GMP::F.yn should be callable.") { @a.yn(0) }
     assert_nothing_raised("GMP::F.yn should be callable.") { @a.yn(1) }
     assert_nothing_raised("GMP::F.yn should be callable.") { @a.yn(2) }
-    
+
     assert_nothing_raised("GMP::F.agm should be callable.") { @a.agm(@b) }
     assert_nothing_raised("GMP::F.hypot should be callable.") { @a.hypot(@b) }
   end
-  
+
+  def test_atan2
+    assert_in_delta @a.atan2(@b), Math.atan2(@a.to_f, @b.to_f), 0.0001
+    assert_in_delta (-@a).atan2((-@b)), Math.atan2((-@a).to_f, (-@b).to_f), 0.0001
+    assert_in_delta @a.atan2(3.0), Math.atan2(@a.to_f, 3.0), 0.0001
+  end
+
+  def test_class_methods
+    assert_true(GMP::F.emin.is_a?(Integer), "GMP::F.emin is callable")
+    assert_true(GMP::F.emax.is_a?(Integer), "GMP::F.emax is callable")
+    assert_true(GMP::F.emin_min.is_a?(Integer), "GMP::F.emin_min is callable")
+    assert_true(GMP::F.emin_max.is_a?(Integer), "GMP::F.emin_max is callable")
+    assert_true(GMP::F.emax_min.is_a?(Integer), "GMP::F.emax_min is callable")
+    assert_true(GMP::F.emax_max.is_a?(Integer), "GMP::F.emax_max is callable")
+  end
+
+  def test_emin
+    emin = GMP::F.emin
+    assert_nothing_raised("GMP::F.emin= works with good exp") { GMP::F.emin = emin/2 }
+    assert_equal(emin/2, GMP::F.emin, "GMP::F.emin= sets emin")
+    assert_raise(TypeError) { GMP::F.emin = :not_a_number }
+  end
+
+  def test_emax
+    emax = GMP::F.emax
+    assert_nothing_raised("GMP::F.emax= works with good exp") { GMP::F.emax = emax/2 }
+    assert_equal(emax/2, GMP::F.emax, "GMP::F.emax= sets emax")
+    assert_raise(TypeError) { GMP::F.emax = :not_a_number }
+  end
+
   def test_function_parameters
     single_functions = [:sqrt, :rec_sqrt, :cbrt,
                         :log, :log2, :log10, :exp, :exp2, :exp10,
@@ -117,14 +147,17 @@ class TC_MPFR_Functions < Test::Unit::TestCase
     single_functions += [:digamma] if GMP::MPFR_VERSION >= "3.0.0"
     double_functions = [:sin_cos, :sinh_cosh]
     single_mpf_functions = [:atan2, :agm, :hypot]
-    
+
     (single_functions + double_functions).each do |f|
       assert_nothing_raised("GMP::F.#{f} can be called w/ 1 arg: rounding_mode.") { @a.send(f, GMP::GMP_RNDN) }
       assert_nothing_raised("GMP::F.#{f} can be called w/ 1 arg: rounding_mode.") { @a.send(f, GMP::GMP_RNDZ) }
       assert_nothing_raised("GMP::F.#{f} can be called w/ 2 args: rounding_mode, prec.") { @a.send(f, GMP::GMP_RNDN, 32) }
       assert_nothing_raised("GMP::F.#{f} can be called w/ 2 args: rounding_mode, prec.") { @a.send(f, GMP::GMP_RNDN, 128) }
       assert_nothing_raised("GMP::F.#{f} can be called w/ 2 args: rounding_mode, prec.") { @a.send(f, GMP::GMP_RNDN, 200) }
+
+      assert_raise(TypeError) { @a.send(f, GMP::GMP_RNDN, "not a Fixnum") }
     end
+
     double_functions.each do |f|
       assert_nothing_raised("GMP::F.#{f} can be called w/ 3 args: rounding_mode, prec, prec.") { @a.send(f, GMP::GMP_RNDN,  64,  64) }
       assert_nothing_raised("GMP::F.#{f} can be called w/ 3 args: rounding_mode, prec, prec.") { @a.send(f, GMP::GMP_RNDN, 128,  64) }

data/test/tc_mpfr_inf_nan_zero.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
-class TC_MPFR_Inf_Nan_Zero < Test::Unit::TestCase
+class TcMpfrInfNanZero < Test::Unit::TestCase
   def setup
     @neg_inf = GMP::F(0).log  # -Inf
     @inf = -@neg_inf          # Inf