ruby-mpfi 0.0.4 → 0.0.5

data/Manifest.txt

@@ -30,9 +30,6 @@ ext/mpfi_matrix/mpfi/ruby_mpfr_matrix.h
 lib/mpfi/matrix.rb
 lib/mpfi/version.rb
 ruby-mpfi.gemspec
-script/console
-script/destroy
-script/generate
 spec/mpfi/generate_number_module.rb
 spec/mpfi/mpfi_alloc_spec.rb
 spec/mpfi/mpfi_diam_arithmetic_spec.rb
@@ -42,6 +39,7 @@ spec/mpfi/mpfi_math_functions_spec.rb
 spec/mpfi/mpfi_set_operation_spec.rb
 spec/mpfi/ruby-mpfi_spec.rb
 spec/mpfi/spec_helper.rb
+spec/mpfi/string_spec.rb
 spec/mpfi_complex/spec_helper.rb
 spec/mpfi_matrix/generate_matrix_arguments.rb
 spec/mpfi_matrix/mpfi_matrix_alloc_spec.rb
@@ -54,5 +52,4 @@ spec/mpfi_matrix/mpfi_matrix_subdivision_spec.rb
 spec/mpfi_matrix/mpfi_square_matrix_spec.rb
 spec/mpfi_matrix/mpfi_vector_spec.rb
 spec/mpfi_matrix/spec_helper.rb
-spec/spec.opts
 tasks/extconf.rake

data/Rakefile

@@ -1,27 +1,45 @@
-require 'rubygems'
-gem 'hoe', '>= 2.1.0'
-require 'hoe'
-require 'fileutils'
-require './lib/mpfi/version.rb'
-
-Hoe.plugin :newgem
-# Hoe.plugin :website
-# Hoe.plugin :cucumberfeatures
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.spec 'ruby-mpfi' do
-  self.developer 'Takayuki YAMAGUCHI', 'd@ytak.info'
-  self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
-  self.rubyforge_name       = self.name # TODO this is default value
-  self.extra_deps         = [['ruby-mpfr','>= 0.0.4']]
-  self.spec_extras[:extensions] = ["ext/mpfi/extconf.rb", "ext/mpfi_complex/mpfi/extconf.rb", "ext/mpfi_matrix/mpfi/extconf.rb"]
-  self.extra_rdoc_files << 'README.rdoc'
-end
-
-require 'newgem/tasks'
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# remove_task :default
-# task :default => [:spec, :features]
+require 'rubygems'
+gem 'hoe', '>= 2.1.0'
+require 'hoe'
+require 'fileutils'
+require './lib/mpfi/version.rb'
+
+Hoe.plugin :newgem
+# Hoe.plugin :website
+# Hoe.plugin :cucumberfeatures
+
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+$hoe = Hoe.spec 'ruby-mpfi' do
+  self.developer 'Takayuki YAMAGUCHI', 'd@ytak.info'
+  self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
+  self.rubyforge_name       = self.name # TODO this is default value
+  self.extra_deps         = [['ruby-mpfr','>= 0.0.4']]
+  self.spec_extras[:extensions] = ["ext/mpfi/extconf.rb", "ext/mpfi_complex/mpfi/extconf.rb", "ext/mpfi_matrix/mpfi/extconf.rb"]
+  self.extra_rdoc_files << 'README.rdoc'
+end
+
+desc "Run 'make realclean' for extended libraries"
+task "ext:realclean" do
+  Dir.glob("ext/**/Makefile").each do |path|
+    system("cd #{File.dirname(path)}; make realclean")
+  end
+end
+
+desc "Run 'make clean' for extended libraries"
+task "ext:clean" do
+  Dir.glob("ext/**/Makefile").each do |path|
+    system("cd #{File.dirname(path)}; make clean")
+  end
+end
+
+desc "Run 'make realclean' for extended libraries"
+task 'ext:make' do
+  Dir.glob("ext/**/extconf.rb").each do |path|
+    system("cd #{File.dirname(path)}; ruby extconf.rb && make")
+  end
+end
+
+# TODO - want other tests/tasks run by default? Add them to the list
+# remove_task :default
+# task :default => [:spec, :features]

data/ext/mpfi/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"
 
 dir_config("mpfr")

data/ext/mpfi/ruby_mpfi.c

@@ -39,16 +39,49 @@ VALUE r_mpfi_make_new_fi_obj(MPFI *ptr)
   return ret;
 }
 
-/* VALUE obj must have method to_s or to_str. */
-static void r_mpfi_set_from_object (MPFI *ptr, VALUE obj)
+static void r_mpfi_set_interv_from_robjs (MPFI *ptr, VALUE a1, VALUE a2)
 {
+  if(RTEST(rb_funcall(__mpfr_class__, eqq, 1, a1)) && RTEST(rb_funcall(__mpfr_class__, eqq, 1, a2))){
+    MPFR *ptr_a1, *ptr_a2;
+    r_mpfr_get_struct(ptr_a1, a1);
+    r_mpfr_get_struct(ptr_a2, a2);
+    r_mpfi_set_function_state(mpfi_interv_fr(ptr, ptr_a1, ptr_a2));
+  }else if((TYPE(a1) == T_FIXNUM) && (TYPE(a2) == T_FIXNUM)){
+    r_mpfi_set_function_state(mpfi_interv_si(ptr, FIX2LONG(a1), FIX2LONG(a2)));
+  }else if((TYPE(a1) == T_FLOAT) && (TYPE(a2) == T_FLOAT)){
+    r_mpfi_set_function_state(mpfi_interv_d(ptr, NUM2DBL(a1), NUM2DBL(a2)));
+  }else{
+    MPFR *ptr_a1, *ptr_a2;
+    volatile VALUE tmp_a1 = r_mpfr_new_fr_obj(a1);
+    volatile VALUE tmp_a2 = r_mpfr_new_fr_obj(a2);
+    r_mpfr_get_struct(ptr_a1, tmp_a1);
+    r_mpfr_get_struct(ptr_a2, tmp_a2);
+    r_mpfi_set_function_state(mpfi_interv_fr(ptr, ptr_a1, ptr_a2));
+  }
+}
+
+static void r_mpfi_set_from_array (MPFI *ptr, VALUE obj)
+{
+  if (RARRAY_LEN(obj) != 2) {
+    rb_raise(rb_eArgError, "Invalid size of array for MPFI initialization.");
+  }
+  r_mpfi_set_interv_from_robjs(ptr, rb_ary_entry(obj, 0), rb_ary_entry(obj, 1));
+}
+
+/* VALUE obj must have method to_s or to_str.
+   The formats of strings that we can use are "number" or "[number1, number2]"
+   (refer MPFI documents). */
+static void r_mpfi_set_from_string (MPFI *ptr, VALUE obj)
+{
+  char *str;
   if(RTEST(rb_funcall(rb_funcall(obj, class, 0), method_defined, 1, __sym_to_str__))){
-    char *str = StringValuePtr(obj);
-    mpfi_set_str(ptr, str, 10);
+    str = StringValuePtr(obj);
   }else if(RTEST(rb_funcall(rb_funcall(obj, class, 0), method_defined, 1, __sym_to_s__))){
     VALUE tmp = rb_funcall(obj, to_s, 0);
-    char *str = StringValuePtr(tmp);
-    mpfi_set_str(ptr, str, 10);
+    str = StringValuePtr(tmp);
+  }
+  if(mpfi_set_str(ptr, str, 10) != 0) {
+    rb_raise(rb_eArgError, "Invalid string format of MPFI initialization: \"%s\"", str);
   }
 }
 
@@ -70,8 +103,11 @@ void r_mpfi_set_robj(MPFI *ptr, VALUE obj)
     case T_FIXNUM:
       mpfi_set_si(ptr, FIX2LONG(obj));
       break;
+    case T_ARRAY:
+      r_mpfi_set_from_array(ptr, obj);
+      break;
     default:
-      r_mpfi_set_from_object(ptr, obj);
+      r_mpfi_set_from_string(ptr, obj);
       break;
     }
   }
@@ -126,7 +162,11 @@ static VALUE r_mpfi_global_new(int argc, VALUE *argv, VALUE self)
   return val;
 }
 
-/* Two optional arguments are acceptable. First argument is value and second is precision. */
+/* Two optional arguments are acceptable.
+   The first argument means value of number,
+   which is MPFR, Float, Fixnum, String, and Array having two elements.
+   The string must be "number" or "[number1, number2]" (refer MPFI documents).
+   The second one is precision and its class is Fixnum. */
 static VALUE r_mpfi_initialize(int argc, VALUE *argv, VALUE self)
 {
   MPFI *ptr;
@@ -225,7 +265,7 @@ static VALUE r_mpfi_inspect(VALUE self)
   r_mpfi_get_struct(ptr_s, self);
   char *ret_str;
   mpfr_asprintf(&ret_str, "#<MPFI:%lx,['%.Re %.Re'],%d>",
-		NUM2LONG(rb_funcall(self, object_id, 0)), r_mpfi_left_ptr(ptr_s), r_mpfi_right_ptr(ptr_s), mpfi_get_prec(ptr_s));
+  		NUM2LONG(rb_funcall(self, object_id, 0)), r_mpfi_left_ptr(ptr_s), r_mpfi_right_ptr(ptr_s), mpfi_get_prec(ptr_s));
   VALUE ret_val = rb_str_new2(ret_str);
   mpfr_free_str(ret_str);
   return ret_val;
@@ -810,25 +850,8 @@ static VALUE r_mpfi_interv (VALUE self, VALUE a1, VALUE a2)
 {
   MPFI *ptr_self;
   r_mpfi_get_struct(ptr_self, self);
-
-  if(RTEST(rb_funcall(__mpfr_class__, eqq, 1, a1)) && RTEST(rb_funcall(__mpfr_class__, eqq, 1, a2))){
-    MPFR *ptr_a1, *ptr_a2;
-    r_mpfr_get_struct(ptr_a1, a1);
-    r_mpfr_get_struct(ptr_a2, a2);
-    r_mpfi_set_function_state(mpfi_interv_fr(ptr_self, ptr_a1, ptr_a2));
-  }else if((TYPE(a1) == T_FIXNUM) && (TYPE(a2) == T_FIXNUM)){
-    r_mpfi_set_function_state(mpfi_interv_si(ptr_self, FIX2LONG(a1), FIX2LONG(a2)));
-  }else if((TYPE(a1) == T_FLOAT) && (TYPE(a2) == T_FLOAT)){
-    r_mpfi_set_function_state(mpfi_interv_d(ptr_self, NUM2DBL(a1), NUM2DBL(a2)));
-  }else{
-    MPFR *ptr_a1, *ptr_a2;
-    volatile VALUE tmp_a1 = r_mpfr_new_fr_obj(a1);
-    r_mpfr_get_struct(ptr_a1, tmp_a1);
-    volatile VALUE tmp_a2 = r_mpfr_new_fr_obj(a2);
-    r_mpfr_get_struct(ptr_a2, tmp_a2);
-    r_mpfi_set_function_state(mpfi_interv_fr(ptr_self, ptr_a1, ptr_a2));
-  }
-  return self;  
+  r_mpfi_set_interv_from_robjs(ptr_self, a1, a2);
+  return self;
 }
 
 /* Return new MPFI of which endpoints are the same as p1 and p2. */
@@ -837,29 +860,7 @@ static VALUE r_mpfi_interval (int argc, VALUE *argv, VALUE self)
   VALUE val_ret;
   MPFI *ptr_ret;
   r_mpfi_make_struct_init2(val_ret, ptr_ret, r_mpfr_prec_from_optional_argument(2, 3, argc, argv));
-
-  if(RTEST(rb_funcall(__mpfr_class__, eqq, 1, argv[0])) && RTEST(rb_funcall(__mpfr_class__, eqq, 1, argv[1]))){
-    MPFR *ptr_a0, *ptr_a1;
-    r_mpfr_get_struct(ptr_a0, argv[0]);
-    r_mpfr_get_struct(ptr_a1, argv[1]);
-    r_mpfi_set_function_state(mpfi_interv_fr(ptr_ret, ptr_a0, ptr_a1));
-  }else if((TYPE(argv[0]) == T_FIXNUM) && (TYPE(argv[1]) == T_FIXNUM)){
-    r_mpfi_set_function_state(mpfi_interv_si(ptr_ret, FIX2LONG(argv[0]), FIX2LONG(argv[1])));
-  }else if((TYPE(argv[0]) == T_FLOAT) && (TYPE(argv[1]) == T_FLOAT)){
-    r_mpfi_set_function_state(mpfi_interv_d(ptr_ret, NUM2DBL(argv[0]), NUM2DBL(argv[1])));
-  }else{
-    /* printf("r_mpfi_interval [start]\n"); */
-    MPFR *ptr_a0, *ptr_a1;
-    volatile VALUE tmp1 = r_mpfr_new_fr_obj(argv[0]), tmp2 = r_mpfr_new_fr_obj(argv[1]);
-    r_mpfr_get_struct(ptr_a0, tmp1);
-    r_mpfr_get_struct(ptr_a1, tmp2);
-    /* volatile VALUE tmp_argv0 = r_mpfr_new_fr_obj(argv[0]);
-       r_mpfr_get_struct(ptr_a0, tmp_argv0); */
-    /* volatile VALUE tmp_argv1 = r_mpfr_new_fr_obj(argv[1]);
-       r_mpfr_get_struct(ptr_a1, tmp_argv1); */
-    r_mpfi_set_function_state(mpfi_interv_fr(ptr_ret, ptr_a0, ptr_a1));
-    /* printf("r_mpfi_interval [end]\n"); */
-  }
+  r_mpfi_set_interv_from_robjs(ptr_ret, argv[0], argv[1]);
   return val_ret;
 }
 

data/ext/mpfi_complex/mpfi/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"
 
 dir_config("mpfr")

data/ext/mpfi_matrix/mpfi/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
+
 dir_config('mpfr')
 dir_config('mpfi')
 dir_config('gmp')

data/lib/mpfi/version.rb

@@ -1 +1 @@
-RUBY_MPFI_VERSION = '0.0.4'
+RUBY_MPFI_VERSION = '0.0.5'

data/ruby-mpfi.gemspec

@@ -2,37 +2,37 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-mpfi}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takayuki YAMAGUCHI"]
-  s.date = %q{2009-12-19}
-  s.description = %q{FIX (describe your package)}
+  s.date = %q{2011-02-15}
+  s.description = %q{ruby-mpfi is an extended C library to use MPFI[http://gforge.inria.fr/projects/mpfi/]
+which is the library of the interval arithmetic with multiprecision.}
   s.email = ["d@ytak.info"]
   s.extensions = ["ext/mpfi/extconf.rb", "ext/mpfi_complex/mpfi/extconf.rb", "ext/mpfi_matrix/mpfi/extconf.rb"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "ext/mpfi/extconf.rb", "ext/mpfi/func_mpfi_extention.c", "ext/mpfi/func_mpfi_extention.h", "ext/mpfi/ruby_mpfi.c", "ext/mpfi/ruby_mpfi.h", "ext/mpfi/ruby_mpfr.h", "ext/mpfi_complex/mpfi/extconf.rb", "ext/mpfi_complex/mpfi/func_mpfi_extention.h", "ext/mpfi_complex/mpfi/func_ruby_mpfi_complex.c", "ext/mpfi_complex/mpfi/func_ruby_mpfi_complex.h", "ext/mpfi_complex/mpfi/ruby_mpfi.h", "ext/mpfi_complex/mpfi/ruby_mpfi_complex.c", "ext/mpfi_complex/mpfi/ruby_mpfi_complex.h", "ext/mpfi_complex/mpfi/ruby_mpfr.h", "ext/mpfi_matrix/mpfi/extconf.rb", "ext/mpfi_matrix/mpfi/func_mpfi_extention.h", "ext/mpfi_matrix/mpfi/func_mpfi_matrix.c", "ext/mpfi_matrix/mpfi/func_mpfi_matrix.h", "ext/mpfi_matrix/mpfi/func_mpfr_matrix.h", "ext/mpfi_matrix/mpfi/ruby_mpfi.h", "ext/mpfi_matrix/mpfi/ruby_mpfi_matrix.c", "ext/mpfi_matrix/mpfi/ruby_mpfi_matrix.h", "ext/mpfi_matrix/mpfi/ruby_mpfr.h", "ext/mpfi_matrix/mpfi/ruby_mpfr_matrix.h", "lib/mpfi/matrix.rb", "lib/mpfi/version.rb", "ruby-mpfi.gemspec", "script/console", "script/destroy", "script/generate", "spec/mpfi/generate_number_module.rb", "spec/mpfi/mpfi_alloc_spec.rb", "spec/mpfi/mpfi_diam_arithmetic_spec.rb", "spec/mpfi/mpfi_interval_arithmetic_spec.rb", "spec/mpfi/mpfi_interval_functions_spec.rb", "spec/mpfi/mpfi_math_functions_spec.rb", "spec/mpfi/mpfi_set_operation_spec.rb", "spec/mpfi/ruby-mpfi_spec.rb", "spec/mpfi/spec_helper.rb", "spec/mpfi_complex/spec_helper.rb", "spec/mpfi_matrix/generate_matrix_arguments.rb", "spec/mpfi_matrix/mpfi_matrix_alloc_spec.rb", "spec/mpfi_matrix/mpfi_matrix_arithmetic_spec.rb", "spec/mpfi_matrix/mpfi_matrix_interval_func_spec.rb", "spec/mpfi_matrix/mpfi_matrix_set_element_spec.rb", "spec/mpfi_matrix/mpfi_matrix_set_operation_spec.rb", "spec/mpfi_matrix/mpfi_matrix_string_spec.rb", "spec/mpfi_matrix/mpfi_matrix_subdivision_spec.rb", "spec/mpfi_matrix/mpfi_square_matrix_spec.rb", "spec/mpfi_matrix/mpfi_vector_spec.rb", "spec/mpfi_matrix/spec_helper.rb", "spec/spec.opts", "tasks/extconf.rake"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "ext/mpfi/extconf.rb", "ext/mpfi/func_mpfi_extention.c", "ext/mpfi/func_mpfi_extention.h", "ext/mpfi/ruby_mpfi.c", "ext/mpfi/ruby_mpfi.h", "ext/mpfi/ruby_mpfr.h", "ext/mpfi_complex/mpfi/extconf.rb", "ext/mpfi_complex/mpfi/func_mpfi_extention.h", "ext/mpfi_complex/mpfi/func_ruby_mpfi_complex.c", "ext/mpfi_complex/mpfi/func_ruby_mpfi_complex.h", "ext/mpfi_complex/mpfi/ruby_mpfi.h", "ext/mpfi_complex/mpfi/ruby_mpfi_complex.c", "ext/mpfi_complex/mpfi/ruby_mpfi_complex.h", "ext/mpfi_complex/mpfi/ruby_mpfr.h", "ext/mpfi_matrix/mpfi/extconf.rb", "ext/mpfi_matrix/mpfi/func_mpfi_extention.h", "ext/mpfi_matrix/mpfi/func_mpfi_matrix.c", "ext/mpfi_matrix/mpfi/func_mpfi_matrix.h", "ext/mpfi_matrix/mpfi/func_mpfr_matrix.h", "ext/mpfi_matrix/mpfi/ruby_mpfi.h", "ext/mpfi_matrix/mpfi/ruby_mpfi_matrix.c", "ext/mpfi_matrix/mpfi/ruby_mpfi_matrix.h", "ext/mpfi_matrix/mpfi/ruby_mpfr.h", "ext/mpfi_matrix/mpfi/ruby_mpfr_matrix.h", "lib/mpfi/matrix.rb", "lib/mpfi/version.rb", "ruby-mpfi.gemspec", "spec/mpfi/generate_number_module.rb", "spec/mpfi/mpfi_alloc_spec.rb", "spec/mpfi/mpfi_diam_arithmetic_spec.rb", "spec/mpfi/mpfi_interval_arithmetic_spec.rb", "spec/mpfi/mpfi_interval_functions_spec.rb", "spec/mpfi/mpfi_math_functions_spec.rb", "spec/mpfi/mpfi_set_operation_spec.rb", "spec/mpfi/ruby-mpfi_spec.rb", "spec/mpfi/spec_helper.rb", "spec/mpfi/string_spec.rb", "spec/mpfi_complex/spec_helper.rb", "spec/mpfi_matrix/generate_matrix_arguments.rb", "spec/mpfi_matrix/mpfi_matrix_alloc_spec.rb", "spec/mpfi_matrix/mpfi_matrix_arithmetic_spec.rb", "spec/mpfi_matrix/mpfi_matrix_interval_func_spec.rb", "spec/mpfi_matrix/mpfi_matrix_set_element_spec.rb", "spec/mpfi_matrix/mpfi_matrix_set_operation_spec.rb", "spec/mpfi_matrix/mpfi_matrix_string_spec.rb", "spec/mpfi_matrix/mpfi_matrix_subdivision_spec.rb", "spec/mpfi_matrix/mpfi_square_matrix_spec.rb", "spec/mpfi_matrix/mpfi_vector_spec.rb", "spec/mpfi_matrix/spec_helper.rb", "tasks/extconf.rake", ".gemtest"]
   s.homepage = %q{http://rubyforge.org/projects/ruby-mpfr/}
   s.post_install_message = %q{PostInstall.txt}
   s.rdoc_options = ["--main", "README.rdoc"]
-  s.require_paths = ["lib", "ext"]
+  s.require_paths = ["lib"]
   s.rubyforge_project = %q{ruby-mpfi}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{FIX (describe your package)}
+  s.rubygems_version = %q{1.5.2}
+  s.summary = %q{ruby-mpfi is an extended C library to use MPFI[http://gforge.inria.fr/projects/mpfi/] which is the library of the interval arithmetic with multiprecision.}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ruby-mpfr>, [">= 0.0.4"])
-      s.add_development_dependency(%q<hoe>, [">= 2.4.0"])
+      s.add_development_dependency(%q<hoe>, [">= 2.9.1"])
     else
       s.add_dependency(%q<ruby-mpfr>, [">= 0.0.4"])
-      s.add_dependency(%q<hoe>, [">= 2.4.0"])
+      s.add_dependency(%q<hoe>, [">= 2.9.1"])
     end
   else
     s.add_dependency(%q<ruby-mpfr>, [">= 0.0.4"])
-    s.add_dependency(%q<hoe>, [">= 2.4.0"])
+    s.add_dependency(%q<hoe>, [">= 2.9.1"])
   end
 end

data/spec/mpfi/mpfi_alloc_spec.rb

@@ -1,8 +1,4 @@
-require 'rubygems'
-require 'spec'
-require 'mpfr'
-require 'mpfi'
-require "#{File.dirname(File.expand_path(__FILE__))}/generate_number_module.rb"
+require_relative 'spec_helper'
 
 describe MPFI, "when initializing MPFI instance" do
   before(:all) do
@@ -53,3 +49,46 @@ describe MPFI, "when initializing MPFI instance by method interval" do
 
 end
 
+describe MPFI, "when setting value from some objects" do
+  before(:all) do
+    MPFR.set_default_prec(128)
+    MPFR.set_error_of_test(MPFR('1e-12'))
+  end
+
+  it "should create an MPFI object from a string" do
+    n = MPFI("[1.2, 1.3]")
+    n.left.check_error(1.2).should be_true
+    n.right.check_error(1.3).should be_true
+  end
+
+  it "should create an MPFI object from an integer" do
+    n = MPFI(8)
+    n.left.check_error(8).should be_true
+    n.right.check_error(8).should be_true
+  end
+
+  it "should create an MPFI object from an array of float numbers" do
+    n = MPFI([-1.3, -0.5])
+    n.left.check_error(-1.3)
+    n.right.check_error(-0.5)
+  end
+
+  it "should create an MPFI object from an array of MPFR numbers" do
+    n = MPFI([MPFR(-1.0), MPFR(-0.5)])
+    n.left.check_error(-1.0)
+    n.right.check_error(-0.5)
+  end
+
+  it "should create an MPFI object from an array of strings" do
+    n = MPFI(['3.8', '4.9'])
+    n.left.check_error(3.8)
+    n.right.check_error(4.9)
+  end
+
+  it "should create an MPFI object from an array of some objects" do
+    n = MPFI([MPFR(1.2), '4.9'])
+    n.left.check_error(1.2)
+    n.right.check_error(4.9)
+  end
+
+end

data/spec/mpfi/mpfi_diam_arithmetic_spec.rb

@@ -1,8 +1,4 @@
-require 'rubygems'
-require 'spec'
-require 'mpfr'
-require 'mpfi'
-require "#{File.dirname(File.expand_path(__FILE__))}/generate_number_module.rb"
+require_relative 'spec_helper'
 
 describe MPFI, "when puting arithmetic operation" do
   before(:all) do

data/spec/mpfi/mpfi_interval_arithmetic_spec.rb

@@ -1,8 +1,4 @@
-require 'rubygems'
-require 'spec'
-require 'mpfr'
-require 'mpfi'
-require "#{File.dirname(File.expand_path(__FILE__))}/generate_number_module.rb"
+require_relative 'spec_helper'
 
 #
 # To test method +, -, / and *, we calculate these operator for MPFR and MPFI

data/spec/mpfi/mpfi_interval_functions_spec.rb

@@ -1,8 +1,4 @@
-require 'rubygems'
-require 'spec'
-require 'mpfr'
-require 'mpfi'
-require "#{File.dirname(File.expand_path(__FILE__))}/generate_number_module.rb"
+require_relative 'spec_helper'
 
 #
 # The following is test for interval functions and endpoints. 

data/spec/mpfi/mpfi_math_functions_spec.rb

@@ -1,9 +1,4 @@
-require 'rubygems'
-require 'spec'
-require 'mpfr'
-require 'mpfi'
-require "#{File.dirname(File.expand_path(__FILE__))}/generate_number_module.rb"
-
+require_relative 'spec_helper'
 
 describe MPFI, "when calculating mathematical functions" do
   it "should not raise error" do

data/spec/mpfi/mpfi_set_operation_spec.rb

@@ -1,8 +1,4 @@
-require 'rubygems'
-require 'spec'
-require 'mpfr'
-require 'mpfi'
-require "#{File.dirname(File.expand_path(__FILE__))}/generate_number_module.rb"
+require_relative 'spec_helper'
 
 describe MPFI, "when checking inclusive relations" do
   before(:all) do

data/spec/mpfi/spec_helper.rb

@@ -1,10 +1,15 @@
 begin
-  require 'spec'
+  require 'rspec'
 rescue LoadError
   require 'rubygems' unless ENV['NO_RUBYGEMS']
   gem 'rspec'
-  require 'spec'
+  require 'rspec'
 end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'mpfi'
+
+require 'pp'
+require 'mpfr'
+require 'mpfr/rspec'
+require_relative '../../ext/mpfi/mpfi.so'
+require "#{File.dirname(File.expand_path(__FILE__))}/generate_number_module.rb"

data/spec/mpfi/string_spec.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe MPFI, "when converting to string" do
+  it "should return string created by inspect" do
+    s = MPFI(['1.2', '1.3']).inspect
+    s.should be_an_instance_of String
+  end
+
+  it "should return an array of strings" do
+    a = MPFI(['1.2', '1.3']).to_str_ary
+    a.should be_an_instance_of Array
+    a.size.should == 2
+  end
+end

data/spec/mpfi_complex/spec_helper.rb

@@ -1,9 +1,9 @@
 begin
-  require 'spec'
+  require 'rspec'
 rescue LoadError
   require 'rubygems' unless ENV['NO_RUBYGEMS']
   gem 'rspec'
-  require 'spec'
+  require 'rspec'
 end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')

data/spec/mpfi_matrix/spec_helper.rb

@@ -1,9 +1,9 @@
 begin
-  require 'spec'
+  require 'rspec'
 rescue LoadError
   require 'rubygems' unless ENV['NO_RUBYGEMS']
   gem 'rspec'
-  require 'spec'
+  require 'rspec'
 end
 
 $:.unshift(File.dirname(__FILE__) + '/../../lib')

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-mpfi
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors: 
 - Takayuki YAMAGUCHI
@@ -9,49 +10,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 +09:00
+date: 2011-02-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-mpfr
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.0.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
-    version: 
+        version: 2.9.1
+  type: :development
+  version_requirements: *id002
 description: |-
   ruby-mpfi is an extended C library to use MPFI[http://gforge.inria.fr/projects/mpfi/]
   which is the library of the interval arithmetic with multiprecision.
@@ -101,9 +84,6 @@ files:
 - lib/mpfi/matrix.rb
 - lib/mpfi/version.rb
 - ruby-mpfi.gemspec
-- script/console
-- script/destroy
-- script/generate
 - spec/mpfi/generate_number_module.rb
 - spec/mpfi/mpfi_alloc_spec.rb
 - spec/mpfi/mpfi_diam_arithmetic_spec.rb
@@ -113,6 +93,7 @@ files:
 - spec/mpfi/mpfi_set_operation_spec.rb
 - spec/mpfi/ruby-mpfi_spec.rb
 - spec/mpfi/spec_helper.rb
+- spec/mpfi/string_spec.rb
 - spec/mpfi_complex/spec_helper.rb
 - spec/mpfi_matrix/generate_matrix_arguments.rb
 - spec/mpfi_matrix/mpfi_matrix_alloc_spec.rb
@@ -125,8 +106,8 @@ files:
 - spec/mpfi_matrix/mpfi_square_matrix_spec.rb
 - spec/mpfi_matrix/mpfi_vector_spec.rb
 - spec/mpfi_matrix/spec_helper.rb
-- spec/spec.opts
 - tasks/extconf.rake
+- .gemtest
 has_rdoc: true
 homepage: http://rubyforge.org/projects/ruby-mpfr/
 licenses: []
@@ -137,23 +118,22 @@ rdoc_options:
 - README.rdoc
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ruby-mpfi
-rubygems_version: 1.3.5
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: ruby-mpfi is an extended C library to use MPFI[http://gforge.inria.fr/projects/mpfi/] which is the library of the interval arithmetic with multiprecision.

data/script/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/ruby-mpfi.rb'}"
-puts "Loading ruby-mpfi gem"
-exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)

data/spec/spec.opts

@@ -1 +0,0 @@
---colour