ruby-mpfr 0.0.10 → 0.0.11

data/ext/gmp/mpfr/extconf.rb

@@ -1,5 +1,19 @@
 require 'mkmf'
 
+i = 0
+while i < ARGV.size
+  case ARGV[i]
+  when '--ldflags'
+    if args = ARGV[i+1]
+      i += 1
+      $LDFLAGS += " #{args}"
+    end
+  else
+    raise "Invalid option: #{ARGV[i]}"
+  end
+  i += 1
+end
+
 $CFLAGS += " -Wall"
 
 REQUIRE_VERSION = 3

data/ext/mpfr/extconf.rb

@@ -1,5 +1,19 @@
 require 'mkmf'
 
+i = 0
+while i < ARGV.size
+  case ARGV[i]
+  when '--ldflags'
+    if args = ARGV[i+1]
+      i += 1
+      $LDFLAGS += " #{args}"
+    end
+  else
+    raise "Invalid option: #{ARGV[i]}"
+  end
+  i += 1
+end
+
 $CFLAGS += " -Wall"
 
 REQUIRE_VERSION = 3

data/ext/mpfr/ruby_mpfr.c

@@ -34,8 +34,7 @@ mp_rnd_t r_mpfr_rnd_from_value(VALUE rnd)
   } else if (rnd_id == id_rnda) {
     return MPFR_RNDA;
   }
-  rb_raise(rb_eArgError, "Argument must be Rounding Mode.");
-  /* rb_raise(rb_eArgError, "Argument must be Rounding Mode: %s", rb_class2name(rnd)); */
+  rb_raise(rb_eArgError, "Argument must be a constant meaning rounding mode, but the objects is %s.", rb_obj_classname(rnd));
 }
 
 /* If argc equals max, convert last argument to rounding mode number. */
@@ -407,7 +406,7 @@ void r_mpfr_set_robj(MPFR *ptr, VALUE obj, mp_rnd_t rnd)
 	r_mpfr_get_struct(ptr_obj, tmp);
 	mpfr_set(ptr, ptr_obj, rnd);
       } else {
-	rb_raise(rb_eArgError, "Invalid class %s for making MPFR.", rb_class2name(obj));
+	rb_raise(rb_eArgError, "Invalid class %s for making MPFR.", rb_obj_classname(obj));
       }
       break;
     }
@@ -419,7 +418,7 @@ VALUE r_mpfr_robj_to_mpfr(VALUE obj, int argc, VALUE *argv)
   if (rb_respond_to(obj, to_fr)) {
     return rb_funcall2(obj, to_fr, argc, argv);
   }
-  rb_raise(rb_eArgError, "The object of %s can not been converted to MPFR.", rb_class2name(obj));
+  rb_raise(rb_eArgError, "The object of %s can not been converted to MPFR.", rb_obj_classname(obj));
 }
 
 /* If obj is MPFR instance, then this method returns obj. */
@@ -721,7 +720,9 @@ static VALUE r_mpfr_to_strf(VALUE self, VALUE format_str)
   r_mpfr_get_struct(ptr_self, self);
   char *format = StringValuePtr(format_str);
   char *ret_str;
-  mpfr_asprintf(&ret_str, format, ptr_self);
+  if (!mpfr_asprintf(&ret_str, format, ptr_self)) {
+    rb_raise(rb_eFatal, "Can not allocate a string by mpfr_asprintf.");
+  }
   VALUE ret_val = rb_str_new2(ret_str);
   mpfr_free_str(ret_str);
   return ret_val;
@@ -733,7 +734,9 @@ static VALUE r_mpfr_to_s(VALUE self)
   MPFR *ptr_self;
   r_mpfr_get_struct(ptr_self, self);
   char *ret_str;
-  mpfr_asprintf(&ret_str, "%.Re", ptr_self);
+  if (!mpfr_asprintf(&ret_str, "%.Re", ptr_self)) {
+    rb_raise(rb_eFatal, "Can not allocate a string by mpfr_asprintf.");
+  }
   VALUE ret_val = rb_str_new2(ret_str);
   mpfr_free_str(ret_str);
   return ret_val;
@@ -745,7 +748,10 @@ static VALUE r_mpfr_inspect(VALUE self)
   MPFR *ptr_s;
   r_mpfr_get_struct(ptr_s, self);
   char *ret_str;
-  mpfr_asprintf(&ret_str, "#<MPFR:%lx,'%0.Re',%d>", NUM2LONG(rb_funcall(self, object_id, 0)), ptr_s, mpfr_get_prec(ptr_s));
+  if (!mpfr_asprintf(&ret_str, "#<MPFR:%lx,'%0.Re',%d>", NUM2LONG(rb_funcall(self, object_id, 0)),
+		     ptr_s, mpfr_get_prec(ptr_s))) {
+    rb_raise(rb_eFatal, "Can not allocate a string by mpfr_asprintf.");
+  }
   VALUE ret_val = rb_str_new2(ret_str);
   mpfr_free_str(ret_str);
   return ret_val;
@@ -2761,17 +2767,17 @@ static VALUE r_mpfr_buildopt_decimal_p(VALUE self)
   return mpfr_buildopt_decimal_p() == 0 ? Qnil : Qtrue;
 }
 
-static VALUE r_mpfr_marshal_dump(VALUE self)
+char *r_mpfr_dump_to_string(MPFR *ptr_s)
 {
-  MPFR *ptr_s;
-  r_mpfr_get_struct(ptr_s, self);
   char *ret_str;
   if (mpfr_regular_p(ptr_s)) {
     mpz_t m;
     mp_exp_t e;
     mpz_init(m);
     e = mpfr_get_z_2exp(m, ptr_s);
-    mpfr_asprintf(&ret_str, "%c%ld\t%ld\t%Zd", MPFR_DUMP_NUMBER, mpfr_get_prec(ptr_s), (long int)e, m);
+    if (!mpfr_asprintf(&ret_str, "%c%ld\t%ld\t%Zd", MPFR_DUMP_NUMBER, mpfr_get_prec(ptr_s), (long int)e, m)) {
+      rb_raise(rb_eFatal, "Can not allocate a string by mpfr_asprintf.");
+    }
     mpz_clear(m);
   } else {
     char type;
@@ -2788,21 +2794,27 @@ static VALUE r_mpfr_marshal_dump(VALUE self)
     } else {
       type = MPFR_DUMP_MINF;
     }
-    mpfr_asprintf(&ret_str, "%c%ld", type, mpfr_get_prec(ptr_s));
+    if (!mpfr_asprintf(&ret_str, "%c%ld", type, mpfr_get_prec(ptr_s))) {
+      rb_raise(rb_eFatal, "Can not allocate a string by mpfr_asprintf.");
+    }
   }
+  return ret_str;
+}
+
+static VALUE r_mpfr_marshal_dump(VALUE self)
+{
+  MPFR *ptr_s;
+  r_mpfr_get_struct(ptr_s, self);
+  char *ret_str = r_mpfr_dump_to_string(ptr_s);
   VALUE ret_val = rb_str_new2(ret_str);
   mpfr_free_str(ret_str);
   return ret_val;
 }
 
-static VALUE r_mpfr_marshal_load(VALUE self, VALUE dump_string)
+void r_mpfr_load_string(MPFR *ptr_s, const char *dump)
 {
   long int prec;
-  MPFR *ptr_s;
-  r_mpfr_get_struct(ptr_s, self);
-  Check_Type(dump_string, T_STRING);
-  char *dump, type;
-  dump = RSTRING_PTR(dump_string);
+  char type;
   type = dump[0];
   dump++;
   if (type == MPFR_DUMP_NUMBER) {
@@ -2839,6 +2851,14 @@ static VALUE r_mpfr_marshal_load(VALUE self, VALUE dump_string)
       rb_raise(rb_eArgError, "Invalid dumped data for marshal_load.");
     }
   }
+}
+
+static VALUE r_mpfr_marshal_load(VALUE self, VALUE dump_string)
+{
+  MPFR *ptr_s;
+  r_mpfr_get_struct(ptr_s, self);
+  Check_Type(dump_string, T_STRING);
+  r_mpfr_load_string(ptr_s, RSTRING_PTR(dump_string));
   return self;
 }
 

data/ext/mpfr/ruby_mpfr.h

@@ -37,5 +37,8 @@ mp_rnd_t r_mpfr_rnd_from_optional_argument(int min, int max, int argc, VALUE *ar
 mp_rnd_t r_mpfr_prec_from_optional_argument(int min, int max, int argc, VALUE *argv);
 void r_mpfr_get_rnd_prec_from_optional_arguments(mp_rnd_t *rnd, mp_prec_t *prec, int min, int max, int argc, VALUE *argv);
 
+char *r_mpfr_dump_to_string(MPFR *ptr_s);
+void r_mpfr_load_string(MPFR *ptr_s, const char *dump);
+
 #endif /* _RUBY_MPFR_H_ */
 

data/ext/mpfr_matrix/mpfr/extconf.rb

@@ -1,5 +1,19 @@
 require 'mkmf'
 
+i = 0
+while i < ARGV.size
+  case ARGV[i]
+  when '--ldflags'
+    if args = ARGV[i+1]
+      i += 1
+      $LDFLAGS += " #{args}"
+    end
+  else
+    raise "Invalid option: #{ARGV[i]}"
+  end
+  i += 1
+end
+
 $CFLAGS += " -Wall"
 
 REQUIRE_VERSION = 3

data/ext/mpfr_matrix/mpfr/ruby_mpfr.h

@@ -30,11 +30,15 @@ VALUE r_mpfr_make_new_fr_obj(MPFR *ptr);
 VALUE r_mpfr_make_new_fr_obj2(MPFR *ptr, int prec);
 VALUE r_mpfr_new_fr_obj(VALUE obj);
 void r_mpfr_set_robj(MPFR *ptr, VALUE obj, mp_rnd_t rnd);
+VALUE r_mpfr_robj_to_mpfr(VALUE obj, int argc, VALUE *argv);
 
 mp_rnd_t r_mpfr_rnd_from_value(VALUE rnd);
 mp_rnd_t r_mpfr_rnd_from_optional_argument(int min, int max, int argc, VALUE *argv);
 mp_rnd_t r_mpfr_prec_from_optional_argument(int min, int max, int argc, VALUE *argv);
 void r_mpfr_get_rnd_prec_from_optional_arguments(mp_rnd_t *rnd, mp_prec_t *prec, int min, int max, int argc, VALUE *argv);
 
+char *r_mpfr_dump_to_string(MPFR *ptr_s);
+void r_mpfr_load_string(MPFR *ptr_s, const char *dump);
+
 #endif /* _RUBY_MPFR_H_ */
 

data/ext/mpfr_matrix/mpfr/ruby_mpfr_matrix.c

@@ -196,43 +196,19 @@ static VALUE r_mpfr_matrix_marshal_dump(VALUE self)
 {
   MPFRMatrix *ptr;
   r_mpfr_get_matrix_struct(ptr, self);
-  mpz_t m;
-  mp_exp_t e;
-  mpz_init(m);
   int i;
-  MPFR *ptr_el;
-  char *tmp_str, type;
+  char *tmp_str;
   VALUE ret_ary;
   ret_ary = rb_ary_new();
   rb_ary_push(ret_ary, INT2FIX(ptr->row));
   rb_ary_push(ret_ary, INT2FIX(ptr->column));
 
   for (i = 0; i < ptr->size; i++) {
-    ptr_el = ptr->data + i;
-    if (mpfr_regular_p(ptr_el)) {
-      e = mpfr_get_z_2exp(m, ptr_el);
-      mpfr_asprintf(&tmp_str, "%c%ld\t%ld\t%Zd", MPFR_DUMP_NUMBER, mpfr_get_prec(ptr_el), (long int)e, m);
-    } else {
-      if (mpfr_zero_p(ptr_el)) {
-	if (mpfr_sgn(ptr_el) >= 0) {
-	  type = MPFR_DUMP_PZERO;
-	} else {
-	  type = MPFR_DUMP_MZERO;
-	}
-      } else if (mpfr_nan_p(ptr_el)) {
-	type = MPFR_DUMP_NAN;
-      } else if (mpfr_sgn(ptr_el) >= 0) {
-	type = MPFR_DUMP_PINF;
-      } else {
-	type = MPFR_DUMP_MINF;
-      }
-      mpfr_asprintf(&tmp_str, "%c%ld", type, mpfr_get_prec(ptr_el));
-    }
+    tmp_str = r_mpfr_dump_to_string(ptr->data + i);
     rb_ary_push(ret_ary, rb_str_new2(tmp_str));
     mpfr_free_str(tmp_str);
   }
 
-  mpz_clear(m);
   return ret_ary;
 }
 
@@ -245,51 +221,15 @@ static VALUE r_mpfr_matrix_marshal_load(VALUE self, VALUE dump_ary)
   ptr->column = NUM2INT(rb_ary_entry(dump_ary, 1));
   ptr->size = ptr->row * ptr->column;
   ptr->data = ALLOC_N(MPFR, ptr->size);
-  int i, j;
-  long int prec, e;
-  MPFR *ptr_el;
-  char *dump, type;
+  int i;
+  char *dump;
   VALUE dump_element;
-  mpz_t m;
 
   for(i = 0; i < ptr->size; i++){
     dump_element = rb_ary_entry(dump_ary, i + 2);
-    ptr_el = ptr->data + i;
     Check_Type(dump_element, T_STRING);
     dump = RSTRING_PTR(dump_element);
-    type = dump[0];
-    dump++;
-    if (type == MPFR_DUMP_NUMBER) {
-      mpz_init(m);
-      sscanf(dump, "%ld\t%ld\t", &prec, &e);
-      j = 0;
-      while (j < 2) {
-	if (dump[0] == '\t') {
-	  j++;
-	}
-	dump++;
-      }
-      mpz_set_str(m, dump, 10);
-      mpfr_init2(ptr_el, prec);
-      mpfr_set_z_2exp(ptr_el, m, e, MPFR_RNDN);
-      mpz_clear(m);
-    } else {
-      sscanf(dump, "%ld", &prec);
-      mpfr_init2(ptr_el, prec);
-      if (type == MPFR_DUMP_PZERO) {
-	mpfr_set_zero(ptr_el, +1);
-      } else if (type == MPFR_DUMP_MZERO){
-	mpfr_set_zero(ptr_el, -1);
-      } else if (type == MPFR_DUMP_NAN) {
-	mpfr_set_nan(ptr_el);
-      } else if (type == MPFR_DUMP_PINF) {
-	mpfr_set_inf(ptr_el, +1);
-      } else if (type == MPFR_DUMP_MINF) {
-	mpfr_set_inf(ptr_el, -1);
-      } else {
-	rb_raise(rb_eArgError, "Invalid dumped data for marshal_load.");
-      }
-    }
+    r_mpfr_load_string(ptr->data + i, dump);
   }
   return self;
 }
@@ -521,7 +461,9 @@ static VALUE r_mpfr_matrix_str_ary(VALUE self, VALUE format_str)
   VALUE ret_val[ptr_self->size];
   int i;
   for (i = 0; i < ptr_self->size; i++) {
-    mpfr_asprintf(&tmp_str, format, ptr_self->data + i);
+    if (!mpfr_asprintf(&tmp_str, format, ptr_self->data + i)) {
+      rb_raise(rb_eFatal, "Can not allocate a string by mpfr_asprintf.");
+    }
     ret_val[i] = rb_str_new2(tmp_str);
     mpfr_free_str(tmp_str);
   }
@@ -541,7 +483,9 @@ static VALUE r_mpfr_matrix_str_ary2(VALUE self, VALUE format_str)
   }
   for (i = 0; i < ptr_self->size; i += ptr_self->row) {
     for (j = 0; j < ptr_self->row; j++) {
-      mpfr_asprintf(&tmp_str, format, ptr_self->data + i + j);
+      if (!mpfr_asprintf(&tmp_str, format, ptr_self->data + i + j)) {
+	rb_raise(rb_eFatal, "Can not allocate a string by mpfr_asprintf.");
+      }
       rb_ary_push(ary[j], rb_str_new2(tmp_str));
       mpfr_free_str(tmp_str);
     }

data/lib/mpfr/version.rb

@@ -1 +1 @@
-RUBY_MPFR_VERSION = '0.0.10'
+RUBY_MPFR_VERSION = '0.0.11'

data/spec/mpfr/allocate_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__)) + '/spec_helper.rb'
 
-describe MPFR, 'when allocating objects from integer' do
+describe MPFR, 'when allocating objects from numbers' do
   it "should equal bignum" do
     MPFR.set_default_prec(100)
     num = 1
@@ -23,6 +23,17 @@ describe MPFR, 'when allocating objects from integer' do
 
   end
 
+  it "should equal float" do
+    MPFR.set_default_prec(256)
+    error = MPFR.new('1.0e-10')
+    GenerateNumber.float(100) do |f|
+      MPFR.new(f).should == f
+    end
+  end
+
+end
+
+describe MPFR, 'when allocating from objects that is not numbers' do
   it "should allocate from string" do
     MPFR.set_default_prec(53)
     for i in 0..1000
@@ -30,14 +41,15 @@ describe MPFR, 'when allocating objects from integer' do
     end
   end
 
-  it "should equal float" do
-    MPFR.set_default_prec(256)
-    error = MPFR.new('1.0e-10')
-    GenerateNumber.float(100) do |f|
-      MPFR.new(f).should == f
-    end
+  it "should raise error" do
+    lambda { MPFR.new(nil) }.should raise_error
+    lambda { MPFR.new(false) }.should raise_error
+    lambda { MPFR.new([]) }.should raise_error
+    lambda { MPFR.new(:sym) }.should raise_error
   end
+end
 
+describe MPFR, 'when creating new objects' do
   it "should duplicate" do
     MPFR.set_default_prec(141)
     for i in 0..1000
@@ -68,6 +80,4 @@ describe MPFR, 'when allocating objects from integer' do
       b.should == c
     end
   end
-  
 end
-

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-mpfr
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 10
-  version: 0.0.10
+  prerelease: 
+  version: 0.0.11
 platform: ruby
 authors: 
 - Takayuki YAMAGUCHI
@@ -14,39 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 +09:00
+date: 2011-02-26 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
+        version: 2.9.1
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 7
-        - 0
-        version: 2.7.0
-  type: :development
-  version_requirements: *id002
 description: |-
   ruby-mpfr is a library to use MPFR[http://www.mpfr.org/] which is a C library for
   multiple-precision floating-point computations.
@@ -127,6 +104,7 @@ files:
 - spec/mpfr_matrix/mpfr_square_matrix_spec.rb
 - spec/mpfr_matrix/spec_helper.rb
 - tasks/extconf.rake
+- .gemtest
 has_rdoc: true
 homepage: http://rubyforge.org/projects/ruby-mpfr/
 licenses: []
@@ -142,21 +120,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: ruby-mpfr
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: ruby-mpfr is a library to use MPFR[http://www.mpfr.org/] which is a C library for multiple-precision floating-point computations