rb-gsl 1.16.0.4 → 1.16.0.5

data/examples/vector/decimate.rb

@@ -34,5 +34,5 @@ x1 = GSL::Vector.linspace(0, 20, N/DECIMATE1)
 x2 = GSL::Vector.linspace(0, 20, N/DECIMATE2)
 
 # y1 and y2 are shifted vertically for visual purpose
-GSL::graph([x0, y0], [x1, y1-1], [x2, y2-2])  
+GSL::graph([x0, y0], [x1, y1-1], [x2, y2-2])
 END

data/examples/vector/gnuplot.rb

@@ -9,28 +9,28 @@ require 'gsl/gnuplot';
 # Plot using gnuplot
 Gnuplot.open do |gp|
   Gnuplot::Plot.new( gp ) do |plot|
-  
+
     plot.xrange "[0:10]"
     plot.yrange "[-1.5:1.5]"
     plot.title  "Sin Wave Example"
     plot.xlabel "x"
     plot.ylabel "sin(x)"
     plot.pointsize 3
-    plot.grid 
+    plot.grid
 
     x = GSL::Vector[0..10]
     y = GSL::Sf::sin(x)
 
     plot.data = [
       Gnuplot::DataSet.new( "sin(x)" ) { |ds|
-	ds.with = "lines"
-	ds.title = "String function"
-	ds.linewidth = 4
+        ds.with = "lines"
+        ds.title = "String function"
+        ds.linewidth = 4
       },
-      
+
       Gnuplot::DataSet.new( [x, y] ) { |ds|
-	ds.with = "linespoints"
-	ds.title = "Array data"
+        ds.with = "linespoints"
+        ds.title = "Array data"
       }
     ]
 

data/examples/vector/vector.rb

@@ -78,8 +78,8 @@ __END__
 
 v = GSL::Vector::alloc(10)
 for i in 1...10 do
-  v.set(i, i.to_f)	
-end	
+  v.set(i, i.to_f)
+end
 v.print
 
 v.swap_elements(3, 5)

data/examples/wavelet/wavelet1.rb

@@ -31,7 +31,7 @@ perm = data2.abs.sort_index
 i = 0
 while (i + nc) < n
   data2[perm[i]] = 0.0
-  i += 1  
+  i += 1
 end
 
 # Choose as you like...

data/ext/{gsl → gsl_native}/alf.c

@@ -19,7 +19,7 @@ static VALUE rb_alf_params(VALUE obj, VALUE csphase, VALUE cnorm, VALUE norm)
   int ret;
   Data_Get_Struct(obj, alf_workspace, w);
   ret = alf_params(FIX2INT(csphase), FIX2INT(cnorm), (alf_norm_t) FIX2INT(norm), w);
-  return INT2FIX(ret); 
+  return INT2FIX(ret);
 }
 
 static void define_constants(VALUE klass)
@@ -60,11 +60,11 @@ static VALUE rb_alf_Plm_array(int argc, VALUE *argv, VALUE obj)
       Data_Get_Struct(argv[1], gsl_vector, res);
       lmax = w->lmax;
       if (res->size < alf_array_size(lmax)) {
-	rb_raise(rb_eRuntimeError, "Vector length is too small. (%d for >= %d\n", (int) res->size,
-		 (int) alf_array_size(lmax));
+        rb_raise(rb_eRuntimeError, "Vector length is too small. (%d for >= %d\n", (int) res->size,
+                 (int) alf_array_size(lmax));
       }
-      ret = argv[1];      
-    } else { 
+      ret = argv[1];
+    } else {
       lmax = FIX2INT(argv[0]);
       x = NUM2DBL(argv[1]);
       res = gsl_vector_alloc(alf_array_size(lmax));
@@ -85,8 +85,8 @@ static VALUE rb_alf_Plm_array(int argc, VALUE *argv, VALUE obj)
       CHECK_VECTOR(argv[2]);
       Data_Get_Struct(argv[2], gsl_vector, res);
       if (res->size < alf_array_size(lmax)) {
-	rb_raise(rb_eRuntimeError, "Vector length is too small. (%d for >= %d\n", (int) res->size,
-		 (int) alf_array_size(lmax));
+        rb_raise(rb_eRuntimeError, "Vector length is too small. (%d for >= %d\n", (int) res->size,
+                 (int) alf_array_size(lmax));
       }
       ret = argv[2];
     }
@@ -155,11 +155,11 @@ static VALUE rb_alf_Plm_deriv_array(int argc, VALUE *argv, VALUE obj)
     Data_Get_Struct(argv[3], gsl_vector, deriv);
     if (res->size < alf_array_size(lmax)) {
       rb_raise(rb_eRuntimeError, "Vector length is too small. (%d for >= %d\n", (int) res->size,
-	       (int) alf_array_size(lmax));
+               (int) alf_array_size(lmax));
     }
     if (deriv->size < alf_array_size(lmax)) {
       rb_raise(rb_eRuntimeError, "Vector length is too small. (%d for >= %d\n", (int) res->size,
-	       (int) alf_array_size(lmax));
+               (int) alf_array_size(lmax));
     }
     ret1 = argv[2];
     ret2 = argv[3];

data/ext/{gsl → gsl_native}/array.c

@@ -12,9 +12,7 @@
 #include "include/rb_gsl_common.h"
 #include "include/rb_gsl_array.h"
 #include "include/rb_gsl_complex.h"
-#ifdef HAVE_NARRAY_H
 #include "include/rb_gsl_with_narray.h"
-#endif
 
 /* global variables */
 VALUE cgsl_block, cgsl_block_int;
@@ -47,9 +45,6 @@ double* get_vector_ptr(VALUE ary, size_t *stride, size_t *n)
   gsl_vector *v = NULL;
   gsl_vector_complex *vc = NULL;
   gsl_matrix *m;
-#ifdef HAVE_NARRAY_H
-  VALUE ary2;
-#endif
   if (VECTOR_P(ary)) {
     Data_Get_Struct(ary, gsl_vector, v);
     *stride = v->stride;
@@ -67,6 +62,7 @@ double* get_vector_ptr(VALUE ary, size_t *stride, size_t *n)
     return m->data;
 #ifdef HAVE_NARRAY_H
   } else if (NA_IsNArray(ary)) {
+    VALUE ary2;
     *n = NA_TOTAL(ary);
     *stride = 1;
     ary2 = na_change_type(ary, NA_DFLOAT);
@@ -74,7 +70,7 @@ double* get_vector_ptr(VALUE ary, size_t *stride, size_t *n)
 #endif
   } else {
     rb_raise(rb_eTypeError,
-	     "wrong argument type %s", rb_class2name(CLASS_OF(ary)));
+             "wrong argument type %s", rb_class2name(CLASS_OF(ary)));
   }
 }
 
@@ -91,7 +87,7 @@ gsl_vector* get_cvector(VALUE obj)
     rb_raise(rb_eTypeError,
              "wrong argument type %s", rb_class2name(CLASS_OF(obj)));
   }
-  return v; 
+  return v;
 }
 
 VALUE make_rarray_from_cvector(const gsl_vector *v)
@@ -142,7 +138,7 @@ gsl_vector* get_vector(VALUE ary)
     return v;
   } else {
     rb_raise(rb_eTypeError,
-	     "wrong argument type %s", rb_class2name(CLASS_OF(ary)));
+             "wrong argument type %s", rb_class2name(CLASS_OF(ary)));
   }
 }
 
@@ -157,7 +153,7 @@ gsl_vector* make_cvector_from_rarrays(VALUE ary)
 #endif
   } else {
     rb_raise(rb_eTypeError,
-	     "wrong argument type %s", rb_class2name(CLASS_OF(ary)));
+             "wrong argument type %s", rb_class2name(CLASS_OF(ary)));
   }
 }
 
@@ -184,7 +180,7 @@ void carray_set_from_rarrays(double *a, VALUE ary)
 #endif
   } else {
     rb_raise(rb_eTypeError,
-	     "wrong argument type %s", rb_class2name(CLASS_OF(ary)));
+             "wrong argument type %s", rb_class2name(CLASS_OF(ary)));
   }
 }
 
@@ -274,7 +270,7 @@ VALUE make_matrix_clone2(VALUE vm)
   mnew = gsl_matrix_alloc(m->size1, m->size2);
   if (mnew == NULL) rb_raise(rb_eNoMemError, "gsl_matrix_alloc failed");
   gsl_matrix_memcpy(mnew, m);
-  return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);;
+  return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
 }
 
 gsl_matrix_complex* make_matrix_complex_clone(const gsl_matrix_complex *m)
@@ -316,8 +312,8 @@ gsl_matrix_complex* matrix_to_complex(const gsl_matrix *m)
   return cm;
 }
 
-void gsl_matrix_complex_mul(gsl_matrix_complex *mnew, const gsl_matrix_complex *m, 
-			    const gsl_matrix_complex *mb)
+void gsl_matrix_complex_mul(gsl_matrix_complex *mnew, const gsl_matrix_complex *m,
+                            const gsl_matrix_complex *mb)
 {
   gsl_complex a, b, c, sum;
   size_t i, j, k;
@@ -325,45 +321,45 @@ void gsl_matrix_complex_mul(gsl_matrix_complex *mnew, const gsl_matrix_complex *
     for (j = 0; j < m->size2; j++) {
       sum = gsl_complex_rect(0.0, 0.0);
       for (k = 0; k < m->size2; k++) {
-	a = gsl_matrix_complex_get(m, j, k);
-	b = gsl_matrix_complex_get(mb, k, i);
-	c = gsl_complex_mul(a, b);
-	sum = gsl_complex_add(sum, c);
+        a = gsl_matrix_complex_get(m, j, k);
+        b = gsl_matrix_complex_get(mb, k, i);
+        c = gsl_complex_mul(a, b);
+        sum = gsl_complex_add(sum, c);
       }
       gsl_matrix_complex_set(mnew, j, i, sum);
     }
   }
 }
 
-void gsl_matrix_mul_vector(gsl_vector *vnew, 
-			   const gsl_matrix *m, const gsl_vector *v)
+void gsl_matrix_mul_vector(gsl_vector *vnew,
+                           const gsl_matrix *m, const gsl_vector *v)
 {
   size_t i, j;
   double val;
   for (i = 0; i < m->size1; i++) {
     val = 0;
-    for (j = 0; j < m->size2; j++) 
+    for (j = 0; j < m->size2; j++)
       val += gsl_matrix_get(m, i, j)*gsl_vector_get(v, j);
     gsl_vector_set(vnew, i, val);
   }
 }
 
-void gsl_matrix_int_mul_vector(gsl_vector_int *vnew, 
-			       const gsl_matrix_int *m, const gsl_vector_int *v)
+void gsl_matrix_int_mul_vector(gsl_vector_int *vnew,
+                               const gsl_matrix_int *m, const gsl_vector_int *v)
 {
   size_t i, j;
   int val;
   for (i = 0; i < m->size1; i++) {
     val = 0;
-    for (j = 0; j < m->size2; j++) 
+    for (j = 0; j < m->size2; j++)
       val += gsl_matrix_int_get(m, i, j)*gsl_vector_int_get(v, j);
     gsl_vector_int_set(vnew, i, val);
   }
 }
 
-void gsl_matrix_complex_mul_vector(gsl_vector_complex *vnew, 
-				   const gsl_matrix_complex *m, 
-				   const gsl_vector_complex *v)
+void gsl_matrix_complex_mul_vector(gsl_vector_complex *vnew,
+                                   const gsl_matrix_complex *m,
+                                   const gsl_vector_complex *v)
 {
   gsl_complex a, b, c, sum;
   size_t i, j;
@@ -377,98 +373,17 @@ void gsl_matrix_complex_mul_vector(gsl_vector_complex *vnew,
     }
     gsl_vector_complex_set(vnew, i, sum);
   }
-  
-}
-
-/*****/
-#ifndef GSL_1_12_LATER
-int gsl_vector_complex_add(gsl_vector_complex *cv, const gsl_vector_complex *cv2)
-{
-  size_t i;
-  gsl_complex a, b, c;
-  for (i = 0; i < cv->size; i++) {
-    a = gsl_vector_complex_get(cv, i);
-    b = gsl_vector_complex_get(cv2, i);
-    c = gsl_complex_add(a, b);
-    gsl_vector_complex_set(cv, i, c);
-  }
-  return 0;
 }
 
-int gsl_vector_complex_add_constant(gsl_vector_complex *cv, gsl_complex b)
-{
-  size_t i;
-  gsl_complex a, c;
-  for (i = 0; i < cv->size; i++) {
-    a = gsl_vector_complex_get(cv, i);
-    c = gsl_complex_add(a, b);
-    gsl_vector_complex_set(cv, i, c);
-  }
-  return 0;
-}
-
-int gsl_vector_complex_scale(gsl_vector_complex *cv, gsl_complex b)
-{
-  size_t i;
-  gsl_complex a, c;
-  for (i = 0; i < cv->size; i++) {
-    a = gsl_vector_complex_get(cv, i);
-    c = gsl_complex_mul(a, b);
-    gsl_vector_complex_set(cv, i, c);
-  }
-  return 0;
-}
-
-
-int gsl_vector_complex_sub(gsl_vector_complex *cv, const gsl_vector_complex *cv2)
-{
-  size_t i;
-  gsl_complex a, b, c;
-  for (i = 0; i < cv->size; i++) {
-    a = gsl_vector_complex_get(cv, i);
-    b = gsl_vector_complex_get(cv2, i);
-    c = gsl_complex_sub(a, b);
-    gsl_vector_complex_set(cv, i, c);
-  }
-  return 0;
-}
-
-int gsl_vector_complex_mul(gsl_vector_complex *cv, const gsl_vector_complex *cv2)
-{
-  size_t i;
-  gsl_complex a, b, c;
-  for (i = 0; i < cv->size; i++) {
-    a = gsl_vector_complex_get(cv, i);
-    b = gsl_vector_complex_get(cv2, i);
-    c = gsl_complex_mul(a, b);
-    gsl_vector_complex_set(cv, i, c);
-  }
-  return 0;
-}
-
-int gsl_vector_complex_div(gsl_vector_complex *cv, const gsl_vector_complex *cv2)
-{
-  size_t i;
-  gsl_complex a, b, c;
-  for (i = 0; i < cv->size; i++) {
-    a = gsl_vector_complex_get(cv, i);
-    b = gsl_vector_complex_get(cv2, i);
-    c = gsl_complex_div(a, b);
-    gsl_vector_complex_set(cv, i, c);
-  }
-  return 0;
-}
-#endif
-
 VALUE rb_gsl_range2ary(VALUE obj)
 {
   //  double beg, en;
   //  size_t n;
   //  int step;
   VALUE ary;
-  if (CLASS_OF(obj) != rb_cRange) 
+  if (CLASS_OF(obj) != rb_cRange)
     rb_raise(rb_eTypeError, "wrong argument type %s (Range expected)",
-	     rb_class2name(CLASS_OF(obj)));
+             rb_class2name(CLASS_OF(obj)));
   ary = rb_funcall(obj, rb_gsl_id_to_a, 0);
   return ary;
 }
@@ -480,9 +395,9 @@ VALUE rb_gsl_range2vector(VALUE obj)
   size_t n;
   int i, step;
   gsl_vector *v;
-  if (CLASS_OF(obj) != rb_cRange) 
+  if (CLASS_OF(obj) != rb_cRange)
     rb_raise(rb_eTypeError, "wrong argument type %s (Range expected)",
-	     rb_class2name(CLASS_OF(obj)));
+             rb_class2name(CLASS_OF(obj)));
   get_range_beg_en_n(obj, &beg, &en, &n, &step);
   v = gsl_vector_alloc(n);
   for (i = 0; i < (int) n; i++) gsl_vector_set(v, i, (double) (beg+i));
@@ -495,9 +410,9 @@ VALUE rb_gsl_range2vector_int(VALUE obj)
   int beg, en, i, step;
   size_t n;
   gsl_vector_int *v;
-  if (CLASS_OF(obj) != rb_cRange) 
+  if (CLASS_OF(obj) != rb_cRange)
     rb_raise(rb_eTypeError, "wrong argument type %s (Range expected)",
-	     rb_class2name(CLASS_OF(obj)));
+             rb_class2name(CLASS_OF(obj)));
   get_range_int_beg_en_n(obj, &beg, &en, &n, &step);
   v = gsl_vector_int_alloc(n);
   for (i = 0; i < (int) n; i++) gsl_vector_int_set(v, i, beg+i);
@@ -547,71 +462,71 @@ void rb_gsl_matrix_int_view_free(gsl_matrix_int_view * mv)
 
 void Init_gsl_array(VALUE module)
 {
-  cgsl_block = rb_define_class_under(module, "Block", 
-					 cGSL_Object);
-  cgsl_block_int = rb_define_class_under(cgsl_block, "Int", 
-					 cGSL_Object);
-  cgsl_block_uchar = rb_define_class_under(cgsl_block, "Byte", 
-					   cGSL_Object);
+  cgsl_block = rb_define_class_under(module, "Block",
+                                     cGSL_Object);
+  cgsl_block_int = rb_define_class_under(cgsl_block, "Int",
+                                         cGSL_Object);
+  cgsl_block_uchar = rb_define_class_under(cgsl_block, "Byte",
+                                           cGSL_Object);
 
   cgsl_block_complex = rb_define_class_under(cgsl_block, "Complex", cgsl_block);
-  cgsl_vector = rb_define_class_under(module, "Vector", 
-				      cGSL_Object);
-  cgsl_vector_col = rb_define_class_under(cgsl_vector, "Col", 
-					 cgsl_vector);
-  cgsl_vector_complex = rb_define_class_under(cgsl_vector, "Complex", 
-					      cGSL_Object);
+  cgsl_vector = rb_define_class_under(module, "Vector",
+                                      cGSL_Object);
+  cgsl_vector_col = rb_define_class_under(cgsl_vector, "Col",
+                                          cgsl_vector);
+  cgsl_vector_complex = rb_define_class_under(cgsl_vector, "Complex",
+                                              cGSL_Object);
   cgsl_vector_complex_col = rb_define_class_under(cgsl_vector_complex, "Col",
-					      cgsl_vector_complex);
+                                                  cgsl_vector_complex);
   cgsl_matrix = rb_define_class_under(module, "Matrix", cGSL_Object);
   cgsl_matrix_complex = rb_define_class_under(cgsl_matrix, "Complex", cGSL_Object);
 
   cgsl_vector_view = rb_define_class_under(cgsl_vector, "View", cgsl_vector);
   cgsl_vector_col_view = rb_define_class_under(cgsl_vector_col, "View", cgsl_vector_col);
 
-  cgsl_vector_complex_view = rb_define_class_under(cgsl_vector_complex, "View", 
-						   cgsl_vector_complex);
-  cgsl_vector_complex_col_view = rb_define_class_under(cgsl_vector_complex_col, "View", 
-						   cgsl_vector_complex_col);
+  cgsl_vector_complex_view = rb_define_class_under(cgsl_vector_complex, "View",
+                                                   cgsl_vector_complex);
+  cgsl_vector_complex_col_view = rb_define_class_under(cgsl_vector_complex_col, "View",
+                                                       cgsl_vector_complex_col);
 
   cgsl_vector_int = rb_define_class_under(cgsl_vector, "Int", cGSL_Object);
-  cgsl_vector_int_col = rb_define_class_under(cgsl_vector_int, "Col", cgsl_vector_int);  
+  cgsl_vector_int_col = rb_define_class_under(cgsl_vector_int, "Col", cgsl_vector_int);
   cgsl_vector_int_view = rb_define_class_under(cgsl_vector_int, "View", cgsl_vector_int);
   cgsl_vector_int_col_view = rb_define_class_under(cgsl_vector_int_col, "View", cgsl_vector_int_col);
 
 
   /*****/
 
-  cgsl_matrix_view = rb_define_class_under(cgsl_matrix, "View", 
-					   cgsl_matrix);
-  cgsl_matrix_complex_view = rb_define_class_under(cgsl_matrix_complex, "View", 
-						   cgsl_matrix_complex);
-  cgsl_permutation = rb_define_class_under(module, "Permutation", cGSL_Object);  
+  cgsl_matrix_view = rb_define_class_under(cgsl_matrix, "View",
+                                           cgsl_matrix);
+  cgsl_matrix_complex_view = rb_define_class_under(cgsl_matrix_complex, "View",
+                                                   cgsl_matrix_complex);
+  cgsl_permutation = rb_define_class_under(module, "Permutation", cGSL_Object);
   cgsl_index = rb_define_class_under(module, "Index", cgsl_permutation);
 
   cgsl_vector_view_ro = rb_define_class_under(cgsl_vector_view, "ReadOnly",
-					      cgsl_vector_view);
+                                              cgsl_vector_view);
   cgsl_vector_col_view_ro = rb_define_class_under(cgsl_vector_col_view, "ReadOnly",
-					      cgsl_vector_col_view);
+                                                  cgsl_vector_col_view);
   cgsl_vector_int_view_ro = rb_define_class_under(cgsl_vector_int_view, "ReadOnly",
-					      cgsl_vector_int_view);
+                                                  cgsl_vector_int_view);
   cgsl_vector_int_col_view_ro = rb_define_class_under(cgsl_vector_int_col_view, "ReadOnly",
-					      cgsl_vector_int_col_view);
+                                                      cgsl_vector_int_col_view);
   cgsl_matrix_view_ro = rb_define_class_under(cgsl_matrix_view, "ReadOnly",
-					      cgsl_matrix_view);
+                                              cgsl_matrix_view);
 
-  cgsl_vector_complex_view_ro = rb_define_class_under(cgsl_vector_complex_view, 
-						      "ReadOnly",
-						      cgsl_vector_complex_view);
-  cgsl_matrix_complex_view_ro = rb_define_class_under(cgsl_matrix_complex_view, 
-						      "ReadOnly",
-						      cgsl_matrix_complex_view);
+  cgsl_vector_complex_view_ro = rb_define_class_under(cgsl_vector_complex_view,
+                                                      "ReadOnly",
+                                                      cgsl_vector_complex_view);
+  cgsl_matrix_complex_view_ro = rb_define_class_under(cgsl_matrix_complex_view,
+                                                      "ReadOnly",
+                                                      cgsl_matrix_complex_view);
 
   /*****/
   cgsl_matrix_int = rb_define_class_under(cgsl_matrix, "Int", cGSL_Object);
   cgsl_matrix_int_view = rb_define_class_under(cgsl_matrix_int, "View", cgsl_matrix_int);
   cgsl_matrix_int_view_ro = rb_define_class_under(cgsl_matrix_int_view, "ReadOnly",
-					      cgsl_matrix_int_view);
+                                                  cgsl_matrix_int_view);
   /*****/
   Init_gsl_block_init(module);
   Init_gsl_block_int_init(module);
@@ -624,16 +539,14 @@ void Init_gsl_array(VALUE module)
   Init_gsl_matrix_int(module);
   Init_gsl_matrix_complex(module);
   Init_gsl_permutation(module);
-#ifdef GSL_1_1_LATER
   Init_gsl_combination(module);
-#endif
   Init_gsl_array_complex(module);
   Init_gsl_matrix_nmf();
 
   rb_define_method(cgsl_vector_view_ro, "set", rb_gsl_obj_read_only, -1);
   rb_define_method(cgsl_matrix_view_ro, "set", rb_gsl_obj_read_only, -1);
   rb_define_method(cgsl_vector_int_view_ro, "set", rb_gsl_obj_read_only, -1);
-  rb_define_method(cgsl_matrix_int_view_ro, "set", rb_gsl_obj_read_only, -1);  
+  rb_define_method(cgsl_matrix_int_view_ro, "set", rb_gsl_obj_read_only, -1);
   rb_define_method(cgsl_vector_complex_view_ro, "set", rb_gsl_obj_read_only, -1);
   rb_define_method(cgsl_matrix_complex_view_ro, "set", rb_gsl_obj_read_only, -1);