ruby-mpfi 0.0.2 → 0.0.3

data/ext/mpfi_complex/mpfi/ruby_mpfi_complex.c

@@ -14,10 +14,8 @@ static VALUE r_mpfi_complex_alloc (VALUE self){
   return self;
 }
 
-/* Initialization function for MPF::Complex. */
-static VALUE r_mpfi_complex_initialize (int argc, VALUE *argv, VALUE self){
-  MPFIComplex *ptr;
-  r_mpfi_get_complex_struct(ptr, self);
+static void r_mpfi_complex_set_initial_value(MPFIComplex *ptr, int argc, VALUE *argv)
+{
   mpfi_complex_init(ptr);
   switch (argc) {
   case 0:
@@ -34,7 +32,24 @@ static VALUE r_mpfi_complex_initialize (int argc, VALUE *argv, VALUE self){
   default:
     rb_raise(rb_eArgError, "Number of MPF::Complex.new arguments must be lesser than three.");
     break;
-  }
+  }  
+}
+
+/* Return new MPFI::Complex instance. The same arguments as MPFI::Complex.new is acceptable. */
+static VALUE r_mpfi_complex_global_new(int argc, VALUE *argv, VALUE self)
+{
+  MPFIComplex *ptr;
+  VALUE val;
+  r_mpfi_make_complex_struct(val, ptr);
+  r_mpfi_complex_set_initial_value(ptr, argc, argv);
+  return val;
+}
+
+/* Initialization function for MPF::Complex. */
+static VALUE r_mpfi_complex_initialize (int argc, VALUE *argv, VALUE self){
+  MPFIComplex *ptr;
+  r_mpfi_get_complex_struct(ptr, self);
+  r_mpfi_complex_set_initial_value(ptr, argc, argv);
   return Qtrue;
 }
 
@@ -48,7 +63,7 @@ static VALUE r_mpfi_complex_initialize_copy (VALUE self, VALUE other){
   return Qtrue;
 }
 
-
+/* Return real part. */
 static VALUE r_mpfi_complex_real (VALUE self){
   MPFIComplex *ptr_self;
   r_mpfi_get_complex_struct(ptr_self, self);
@@ -59,6 +74,7 @@ static VALUE r_mpfi_complex_real (VALUE self){
   return ret;
 }
 
+/* Return imaginary part. */
 static VALUE r_mpfi_complex_imaginary (VALUE self){
   MPFIComplex *ptr_self;
   r_mpfi_get_complex_struct(ptr_self, self);
@@ -69,6 +85,7 @@ static VALUE r_mpfi_complex_imaginary (VALUE self){
   return ret;
 }
 
+/* If _p1_ is 0, return real part. If _p1_ is 1, return imaginary part. */
 static VALUE r_mpfi_complex_element (VALUE self, VALUE arg){
   MPFIComplex *ptr_self;
   r_mpfi_get_complex_struct(ptr_self, self);
@@ -89,6 +106,7 @@ static VALUE r_mpfi_complex_element (VALUE self, VALUE arg){
   return ret;
 }
 
+/* Return conjugate complex number. */
 static VALUE r_mpfi_complex_conjugate (VALUE self){
   MPFIComplex *ptr_self, *ptr_ret;
   r_mpfi_get_complex_struct(ptr_self, self);
@@ -109,7 +127,7 @@ static VALUE r_mpfi_complex_conjugate (VALUE self){
 /* } */
 
 
-
+/* String for inspect. */
 static VALUE r_mpfi_complex_inspect(VALUE self){
   MPFIComplex *ptr_s;
   r_mpfi_get_complex_struct(ptr_s, self);
@@ -122,7 +140,7 @@ static VALUE r_mpfi_complex_inspect(VALUE self){
   return ret_val;
 }
 
-/* Return array which has strings converted elements to. */
+/* Return array including strings which the elements is converted to by _p1_. */
 static VALUE r_mpfi_complex_str_ary(VALUE self, VALUE format_str){
   MPFIComplex *ptr_self;
   r_mpfi_get_complex_struct(ptr_self, self);
@@ -137,8 +155,7 @@ static VALUE r_mpfi_complex_str_ary(VALUE self, VALUE format_str){
   return rb_ary_new4(2, ret_val);
 }
 
-
-
+/* Return _self_ + _p1_.*/
 static VALUE r_mpfi_complex_add (VALUE self, VALUE other){
   MPFIComplex *ptr_self, *ptr_other, *ptr_ret;
   r_mpfi_get_complex_struct(ptr_self, self);
@@ -149,6 +166,7 @@ static VALUE r_mpfi_complex_add (VALUE self, VALUE other){
   return ret;
 }
 
+/* Return _self_ - _p1_.*/
 static VALUE r_mpfi_complex_sub (VALUE self, VALUE other){
   MPFIComplex *ptr_self, *ptr_other, *ptr_ret;
   r_mpfi_get_complex_struct(ptr_self, self);
@@ -159,6 +177,7 @@ static VALUE r_mpfi_complex_sub (VALUE self, VALUE other){
   return ret;
 }
 
+/* Return _self_ * _p1_.*/
 static VALUE r_mpfi_complex_mul (VALUE self, VALUE other){
   MPFIComplex *ptr_self, *ptr_other, *ptr_ret;
   r_mpfi_get_complex_struct(ptr_self, self);
@@ -169,6 +188,7 @@ static VALUE r_mpfi_complex_mul (VALUE self, VALUE other){
   return ret;
 }
 
+/* Return _self_ / _p1_.*/
 static VALUE r_mpfi_complex_div (VALUE self, VALUE other){
   MPFIComplex *ptr_self, *ptr_other, *ptr_ret;
   r_mpfi_get_complex_struct(ptr_self, self);
@@ -180,16 +200,16 @@ static VALUE r_mpfi_complex_div (VALUE self, VALUE other){
 }
 
 
-
-
 void Init_complex(){
-  r_mpfi_complex = rb_define_class_under(rb_define_class("MPFI", rb_cNumeric), "Complex", rb_cObject);
+  VALUE tmp_mpfi_class = rb_define_class("MPFI", rb_cNumeric);
 
+  r_mpfi_complex = rb_define_class_under(tmp_mpfi_class, "Complex", rb_cObject);
+
+  rb_define_singleton_method(r_mpfi_complex, "Complex", r_mpfi_complex_global_new, -1);
   rb_define_alloc_func(r_mpfi_complex, r_mpfi_complex_alloc);
   rb_define_private_method(r_mpfi_complex, "initialize", r_mpfi_complex_initialize, -1);
   rb_define_private_method(r_mpfi_complex, "initialize_copy", r_mpfi_complex_initialize_copy, 1);
 
-
   rb_define_method(r_mpfi_complex, "real", r_mpfi_complex_real, 0);
   rb_define_method(r_mpfi_complex, "imaginary", r_mpfi_complex_imaginary, 0);
   rb_define_method(r_mpfi_complex, "element", r_mpfi_complex_element, 1);

data/ext/mpfi_matrix/mpfi/func_mpfi_matrix.c

@@ -582,7 +582,7 @@ int mpfi_square_matrix_lu_decomp (MPFIMatrix *ret, int *indx, MPFIMatrix *x){
   return ret_val;
 }
 
-void mpfi_2d_square_matrix_determinant(MPFI *det, MPFIMatrix *x){
+static void mpfi_2d_square_matrix_determinant(MPFI *det, MPFIMatrix *x){
   MPFI *tmp;
   r_mpfi_temp_alloc_init(tmp);
   mpfi_mul(det, x->data, x->data + 3);
@@ -591,7 +591,7 @@ void mpfi_2d_square_matrix_determinant(MPFI *det, MPFIMatrix *x){
   r_mpfi_temp_free(tmp);
 }
 
-void mpfi_3d_square_matrix_determinant(MPFI *det, MPFIMatrix *x){
+static void mpfi_3d_square_matrix_determinant(MPFI *det, MPFIMatrix *x){
   MPFI *tmp;
   r_mpfi_temp_alloc_init(tmp);
 
@@ -695,90 +695,6 @@ void mpfi_square_matrix_qr_decomp(MPFIMatrix *q, MPFIMatrix *r, MPFIMatrix *x){
   r_mpfi_temp_free(tmp);
 }
 
-/* If inverse matrix does not exist, return 1. Otherwise return 0. */
-int mpfi_2d_square_matrix_inverse_matrix(MPFIMatrix *inv, MPFIMatrix *x){
-  MPFIMatrix *t_mat;
-  r_mpfi_matrix_temp_alloc_init(t_mat, inv->row, inv->column);
-  MPFI *t_fi;
-  r_mpfi_temp_alloc_init(t_fi);
-  mpfi_2d_square_matrix_determinant(t_fi, x);
-  if(mpfi_has_zero(t_fi) > 0){
-    return 1;
-  }else{
-    mpfi_ui_div(t_fi, 1, t_fi);
-    mpfi_mul(t_mat->data, x->data + 3, t_fi);
-    mpfi_mul(t_mat->data + 3, x->data, t_fi);
-    mpfi_neg(t_fi, t_fi);
-    mpfi_mul(t_mat->data + 1, x->data + 1, t_fi);
-    mpfi_mul(t_mat->data + 2, x->data + 2, t_fi);
-  }
-  mpfi_matrix_set(inv, t_mat);
-  r_mpfi_matrix_temp_free(t_mat);
-  r_mpfi_temp_free(t_fi);
-  return 0;
-}
-
-/* x = -(sqrt(a11**2-2*a00*a11+4*a01*a10+a00**2)-a11-a00)/2.0E+0 */
-/* x = (sqrt(a11**2-2*a00*a11+4*a01*a10+a00**2)+a11+a00)/2.0E+0 */
-/* If there are two real eigenvalues, return positive number. */
-/* If only one eigenvalue exists, return 0. */
-/* If there are two complex eigenvalues, this functionreturn negative number and */
-/* first returned value is real part and second one is imaginary part. */
-int mpfi_2d_square_matrix_eigenvalue(MPFI *val1, MPFI *val2, MPFIMatrix *x){
-  int ret;
-  MPFI *d;
-  r_mpfi_temp_alloc_init(d);
-
-  mpfi_sub(val1, x->data, x->data + 3);
-  mpfi_mul(val1, val1, val1);
-  mpfi_mul(d, x->data + 1, x->data + 2);
-  mpfi_mul_ui(d, d, 4);
-  mpfi_add(d, d, val1);
-
-  mpfi_add(val1, x->data, x->data + 3);
-  mpfi_div_ui(val1, val1, 2);
-  if(mpfr_cmp_si(r_mpfi_right_ptr(d), 0) > 0){
-    ret = 1;
-    mpfi_sqrt(d, d);
-    mpfi_div_ui(d, d, 2);
-    mpfi_sub(val2, val1, d);
-    mpfi_add(val1, val1, d);
-  }else if(mpfr_cmp_si(r_mpfi_right_ptr(d), 0) < 0){
-    ret = -1;
-    mpfi_neg(d, d);
-    mpfi_sqrt(d, d);
-    mpfi_div_ui(val2, d, 2);
-  }else{
-    ret = 0;
-    mpfi_set(val2, val1);
-  }
-
-  r_mpfi_temp_free(d);
-  return ret;
-}
-
-void mpfi_2d_square_matrix_real_eigenvector(MPFIMatrix *vec, MPFIMatrix *x, MPFI *eigenval){
-  MPFIMatrix *tmp;
-  r_mpfi_matrix_temp_alloc_init(tmp, 2, 1);
-  MPFI *tmp_fi;
-  r_mpfi_temp_alloc_init(tmp_fi);
-  mpfi_sub(tmp_fi, x->data + 3, eigenval);
-  if(mpfi_has_zero(x->data + 1) > 0 && mpfi_has_zero(tmp_fi) > 0){
-    mpfi_set(tmp->data, x->data + 2);
-    mpfi_sub(tmp->data + 1, eigenval, x->data);
-  }else{
-    mpfi_sub(tmp->data, eigenval, x->data + 3);
-    mpfi_set(tmp->data + 1, x->data + 1);
-  }
-  if(mpfi_vector_normalize(vec, tmp) == 1){
-    gmp_printf("Argument matrix\n%.Ff\n%.Ff\n%.Ff\n%.Ff\n", x->data, x->data + 1, x->data + 2, x->data + 3);
-    gmp_printf("Argument eigenvalue\n%.Ff\n", eigenval);
-    rb_raise(rb_eArgError, "Invalid eigenvalue or eigenvector.");
-  }
-  r_mpfi_matrix_temp_free(tmp);
-  r_mpfi_temp_free(tmp_fi);
-}
-
 void mpfi_square_matrix_identity(MPFIMatrix *id){
   int i, j, index;
   for (j = 0; j < id->column; j++) {

data/ext/mpfi_matrix/mpfi/func_mpfi_matrix.h

@@ -5,7 +5,6 @@
 #include <mpfi_io.h>
 #include "ruby_mpfr_matrix.h"
 #include "ruby_mpfi.h"
-#include "ruby_mpfi_complex.h"
 
 typedef struct __MPFIMatrix{
   int row, column, size;
@@ -92,12 +91,7 @@ int mpfi_vector_set_length(MPFIMatrix *new, MPFIMatrix *x, MPFR *l);
 
 /* ----------------- square matrix ----------------- */
 int mpfi_square_matrix_lu_decomp (MPFIMatrix *ret, int *indx, MPFIMatrix *x);
-void mpfi_2d_square_matrix_determinant(MPFI *det, MPFIMatrix *x);
-void mpfi_3d_square_matrix_determinant(MPFI *det, MPFIMatrix *x);
 void mpfi_square_matrix_determinant(MPFI *det, MPFIMatrix *x);
 void mpfi_square_matrix_qr_decomp(MPFIMatrix *q, MPFIMatrix *r, MPFIMatrix *x);
-int mpfi_2d_square_matrix_inverse_matrix(MPFIMatrix *inv, MPFIMatrix *x);
-int mpfi_2d_square_matrix_eigenvalue(MPFI *val1, MPFI *val2, MPFIMatrix *x);
-void mpfi_2d_square_matrix_real_eigenvector(MPFIMatrix *vec, MPFIMatrix *x, MPFI *eigenval);
 void mpfi_square_matrix_identity(MPFIMatrix *id);
 

data/ext/mpfi_matrix/mpfi/ruby_mpfi_matrix.c

@@ -42,7 +42,7 @@ VALUE r_mpfi_matrix_robj(MPFIMatrix *x){
   return ret;
 }
 
-/* Allocation function for MPF::Matrix. */
+/* Allocation function for MPFI::Matrix. */
 static VALUE r_mpfi_matrix_alloc (VALUE self){
   MPFIMatrix *ptr;
   r_mpfi_make_matrix_struct(self, ptr);
@@ -56,10 +56,8 @@ static VALUE r_mpfi_matrix_alloc (VALUE self){
 /*   mpfi_matrix_set(x, ptr_src); */
 /* } */
 
-/* Initialization function for MPF::Matrix. */
-static VALUE r_mpfi_matrix_initialize (int argc, VALUE *argv, VALUE self){
-  MPFIMatrix *ptr;
-  r_mpfi_get_matrix_struct(ptr, self);
+static void r_mpfi_matrix_set_initial_value(MPFIMatrix *ptr, int argc, VALUE *argv)
+{
   int row, column, i, j;
   VALUE row_ary;
   switch (argc) {
@@ -70,7 +68,7 @@ static VALUE r_mpfi_matrix_initialize (int argc, VALUE *argv, VALUE self){
     for (i = 0; i < row; i++) {
       row_ary = rb_ary_entry(argv[0], i);
       if (column != RARRAY_LEN(row_ary)) {
-	rb_raise(rb_eArgError, "MPF::Matrix.new needs Array which has arrays of same sizes.");
+	rb_raise(rb_eArgError, "MPFI::Matrix.new needs Array which has arrays of same sizes.");
       }
       for (j = 0; j < column; j++) {
 	r_mpfi_set_robj(mpfi_matrix_get_element(ptr, i, j), rb_ary_entry(row_ary, j));
@@ -82,23 +80,38 @@ static VALUE r_mpfi_matrix_initialize (int argc, VALUE *argv, VALUE self){
     mpfi_matrix_set_zeros(ptr);
     break;
   default:
-    rb_raise(rb_eArgError, "MPF::Matrix.new needs one or two arguments.");
+    rb_raise(rb_eArgError, "MPFI::Matrix.new needs one or two arguments.");
     break;
   }
+}
+
+/* Return new MPFI::Matrix instance. The same arguments as MPFI::Matrix.new is acceptable. */
+static VALUE r_mpfi_matrix_global_new(int argc, VALUE *argv, VALUE self)
+{
+  MPFIMatrix *ptr;
+  VALUE val;
+  r_mpfi_make_matrix_struct(val, ptr);
+  r_mpfi_matrix_set_initial_value(ptr, argc, argv);
+  return val;
+}
+
+/* Initialization function for MPFI::Matrix. */
+static VALUE r_mpfi_matrix_initialize (int argc, VALUE *argv, VALUE self){
+  MPFIMatrix *ptr;
+  r_mpfi_get_matrix_struct(ptr, self);
+  r_mpfi_matrix_set_initial_value(ptr, argc, argv);
   return Qtrue;
 }
 
-/* Allocation function for MPF::SquareMatrix. */
+/* Allocation function for MPFI::SquareMatrix. */
 static VALUE r_mpfi_square_matrix_alloc (VALUE self){
   MPFIMatrix *ptr;
   r_mpfi_make_square_matrix_struct(self, ptr);
   return self;
 }
 
-/* Initialization function for MPF::SquareMatrix. */
-static VALUE r_mpfi_square_matrix_initialize (VALUE self, VALUE arg){
-  MPFIMatrix *ptr;
-  r_mpfi_get_matrix_struct(ptr, self);
+static void r_mpfi_square_matrix_set_initial_value(MPFIMatrix *ptr, VALUE arg)
+{
   int row, column, i, j;
   VALUE row_ary;
   switch(TYPE(arg)){
@@ -110,14 +123,14 @@ static VALUE r_mpfi_square_matrix_initialize (VALUE self, VALUE arg){
       for (i = 0; i < row; i++) {
 	row_ary = rb_ary_entry(arg, i);
 	if (column != RARRAY_LEN(row_ary)) {
-	  rb_raise(rb_eArgError, "MPF::Matrix.new needs Array which has arrays of same sizes.");
+	  rb_raise(rb_eArgError, "MPFI::Matrix.new needs Array which has arrays of same sizes.");
 	}
 	for (j = 0; j < column; j++) {
 	  r_mpfi_set_robj(mpfi_matrix_get_element(ptr, i, j), rb_ary_entry(row_ary, j));
 	}
       }
     }else{
-      rb_raise(rb_eArgError, "MPF::SquareMatrix.new needs two dimensinal Array which has the same sizes of row and column.");
+      rb_raise(rb_eArgError, "MPFI::SquareMatrix.new needs two dimensinal Array which has the same sizes of row and column.");
     }
     break;
   case T_FIXNUM:
@@ -126,9 +139,26 @@ static VALUE r_mpfi_square_matrix_initialize (VALUE self, VALUE arg){
     mpfi_matrix_set_zeros(ptr);
     break;
   default:
-    rb_raise(rb_eArgError, "MPF::SquareMatrix.new needs Array or Fixnum.");
+    rb_raise(rb_eArgError, "MPFI::SquareMatrix.new needs Array or Fixnum.");
     break;
   }  
+}
+
+/* Return new MPFI::SquareMatrix instance. The same arguments as MPFI::SquareMatrix.new is acceptable. */
+static VALUE r_mpfi_square_matrix_global_new(int argc, VALUE arg)
+{
+  MPFIMatrix *ptr;
+  VALUE val;
+  r_mpfi_make_matrix_struct(val, ptr);
+  r_mpfi_square_matrix_set_initial_value(ptr, arg);
+  return val;
+}
+
+/* Initialization function for MPFI::SquareMatrix. */
+static VALUE r_mpfi_square_matrix_initialize (VALUE self, VALUE arg){
+  MPFIMatrix *ptr;
+  r_mpfi_get_matrix_struct(ptr, self);
+  r_mpfi_square_matrix_set_initial_value(ptr, arg);
   return Qtrue;
 }
 
@@ -142,17 +172,15 @@ static VALUE r_mpfi_matrix_initialize_copy (VALUE self, VALUE other){
   return Qtrue;
 }
 
-/* Allocation function for MPF::ColumnVector. */
+/* Allocation function for MPFI::ColumnVector. */
 static VALUE r_mpfi_col_vector_alloc (VALUE self){
   MPFIMatrix *ptr;
   r_mpfi_make_col_vector_struct(self, ptr);
   return self;
 }
 
-/* Initialization function for MPF::ColumnVector. */
-static VALUE r_mpfi_col_vector_initialize (VALUE self, VALUE arg){
-  MPFIMatrix *ptr;
-  r_mpfi_get_matrix_struct(ptr, self);
+static void r_mpfi_col_vector_set_initial_value(MPFIMatrix *ptr, VALUE arg)
+{
   int row, i;
   switch(TYPE(arg)){
   case T_ARRAY:
@@ -170,23 +198,38 @@ static VALUE r_mpfi_col_vector_initialize (VALUE self, VALUE arg){
     }
     break;
   default:
-    rb_raise(rb_eArgError, "MPF::ColumnVector.new needs Array or Fixnum.");
+    rb_raise(rb_eArgError, "MPFI::ColumnVector.new needs Array or Fixnum.");
     break;
   }  
+}
+
+/* Return new MPFI::ColumnVector instance. The same arguments as MPFI::ColumnVector.new is acceptable. */
+static VALUE r_mpfi_col_vector_global_new(int argc, VALUE arg)
+{
+  MPFIMatrix *ptr;
+  VALUE val;
+  r_mpfi_make_matrix_struct(val, ptr);
+  r_mpfi_col_vector_set_initial_value(ptr, arg);
+  return val;
+}
+
+/* Initialization function for MPFI::ColumnVector. */
+static VALUE r_mpfi_col_vector_initialize (VALUE self, VALUE arg){
+  MPFIMatrix *ptr;
+  r_mpfi_get_matrix_struct(ptr, self);
+  r_mpfi_col_vector_set_initial_value(ptr, arg);
   return Qtrue;
 }
 
-/* Allocation function for MPF::RowVector. */
+/* Allocation function for MPFI::RowVector. */
 static VALUE r_mpfi_row_vector_alloc (VALUE self){
   MPFIMatrix *ptr;
   r_mpfi_make_row_vector_struct(self, ptr);
   return self;
 }
 
-/* Initialization function for MPF::RowVector. */
-static VALUE r_mpfi_row_vector_initialize (VALUE self, VALUE arg){
-  MPFIMatrix *ptr;
-  r_mpfi_get_matrix_struct(ptr, self);
+static void r_mpfi_row_vector_set_initial_value(MPFIMatrix *ptr, VALUE arg)
+{
   int column, i;
   switch(TYPE(arg)){
   case T_ARRAY:
@@ -204,9 +247,26 @@ static VALUE r_mpfi_row_vector_initialize (VALUE self, VALUE arg){
     }
     break;
   default:
-    rb_raise(rb_eArgError, "MPF::RowVector.new needs Array or Fixnum.");
+    rb_raise(rb_eArgError, "MPFI::RowVector.new needs Array or Fixnum.");
     break;
-  }  
+  }
+}
+
+/* Return new MPFI::RowVector instance. The same arguments as MPFI::RowVector.new is acceptable. */
+static VALUE r_mpfi_row_vector_global_new(int argc, VALUE arg)
+{
+  MPFIMatrix *ptr;
+  VALUE val;
+  r_mpfi_make_matrix_struct(val, ptr);
+  r_mpfi_row_vector_set_initial_value(ptr, arg);
+  return val;
+}
+
+/* Initialization function for MPFI::RowVector. */
+static VALUE r_mpfi_row_vector_initialize (VALUE self, VALUE arg){
+  MPFIMatrix *ptr;
+  r_mpfi_get_matrix_struct(ptr, self);
+  r_mpfi_row_vector_set_initial_value(ptr, arg);
   return Qtrue;
 }
 
@@ -1079,22 +1139,26 @@ static VALUE r_mpfr_matrix_to_fi_matrix(VALUE self){
 void Init_matrix(){
 
   /* Initialization of MPFI::Matrix, MPFI::SquareMatrix, MPFI::ColumnVector and MPFI::RowVector */
-  VALUE tmp_mpfi_class = rb_define_class("MPFI", rb_cNumeric);
-  r_mpfi_matrix = rb_define_class_under(tmp_mpfi_class, "Matrix", rb_cObject);
-  r_mpfi_square_matrix = rb_define_class_under(tmp_mpfi_class, "SquareMatrix", r_mpfi_matrix);
-  r_mpfi_col_vector = rb_define_class_under(tmp_mpfi_class, "ColumnVector", r_mpfi_matrix);
-  r_mpfi_row_vector = rb_define_class_under(tmp_mpfi_class, "RowVector", r_mpfi_matrix);
+  VALUE tmp_r_mpfi_class = rb_define_class("MPFI", rb_cNumeric);
+  r_mpfi_matrix = rb_define_class_under(tmp_r_mpfi_class, "Matrix", rb_cObject);
+  r_mpfi_square_matrix = rb_define_class_under(tmp_r_mpfi_class, "SquareMatrix", r_mpfi_matrix);
+  r_mpfi_col_vector = rb_define_class_under(tmp_r_mpfi_class, "ColumnVector", r_mpfi_matrix);
+  r_mpfi_row_vector = rb_define_class_under(tmp_r_mpfi_class, "RowVector", r_mpfi_matrix);
 
+  rb_define_singleton_method(r_mpfi_matrix, "Matrix", r_mpfi_matrix_global_new, -1);
   rb_define_alloc_func(r_mpfi_matrix, r_mpfi_matrix_alloc);
   rb_define_private_method(r_mpfi_matrix, "initialize", r_mpfi_matrix_initialize, -1);
   rb_define_private_method(r_mpfi_matrix, "initialize_copy", r_mpfi_matrix_initialize_copy, 1);
 
+  rb_define_singleton_method(tmp_r_mpfi_class, "SquareMatrix", r_mpfi_square_matrix_global_new, 1);
   rb_define_alloc_func(r_mpfi_square_matrix, r_mpfi_square_matrix_alloc);
   rb_define_private_method(r_mpfi_square_matrix, "initialize", r_mpfi_square_matrix_initialize, 1);
-  
+
+  rb_define_singleton_method(tmp_r_mpfi_class, "ColumnVector", r_mpfi_col_vector_global_new, 1);
   rb_define_alloc_func(r_mpfi_col_vector, r_mpfi_col_vector_alloc);
   rb_define_private_method(r_mpfi_col_vector, "initialize", r_mpfi_col_vector_initialize, 1);
 
+  rb_define_singleton_method(tmp_r_mpfi_class, "RowVector", r_mpfi_row_vector_global_new, 1);
   rb_define_alloc_func(r_mpfi_row_vector, r_mpfi_row_vector_alloc);
   rb_define_private_method(r_mpfi_row_vector, "initialize", r_mpfi_row_vector_initialize, 1);
 
@@ -1161,7 +1225,7 @@ void Init_matrix(){
   rb_define_singleton_method(r_mpfi_square_matrix, "identity", r_mpfi_square_matrix_identity, 1);
   
   /* Initialization of MPFI::Vector module */
-  r_mpfi_vector_module = rb_define_module_under(tmp_mpfi_class, "Vector");
+  r_mpfi_vector_module = rb_define_module_under(tmp_r_mpfi_class, "Vector");
 
   rb_include_module(r_mpfi_col_vector, r_mpfi_vector_module);
   rb_include_module(r_mpfi_row_vector, r_mpfi_vector_module);

data/lib/mpfi/version.rb

@@ -1,3 +1 @@
-module MPFI
-  VERSION = '0.0.2'
-end
+RUBY_MPFI_VERSION = '0.0.3'

data/ruby-mpfi.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-mpfi}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takayuki YAMAGUCHI"]
-  s.date = %q{2009-12-17}
+  s.date = %q{2009-12-19}
   s.description = %q{FIX (describe your package)}
   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"]
-  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/make_c_source.rb", "ext/mpfi/ruby_mpfi.c", "ext/mpfi/ruby_mpfi.h", "ext/mpfi/ruby_mpfr.h", "ext/mpfi/yasnippet_mpfi.el", "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/func_ruby_mpfi_complex.h", "ext/mpfi_matrix/mpfi/ruby_mpfi.h", "ext/mpfi_matrix/mpfi/ruby_mpfi_complex.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.homepage = %q{http://github.com/#{github_username}/#{project_name}}
+  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.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"]
@@ -25,11 +25,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= 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"])
     else
+      s.add_dependency(%q<ruby-mpfr>, [">= 0.0.4"])
       s.add_dependency(%q<hoe>, [">= 2.4.0"])
     end
   else
+    s.add_dependency(%q<ruby-mpfr>, [">= 0.0.4"])
     s.add_dependency(%q<hoe>, [">= 2.4.0"])
   end
 end

data/spec/mpfi/mpfi_math_functions_spec.rb

@@ -9,8 +9,8 @@ describe MPFI, "when calculating mathematical functions" do
   it "should not raise error" do
     MPFR.set_default_prec(256)
     num = MPFI.new('4.2184930258398098')
-    p MPFI::Math.sqr(num)
-    p MPFI::Math.sqrt(num)
+    # p MPFI::Math.sqr(num)
+    # p MPFI::Math.sqrt(num)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-mpfi
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Takayuki YAMAGUCHI
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 +09:00
+date: 2009-12-19 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 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.4
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -35,6 +45,7 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - PostInstall.txt
+- README.rdoc
 files: 
 - History.txt
 - Manifest.txt
@@ -44,11 +55,9 @@ files:
 - ext/mpfi/extconf.rb
 - ext/mpfi/func_mpfi_extention.c
 - ext/mpfi/func_mpfi_extention.h
-- ext/mpfi/make_c_source.rb
 - ext/mpfi/ruby_mpfi.c
 - ext/mpfi/ruby_mpfi.h
 - ext/mpfi/ruby_mpfr.h
-- ext/mpfi/yasnippet_mpfi.el
 - ext/mpfi_complex/mpfi/extconf.rb
 - ext/mpfi_complex/mpfi/func_mpfi_extention.h
 - ext/mpfi_complex/mpfi/func_ruby_mpfi_complex.c
@@ -62,9 +71,7 @@ files:
 - 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/func_ruby_mpfi_complex.h
 - ext/mpfi_matrix/mpfi/ruby_mpfi.h
-- ext/mpfi_matrix/mpfi/ruby_mpfi_complex.h
 - ext/mpfi_matrix/mpfi/ruby_mpfi_matrix.c
 - ext/mpfi_matrix/mpfi/ruby_mpfi_matrix.h
 - ext/mpfi_matrix/mpfi/ruby_mpfr.h
@@ -99,7 +106,7 @@ files:
 - spec/spec.opts
 - tasks/extconf.rake
 has_rdoc: true
-homepage: http://github.com/#{github_username}/#{project_name}
+homepage: http://rubyforge.org/projects/ruby-mpfr/
 licenses: []
 
 post_install_message: PostInstall.txt