gsl 1.15.3 → 1.16.0.6

data/ext/{vector.c → gsl_native/vector.c}

@@ -14,25 +14,22 @@
   which are provided by the GSL source.
  */
 
-#include "rb_gsl_config.h"
-#include "rb_gsl_array.h"
-#include "rb_gsl_histogram.h"
-#include "rb_gsl_complex.h"
-#include "rb_gsl_poly.h"
-#ifdef HAVE_NARRAY_H
-#include "rb_gsl_with_narray.h"
-#endif
+#include "include/rb_gsl_array.h"
+#include "include/rb_gsl_histogram.h"
+#include "include/rb_gsl_complex.h"
+#include "include/rb_gsl_poly.h"
+#include "include/rb_gsl_with_narray.h"
 
 #define BASE_DOUBLE
-#include "templates_on.h"
-#include "vector_source.c"
-#include "templates_off.h"
+#include "include/templates_on.h"
+#include "vector_source.h"
+#include "include/templates_off.h"
 #undef  BASE_DOUBLE
 
 #define BASE_INT
-#include "templates_on.h"
-#include "vector_source.c"
-#include "templates_off.h"
+#include "include/templates_on.h"
+#include "vector_source.h"
+#include "include/templates_off.h"
 #undef  BASE_INT
 
 

data/ext/{vector_complex.c → gsl_native/vector_complex.c}

@@ -8,9 +8,9 @@
   This library is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY.
 */
-#include "rb_gsl_config.h"
-#include "rb_gsl_array.h"
-#include "rb_gsl_complex.h"
+
+#include "include/rb_gsl_array.h"
+#include "include/rb_gsl_complex.h"
 
 EXTERN VALUE cgsl_complex;
 static VALUE rb_gsl_vector_complex_inner_product(int argc, VALUE *argv, VALUE obj);
@@ -21,7 +21,7 @@ void get_range_beg_en_n(VALUE range, double *beg, double *en, size_t *n, int *st
 //
 // From vector_source.c
 void parse_subvector_args(int argc, VALUE *argv, size_t size,
-    size_t *offset, size_t *stride, size_t *n);
+                          size_t *offset, size_t *stride, size_t *n);
 
 // From complex.c
 gsl_complex rb_gsl_obj_to_gsl_complex(VALUE obj, gsl_complex *z);
@@ -41,30 +41,30 @@ static VALUE rb_gsl_vector_complex_new(int argc, VALUE *argv, VALUE klass)
       v = gsl_vector_complex_calloc(n);
       if (v == NULL) rb_raise(rb_eNoMemError, "gsl_vector_complex_alloc failed");
       break;
-    case T_ARRAY: 
+    case T_ARRAY:
       n = RARRAY_LEN(argv[0]);
       v = gsl_vector_complex_alloc(n);
       if (v == NULL) rb_raise(rb_eNoMemError, "gsl_vector_complex_alloc failed");
       for (i = 0; i < n; i++) {
-	z2 = &z;
-	tmp = rb_ary_entry(argv[0], i);
-	if (TYPE(tmp) == T_ARRAY) {
-	  GSL_SET_REAL(z2, NUM2DBL(rb_ary_entry(tmp, 0)));
-	  GSL_SET_IMAG(z2, NUM2DBL(rb_ary_entry(tmp, 1)));
-	} else if (COMPLEX_P(tmp)) {
-	  Data_Get_Struct(tmp, gsl_complex, z2);
-	} else {
-	  rb_raise(rb_eTypeError, 
-		   "wrong argument type %s (Array or Complex expected)", 
-		   rb_class2name(CLASS_OF(tmp)));
-	  
-	}
-	gsl_vector_complex_set(v, i, *z2);
+        z2 = &z;
+        tmp = rb_ary_entry(argv[0], i);
+        if (TYPE(tmp) == T_ARRAY) {
+          GSL_SET_REAL(z2, NUM2DBL(rb_ary_entry(tmp, 0)));
+          GSL_SET_IMAG(z2, NUM2DBL(rb_ary_entry(tmp, 1)));
+        } else if (COMPLEX_P(tmp)) {
+          Data_Get_Struct(tmp, gsl_complex, z2);
+        } else {
+          rb_raise(rb_eTypeError,
+                   "wrong argument type %s (Array or Complex expected)",
+                   rb_class2name(CLASS_OF(tmp)));
+
+        }
+        gsl_vector_complex_set(v, i, *z2);
       }
       break;
     default:
-      rb_raise(rb_eTypeError, 
-	       "wrong argument type %s", rb_class2name(CLASS_OF(argv[0])));
+      rb_raise(rb_eTypeError,
+               "wrong argument type %s", rb_class2name(CLASS_OF(argv[0])));
       break;
     }
     break;
@@ -75,9 +75,9 @@ static VALUE rb_gsl_vector_complex_new(int argc, VALUE *argv, VALUE klass)
       n = GSL_MIN_INT(x->size, y->size);
       v = gsl_vector_complex_alloc(n);
       for (i = 0; i < n; i++) {
-	z.dat[0] = gsl_vector_get(x, i);
-	z.dat[1] = gsl_vector_get(y, i);
-	gsl_vector_complex_set(v, i, z);
+        z.dat[0] = gsl_vector_get(x, i);
+        z.dat[1] = gsl_vector_get(y, i);
+        gsl_vector_complex_set(v, i, z);
       }
       break;
     }
@@ -86,15 +86,15 @@ static VALUE rb_gsl_vector_complex_new(int argc, VALUE *argv, VALUE klass)
     if (v == NULL) rb_raise(rb_eNoMemError, "gsl_vector_complex_alloc failed");
     for (i = 0; i < n; i++) {
       if (TYPE(argv[i]) == T_ARRAY) {
-	GSL_SET_REAL(&z, NUM2DBL(rb_ary_entry(argv[i], 0)));
-	GSL_SET_IMAG(&z, NUM2DBL(rb_ary_entry(argv[i], 1)));
-	z2 = &z;
+        GSL_SET_REAL(&z, NUM2DBL(rb_ary_entry(argv[i], 0)));
+        GSL_SET_IMAG(&z, NUM2DBL(rb_ary_entry(argv[i], 1)));
+        z2 = &z;
       } else if (COMPLEX_P(argv[i])) {
-	Data_Get_Struct(argv[i], gsl_complex, z2);
+        Data_Get_Struct(argv[i], gsl_complex, z2);
       } else {
-	rb_raise(rb_eTypeError, 
-		 "wrong argument type %s (Array or Complex expected)", 
-		 rb_class2name(CLASS_OF(argv[i])));
+        rb_raise(rb_eTypeError,
+                 "wrong argument type %s (Array or Complex expected)",
+                 rb_class2name(CLASS_OF(argv[i])));
       }
       gsl_vector_complex_set(v, i, *z2);
     }
@@ -175,9 +175,9 @@ static VALUE rb_gsl_vector_complex_get(int argc, VALUE *argv, VALUE obj)
     case T_ARRAY:
       vnew = gsl_vector_complex_alloc(RARRAY_LEN(argv[0]));
       for (j = 0; j < vnew->size; j++) {
-	i = FIX2INT(rb_ary_entry(argv[0], j));
-	if (i < 0) i = v->size + i;
-	gsl_vector_complex_set(vnew, j, gsl_vector_complex_get(v, i));
+        i = FIX2INT(rb_ary_entry(argv[0], j));
+        if (i < 0) i = v->size + i;
+        gsl_vector_complex_set(vnew, j, gsl_vector_complex_get(v, i));
       }
       retval = Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, vnew);
       break;
@@ -207,7 +207,6 @@ static VALUE rb_gsl_vector_complex_set_all(int argc, VALUE *argv, VALUE obj)
   gsl_complex tmp;
 
   if (argc < 1) rb_raise(rb_eArgError, "wrong number of arguments");
-
   Data_Get_Struct(obj, gsl_vector_complex, v);
 
   switch (argc) {
@@ -250,7 +249,7 @@ void rb_gsl_vector_complex_set_subvector(int argc, VALUE *argv, gsl_vector_compl
     gsl_vector_complex_memcpy(&vv.vector, vother);
   } else if(rb_obj_is_kind_of(other, rb_cArray)) {
     // TODO Support other forms of Array contents as well
-    if(n != RARRAY_LEN(other)) {
+    if((int) n != RARRAY_LEN(other)) {
       rb_raise(rb_eRangeError, "lengths do not match (%d != %d)", (int) n, (int) RARRAY_LEN(other));
     }
     for(i = 0; i < n; i++) {
@@ -284,7 +283,6 @@ static VALUE rb_gsl_vector_complex_set(int argc, VALUE *argv, VALUE obj)
   if(argc < 1 || argc > 4) {
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 1-4)", argc);
   }
-
   Data_Get_Struct(obj, gsl_vector_complex, v);
   other = argv[argc-1];
 
@@ -309,7 +307,6 @@ static VALUE rb_gsl_vector_complex_set(int argc, VALUE *argv, VALUE obj)
     // assignment to v.subvector(...)
     rb_gsl_vector_complex_set_subvector(argc-1, argv, v, other);
   }
-
   return obj;
 }
 
@@ -335,10 +332,11 @@ static VALUE rb_gsl_vector_complex_reverse_each(VALUE obj)
   gsl_complex * zp;
   size_t i;
   Data_Get_Struct(obj, gsl_vector_complex, v);
-  for (i = v->size-1; i >= 0; i--) {
+  for (i = v->size-1;; i--) {
     vz = Data_Make_Struct(cgsl_complex, gsl_complex, 0, free, zp);
     *zp = gsl_vector_complex_get(v, i);
     rb_yield(vz);
+    if (i == 0) break;
   }
   return obj;
 }
@@ -357,7 +355,7 @@ static VALUE rb_gsl_vector_complex_reverse_each_index(VALUE obj)
   gsl_vector_complex *v = NULL;
   size_t i;
   Data_Get_Struct(obj, gsl_vector_complex, v);
-  for (i = v->size-1; i >= 0; i--) {
+  for (i = v->size-1;; i--) {
     rb_yield(INT2FIX(i));
     if (i == 0) break;
   }
@@ -427,15 +425,15 @@ static VALUE rb_gsl_vector_complex_to_s(VALUE obj)
   if (VECTOR_COMPLEX_COL_P(obj)) {
     for (i = 0; i < v->size; i++) {
       if (i != 0) {
-	rb_str_cat(str, "  ", 2);
+        rb_str_cat(str, "  ", 2);
       }
       z = GSL_COMPLEX_AT(v, i);
       sprintf(buf, "[%4.3e %4.3e]", GSL_REAL(*z), GSL_IMAG(*z));
       if (i != v->size-1) strcat(buf, "\n");
       rb_str_cat(str, buf, strlen(buf));
       if (i >= 10 && i != v->size-1) {
-	rb_str_cat(str, "  ...", 5);
-	break;
+        rb_str_cat(str, "  ...", 5);
+        break;
       }
     }
   } else {
@@ -447,8 +445,8 @@ static VALUE rb_gsl_vector_complex_to_s(VALUE obj)
       sprintf(buf, " [%4.3e %4.3e]", GSL_REAL(*z), GSL_IMAG(*z));
       rb_str_cat(str, buf, strlen(buf));
       if (i >= 10 && i != v->size-1) {
-	rb_str_cat(str, " ...", 4);
-	break;
+        rb_str_cat(str, " ...", 4);
+        break;
       }
     }
   }
@@ -628,10 +626,10 @@ static VALUE rb_gsl_vector_complex_conj(VALUE obj)
   gsl_vector_complex *vout = NULL;
   Data_Get_Struct(obj, gsl_vector_complex, vin);
   vout = gsl_vector_complex_alloc(vin->size);
-  for(i=0; i<vin->size; i++) {
+  for(i = 0; i<vin->size; i++) {
     gsl_vector_complex_set(vout, i,
-        gsl_complex_conjugate(
-          gsl_vector_complex_get(vin, i)));
+                           gsl_complex_conjugate(
+                             gsl_vector_complex_get(vin, i)));
   }
   return Data_Wrap_Struct(VECTOR_COMPLEX_ROW_COL(obj), 0, gsl_vector_complex_free, vout);
 }
@@ -641,10 +639,10 @@ static VALUE rb_gsl_vector_complex_conj_bang(VALUE obj)
   size_t i;
   gsl_vector_complex *v = NULL;
   Data_Get_Struct(obj, gsl_vector_complex, v);
-  for(i=0; i<v->size; i++) {
+  for(i = 0; i<v->size; i++) {
     gsl_vector_complex_set(v, i,
-        gsl_complex_conjugate(
-          gsl_vector_complex_get(v, i)));
+                           gsl_complex_conjugate(
+                             gsl_vector_complex_get(v, i)));
   }
   return obj;
 }
@@ -657,7 +655,7 @@ static VALUE rb_gsl_vector_complex_to_a(VALUE obj)
   VALUE ary;
   Data_Get_Struct(obj, gsl_vector_complex, c);
   ary = rb_ary_new2(c->size*2);
-  for (i = 0, j = 0; i < c->size; i++, j+=2) {
+  for (i = 0, j = 0; i < c->size; i++, j += 2) {
     z = GSL_COMPLEX_AT(c, i);
     rb_ary_store(ary, j, rb_float_new(GSL_REAL(*z)));
     rb_ary_store(ary, j+1, rb_float_new(GSL_IMAG(*z)));
@@ -769,7 +767,7 @@ static VALUE rb_gsl_vector_complex_reverse2(VALUE obj)
   vnew = gsl_vector_complex_alloc(v->size);
   gsl_vector_complex_memcpy(vnew, v);
   gsl_vector_complex_reverse(vnew);
-  if (VECTOR_COMPLEX_ROW_P(obj)) 
+  if (VECTOR_COMPLEX_ROW_P(obj))
     return Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, vnew);
   else
     return Data_Wrap_Struct(cgsl_vector_complex_col, 0, gsl_vector_complex_free, vnew);
@@ -806,7 +804,6 @@ static VALUE rb_gsl_vector_complex_fftshift_bang(VALUE obj)
       gsl_vector_complex_swap_elements(v, i, i+n/2);
     }
   }
-
   return obj;
 }
 
@@ -828,7 +825,7 @@ static VALUE rb_gsl_vector_complex_fftshift(VALUE obj)
   vvnew = gsl_vector_complex_subvector(vnew, 0, n/2);
   gsl_vector_complex_memcpy(&vvnew.vector, &vv.vector);
 
-  return Data_Wrap_Struct(VECTOR_COMPLEX_ROW_COL(obj), 0, gsl_vector_complex_free, vnew);  
+  return Data_Wrap_Struct(VECTOR_COMPLEX_ROW_COL(obj), 0, gsl_vector_complex_free, vnew);
 }
 
 static VALUE rb_gsl_vector_complex_ifftshift_bang(VALUE obj)
@@ -853,14 +850,13 @@ static VALUE rb_gsl_vector_complex_ifftshift_bang(VALUE obj)
       gsl_vector_complex_swap_elements(v, i, i+n/2);
     }
   }
-
   return obj;
 }
 
 static VALUE rb_gsl_vector_complex_ifftshift(VALUE obj)
 {
   return rb_gsl_vector_complex_ifftshift_bang(rb_gsl_vector_complex_clone(obj));
-  gsl_vector_complex *v, *vnew;
+  /*gsl_vector_complex *v, *vnew;
   gsl_vector_complex_view vv, vvnew;
   size_t n;
 
@@ -876,7 +872,7 @@ static VALUE rb_gsl_vector_complex_ifftshift(VALUE obj)
   vvnew = gsl_vector_complex_subvector(v, (n+1)/2, n/2);
   gsl_vector_complex_memcpy(&vvnew.vector, &vv.vector);
 
-  return Data_Wrap_Struct(VECTOR_COMPLEX_ROW_COL(obj), 0, gsl_vector_complex_free, vnew);  
+  return Data_Wrap_Struct(VECTOR_COMPLEX_ROW_COL(obj), 0, gsl_vector_complex_free, vnew);  */
 }
 
 static VALUE rb_gsl_vector_complex_isnull(VALUE obj)
@@ -899,8 +895,8 @@ static VALUE rb_gsl_vector_complex_matrix_view(int argc, VALUE *argv, VALUE obj)
     break;
   case 3:
     mv = gsl_matrix_complex_view_alloc();
-    *mv = gsl_matrix_complex_view_vector_with_tda(v, FIX2INT(argv[0]), FIX2INT(argv[1]), 
-				 FIX2INT(argv[2]));
+    *mv = gsl_matrix_complex_view_vector_with_tda(v, FIX2INT(argv[0]), FIX2INT(argv[1]),
+                                                  FIX2INT(argv[2]));
     break;
   default:
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or 3)", argc);
@@ -910,7 +906,7 @@ static VALUE rb_gsl_vector_complex_matrix_view(int argc, VALUE *argv, VALUE obj)
 }
 
 static VALUE rb_gsl_vector_complex_matrix_view_with_tda(VALUE obj, VALUE nn1, VALUE nn2,
-						VALUE tda)
+                                                        VALUE tda)
 {
   gsl_vector_complex *v = NULL;
   gsl_matrix_complex_view *mv = NULL;
@@ -927,9 +923,9 @@ static VALUE rb_gsl_vector_complex_trans(VALUE obj)
   gsl_vector_complex *v = NULL, *vnew = NULL;
   Data_Get_Struct(obj, gsl_vector_complex, v);
   vnew = make_vector_complex_clone(v);
-  if (VECTOR_COMPLEX_ROW_P(obj)) 
+  if (VECTOR_COMPLEX_ROW_P(obj))
     return Data_Wrap_Struct(cgsl_vector_complex_col, 0, gsl_vector_complex_free, vnew);
-  else if (VECTOR_COMPLEX_COL_P(obj)) 
+  else if (VECTOR_COMPLEX_COL_P(obj))
     return Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, vnew);
   else {
     rb_raise(rb_eTypeError, "wrong type");
@@ -938,13 +934,13 @@ static VALUE rb_gsl_vector_complex_trans(VALUE obj)
 
 static VALUE rb_gsl_vector_complex_trans2(VALUE obj)
 {
-  if (CLASS_OF(obj) == cgsl_vector_complex) 
-    RBASIC(obj)->klass = cgsl_vector_complex_col;
-  else if (CLASS_OF(obj) == cgsl_vector_complex_col) 
-    RBASIC(obj)->klass = cgsl_vector_complex;
+  if (CLASS_OF(obj) == cgsl_vector_complex)
+    RBGSL_SET_CLASS(obj, cgsl_vector_complex_col);
+  else if (CLASS_OF(obj) == cgsl_vector_complex_col)
+    RBGSL_SET_CLASS(obj, cgsl_vector_complex);
   else {
     rb_raise(rb_eRuntimeError, "method trans! for %s is forbidden",
-	     rb_class2name(CLASS_OF(obj)));
+             rb_class2name(CLASS_OF(obj)));
   }
   return obj;
 }
@@ -981,7 +977,7 @@ enum {
 
 static VALUE rb_gsl_vector_complex_arithmetics(int flag, VALUE obj, VALUE bb);
 
-static VALUE rb_gsl_vector_complex_arithmetics(int flag, VALUE obj, VALUE bb) 
+static VALUE rb_gsl_vector_complex_arithmetics(int flag, VALUE obj, VALUE bb)
 {
   gsl_vector *b = NULL;
   gsl_vector_complex *cv = NULL, *cvnew = NULL, *cb = NULL;
@@ -1036,20 +1032,20 @@ static VALUE rb_gsl_vector_complex_arithmetics(int flag, VALUE obj, VALUE bb)
       switch (flag) {
       case GSL_VECTOR_COMPLEX_ADD:
       case GSL_VECTOR_COMPLEX_ADD_BANG:
-	gsl_vector_complex_add(cvnew, cb);
-	break;
+        gsl_vector_complex_add(cvnew, cb);
+        break;
       case GSL_VECTOR_COMPLEX_SUB:
       case GSL_VECTOR_COMPLEX_SUB_BANG:
-	gsl_vector_complex_sub(cvnew, cb);
-	break;
+        gsl_vector_complex_sub(cvnew, cb);
+        break;
       case GSL_VECTOR_COMPLEX_MUL:
       case GSL_VECTOR_COMPLEX_MUL_BANG:
-	gsl_vector_complex_mul(cvnew, cb);
-	break;
+        gsl_vector_complex_mul(cvnew, cb);
+        break;
       case GSL_VECTOR_COMPLEX_DIV:
       case GSL_VECTOR_COMPLEX_DIV_BANG:
-	gsl_vector_complex_div(cvnew, cb);
-	break;
+        gsl_vector_complex_div(cvnew, cb);
+        break;
       }
       gsl_vector_complex_free(cb);
     } else if (VECTOR_COMPLEX_P(bb)) {
@@ -1057,40 +1053,40 @@ static VALUE rb_gsl_vector_complex_arithmetics(int flag, VALUE obj, VALUE bb)
       switch (flag) {
       case GSL_VECTOR_COMPLEX_ADD:
       case GSL_VECTOR_COMPLEX_ADD_BANG:
-	gsl_vector_complex_add(cvnew, cb);
-	break;
+        gsl_vector_complex_add(cvnew, cb);
+        break;
       case GSL_VECTOR_COMPLEX_SUB:
       case GSL_VECTOR_COMPLEX_SUB_BANG:
-	gsl_vector_complex_sub(cvnew, cb);
-	break;
+        gsl_vector_complex_sub(cvnew, cb);
+        break;
       case GSL_VECTOR_COMPLEX_MUL:
       case GSL_VECTOR_COMPLEX_MUL_BANG:
-	gsl_vector_complex_mul(cvnew, cb);
-	break;
+        gsl_vector_complex_mul(cvnew, cb);
+        break;
       case GSL_VECTOR_COMPLEX_DIV:
       case GSL_VECTOR_COMPLEX_DIV_BANG:
-	gsl_vector_complex_div(cvnew, cb);
-	break;
+        gsl_vector_complex_div(cvnew, cb);
+        break;
       }
     } else if (COMPLEX_P(bb)) {
       Data_Get_Struct(bb, gsl_complex, c);
       switch (flag) {
       case GSL_VECTOR_COMPLEX_ADD:
       case GSL_VECTOR_COMPLEX_ADD_BANG:
-	gsl_vector_complex_add_constant(cvnew, *c);
-	break;
+        gsl_vector_complex_add_constant(cvnew, *c);
+        break;
       case GSL_VECTOR_COMPLEX_SUB:
       case GSL_VECTOR_COMPLEX_SUB_BANG:
-	gsl_vector_complex_add_constant(cvnew, gsl_complex_negative(*c));
-	break;
+        gsl_vector_complex_add_constant(cvnew, gsl_complex_negative(*c));
+        break;
       case GSL_VECTOR_COMPLEX_MUL:
       case GSL_VECTOR_COMPLEX_MUL_BANG:
-	gsl_vector_complex_scale(cvnew, *c);
-	break;
+        gsl_vector_complex_scale(cvnew, *c);
+        break;
       case GSL_VECTOR_COMPLEX_DIV:
       case GSL_VECTOR_COMPLEX_DIV_BANG:
-	gsl_vector_complex_scale(cvnew, gsl_complex_inverse(*c));
-	break;
+        gsl_vector_complex_scale(cvnew, gsl_complex_inverse(*c));
+        break;
       }
     } else {
       rb_raise(rb_eTypeError, "wrong type argument %s", rb_class2name(CLASS_OF(bb)));
@@ -1185,22 +1181,22 @@ static VALUE rb_gsl_vector_complex_inner_product(int argc, VALUE *argv, VALUE ob
   case T_CLASS:
   case T_OBJECT:
     if (argc != 2) rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
-			    argc);
+                            argc);
     if (!VECTOR_COMPLEX_ROW_P(argv[0]))
       rb_raise(rb_eTypeError, "wrong argument type %s (GSL::Vector::Complex expected)",
-	       rb_class2name(CLASS_OF(argv[0])));
+               rb_class2name(CLASS_OF(argv[0])));
     if (!VECTOR_COMPLEX_COL_P(argv[1]))
       rb_raise(rb_eTypeError, "wrong argument type %s (GSL::Vector::Complex::Col expected)",
-	       rb_class2name(CLASS_OF(argv[1])));
+               rb_class2name(CLASS_OF(argv[1])));
     Data_Get_Struct(argv[0], gsl_vector_complex, v);
     Data_Get_Struct(argv[1], gsl_vector_complex, v2);
     break;
   default:
     if (argc != 1) rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)",
-			    argc);
+                            argc);
     if (!VECTOR_COMPLEX_COL_P(argv[0]))
       rb_raise(rb_eTypeError, "wrong argument type %s (GSL::Vector::Complex::Col expected)",
-	       rb_class2name(CLASS_OF(argv[0])));
+               rb_class2name(CLASS_OF(argv[0])));
     Data_Get_Struct(obj, gsl_vector_complex, v);
     Data_Get_Struct(argv[0], gsl_vector_complex, v2);
     break;
@@ -1228,25 +1224,25 @@ static VALUE rb_gsl_vector_complex_product_to_m(int argc, VALUE *argv, VALUE obj
   case T_CLASS:
   case T_OBJECT:
     if (argc != 2) rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
-			    argc);
+                            argc);
     if (!VECTOR_COMPLEX_COL_P(argv[0]))
-      rb_raise(rb_eTypeError, 
-	       "wrong argument type %s (GSL::Vector::Complex::Col expected)",
-	       rb_class2name(CLASS_OF(argv[0])));
+      rb_raise(rb_eTypeError,
+               "wrong argument type %s (GSL::Vector::Complex::Col expected)",
+               rb_class2name(CLASS_OF(argv[0])));
     if (!VECTOR_COMPLEX_ROW_P(argv[1]))
-      rb_raise(rb_eTypeError, 
-	       "wrong argument type %s (GSL::Vector::Complex expected)",
-	       rb_class2name(CLASS_OF(argv[1])));
+      rb_raise(rb_eTypeError,
+               "wrong argument type %s (GSL::Vector::Complex expected)",
+               rb_class2name(CLASS_OF(argv[1])));
     Data_Get_Struct(argv[0], gsl_vector_complex, v);
     Data_Get_Struct(argv[1], gsl_vector_complex, v2);
     break;
   default:
     if (argc != 1) rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)",
-			    argc);
+                            argc);
     if (!VECTOR_COMPLEX_ROW_P(argv[0]))
-      rb_raise(rb_eTypeError, 
-	       "wrong argument type %s (GSL::Vector::Complex expected)",
-	       rb_class2name(CLASS_OF(argv[0])));
+      rb_raise(rb_eTypeError,
+               "wrong argument type %s (GSL::Vector::Complex expected)",
+               rb_class2name(CLASS_OF(argv[0])));
     Data_Get_Struct(obj, gsl_vector_complex, v);
     Data_Get_Struct(argv[0], gsl_vector_complex, v2);
     break;
@@ -1323,8 +1319,8 @@ static VALUE rb_gsl_vector_complex_XXXz_bang(VALUE obj, gsl_complex (*f)(gsl_com
   return obj;
 }
 
-static VALUE rb_gsl_vector_complex_XXXz2(VALUE obj, VALUE a, 
-					 gsl_complex (*f)(gsl_complex, gsl_complex))
+static VALUE rb_gsl_vector_complex_XXXz2(VALUE obj, VALUE a,
+                                         gsl_complex (*f)(gsl_complex, gsl_complex))
 {
   gsl_vector_complex *m, *v;
   gsl_complex c, *z;
@@ -1340,8 +1336,8 @@ static VALUE rb_gsl_vector_complex_XXXz2(VALUE obj, VALUE a,
   return Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, v);
 }
 
-static VALUE rb_gsl_vector_complex_XXXz2_bang(VALUE obj, VALUE a, 
-					 gsl_complex (*f)(gsl_complex, gsl_complex))
+static VALUE rb_gsl_vector_complex_XXXz2_bang(VALUE obj, VALUE a,
+                                              gsl_complex (*f)(gsl_complex, gsl_complex))
 {
   gsl_vector_complex *v;
   gsl_complex c, *z;
@@ -1442,7 +1438,7 @@ static gsl_complex rb_gsl_vector_complex_sum_gsl(gsl_vector_complex * v)
   size_t i;
   gsl_complex z = gsl_complex_rect(0.0,0.0);
 
-  for(i=0; i<v->size; i++) {
+  for(i = 0; i<v->size; i++) {
     z = gsl_complex_add(z, gsl_vector_complex_get(v,i));
   }
   return z;
@@ -1461,7 +1457,7 @@ static double rb_gsl_vector_complex_tss_m_gsl(gsl_vector_complex * v, gsl_comple
   size_t i;
   double tss = 0.0;
 
-  for(i=0; i<v->size; i++) {
+  for(i = 0; i<v->size; i++) {
     tss += gsl_complex_abs2(gsl_complex_sub(gsl_vector_complex_get(v,i), mean));
   }
   return tss;
@@ -1521,7 +1517,7 @@ static double rb_gsl_vector_complex_sd_gsl(gsl_vector_complex * v)
  * (e.g. sum and mean)
  */
 static VALUE rb_gsl_vector_complex_z_stats_v(VALUE obj,
-    gsl_complex (*func)(gsl_vector_complex*))
+                                             gsl_complex (*func)(gsl_vector_complex*))
 {
   gsl_vector_complex * v;
   gsl_complex * zp;
@@ -1530,7 +1526,7 @@ static VALUE rb_gsl_vector_complex_z_stats_v(VALUE obj,
   CHECK_VECTOR_COMPLEX(obj);
   Data_Get_Struct(obj, gsl_vector_complex, v);
 
-  zv = Data_Make_Struct(cgsl_complex, gsl_complex, 0, free, zp); 
+  zv = Data_Make_Struct(cgsl_complex, gsl_complex, 0, free, zp);
   *zp = func(v);
 
   return zv;
@@ -1541,7 +1537,7 @@ static VALUE rb_gsl_vector_complex_z_stats_v(VALUE obj,
  * (e.g. tss, variance, sd)
  */
 static VALUE rb_gsl_vector_complex_d_stats_v(VALUE obj,
-    double (*func)(gsl_vector_complex*))
+                                             double (*func)(gsl_vector_complex*))
 {
   gsl_vector_complex * v;
   double d;
@@ -1559,7 +1555,7 @@ static VALUE rb_gsl_vector_complex_d_stats_v(VALUE obj,
  * (e.g. tss_m, variance_m, sd_m, variance_fm, sd_fm)
  */
 static VALUE rb_gsl_vector_complex_d_stats_v_z(VALUE obj, VALUE arg,
-    double (*func)(gsl_vector_complex*, gsl_complex))
+                                               double (*func)(gsl_vector_complex*, gsl_complex))
 {
   gsl_vector_complex * v;
   gsl_complex z;
@@ -1772,58 +1768,58 @@ static VALUE rb_gsl_vector_complex_concat(VALUE obj, VALUE other)
   Data_Get_Struct(obj, gsl_vector_complex, v);
 
   switch(TYPE(other)) {
-    case T_FIXNUM:
-    case T_BIGNUM:
-    case T_FLOAT:
+  case T_FIXNUM:
+  case T_BIGNUM:
+  case T_FLOAT:
+    vnew = gsl_vector_complex_alloc(v->size + 1);
+    vv = gsl_vector_complex_subvector(vnew, 0, v->size);
+    gsl_vector_complex_memcpy(&vv.vector, v);
+    gsl_vector_complex_set(vnew, v->size, rb_gsl_obj_to_gsl_complex(other, NULL));
+    break;
+
+  case T_ARRAY:
+    size2 = RARRAY_LEN(other);
+    vnew = gsl_vector_complex_alloc(v->size + size2);
+    vv = gsl_vector_complex_subvector(vnew, 0, v->size);
+    gsl_vector_complex_memcpy(&vv.vector, v);
+    for (i = 0; i < size2; i++) {
+      x = rb_ary_entry(other, i);
+      gsl_vector_complex_set(vnew, v->size + i, rb_gsl_obj_to_gsl_complex(x, NULL));
+    }
+    break;
+
+  default:
+    if(rb_obj_is_kind_of(other, cgsl_complex)) {
       vnew = gsl_vector_complex_alloc(v->size + 1);
       vv = gsl_vector_complex_subvector(vnew, 0, v->size);
       gsl_vector_complex_memcpy(&vv.vector, v);
       gsl_vector_complex_set(vnew, v->size, rb_gsl_obj_to_gsl_complex(other, NULL));
-      break;
-
-    case T_ARRAY:
-      size2 = RARRAY_LEN(other);
+    } else if(rb_obj_is_kind_of(other, rb_cRange)) {
+      get_range_beg_en_n(other, &beg, &end, &size2, &step);
       vnew = gsl_vector_complex_alloc(v->size + size2);
       vv = gsl_vector_complex_subvector(vnew, 0, v->size);
       gsl_vector_complex_memcpy(&vv.vector, v);
+      GSL_SET_COMPLEX(&tmp, beg, 0.0);
       for (i = 0; i < size2; i++) {
-        x = rb_ary_entry(other, i);
-        gsl_vector_complex_set(vnew, v->size + i, rb_gsl_obj_to_gsl_complex(x, NULL));
+        gsl_vector_complex_set(vnew, v->size + i, tmp);
+        GSL_SET_REAL(&tmp, GSL_REAL(tmp) + step);
       }
-      break;
-
-    default:
-      if(rb_obj_is_kind_of(other, cgsl_complex)) {
-        vnew = gsl_vector_complex_alloc(v->size + 1);
-        vv = gsl_vector_complex_subvector(vnew, 0, v->size);
-        gsl_vector_complex_memcpy(&vv.vector, v);
-        gsl_vector_complex_set(vnew, v->size, rb_gsl_obj_to_gsl_complex(other, NULL));
-      } else if(rb_obj_is_kind_of(other, rb_cRange)) {
-        get_range_beg_en_n(other, &beg, &end, &size2, &step);
-        vnew = gsl_vector_complex_alloc(v->size + size2);
-        vv = gsl_vector_complex_subvector(vnew, 0, v->size);
-        gsl_vector_complex_memcpy(&vv.vector, v);
-        GSL_SET_COMPLEX(&tmp, beg, 0.0);
-        for (i = 0; i < size2; i++) {
-          gsl_vector_complex_set(vnew, v->size + i, tmp);
-          GSL_SET_REAL(&tmp, GSL_REAL(tmp) + step);
-        }
-      } else if (rb_obj_is_kind_of(other, cgsl_vector_complex)) {
-        Data_Get_Struct(other, gsl_vector_complex, v2);
-        size2 = v2->size;
-        vnew = gsl_vector_complex_alloc(v->size + size2);
-        vv = gsl_vector_complex_subvector(vnew, 0, v->size);
-        gsl_vector_complex_memcpy(&vv.vector, v);
-        vv = gsl_vector_complex_subvector(vnew, v->size, size2);
-        gsl_vector_complex_memcpy(&vv.vector, v2);
-      } else {
-        rb_raise(rb_eTypeError, "wrong argument type %s (Array, Numeric, Range, GSL::Complex, or %s expected)",
-            rb_class2name(CLASS_OF(other)), rb_class2name(cgsl_vector_complex));
-      }
-      break;
+    } else if (rb_obj_is_kind_of(other, cgsl_vector_complex)) {
+      Data_Get_Struct(other, gsl_vector_complex, v2);
+      size2 = v2->size;
+      vnew = gsl_vector_complex_alloc(v->size + size2);
+      vv = gsl_vector_complex_subvector(vnew, 0, v->size);
+      gsl_vector_complex_memcpy(&vv.vector, v);
+      vv = gsl_vector_complex_subvector(vnew, v->size, size2);
+      gsl_vector_complex_memcpy(&vv.vector, v2);
+    } else {
+      rb_raise(rb_eTypeError, "wrong argument type %s (Array, Numeric, Range, GSL::Complex, or %s expected)",
+               rb_class2name(CLASS_OF(other)), rb_class2name(cgsl_vector_complex));
+    }
+    break;
   }
 
-  return Data_Wrap_Struct(VECTOR_COMPLEX_ROW_COL(obj), 0, gsl_vector_complex_free, vnew);  
+  return Data_Wrap_Struct(VECTOR_COMPLEX_ROW_COL(obj), 0, gsl_vector_complex_free, vnew);
 }
 
 static VALUE rb_gsl_vector_complex_block(VALUE obj)
@@ -1957,31 +1953,30 @@ static VALUE rb_gsl_vector_complex_zip(int argc, VALUE *argv, VALUE obj)
     argv2 = argv;
   } else {
     if (argc < 1) rb_raise(rb_eArgError, "Too few arguments.");
-    Data_Get_Struct(argv[0], gsl_vector_complex, v0);    
+    Data_Get_Struct(argv[0], gsl_vector_complex, v0);
     argc2 = argc - 1;
     argv2 = argv + 1;
   }
-  for (i = 0; i < argc2; i++) {
+  for (i = 0; (int) i < argc2; i++) {
     CHECK_VECTOR_COMPLEX(argv2[i]);
   }
   vp = (gsl_vector_complex**) malloc(sizeof(gsl_vector_complex**));
-  for (i = 0; i < argc2; i++) {
+  for (i = 0; (int) i < argc2; i++) {
     Data_Get_Struct(argv2[i], gsl_vector_complex, vp[i]);
   }
   ary = rb_ary_new2(v0->size);
   for (i = 0; i < v0->size; i++) {
     vnew = gsl_vector_complex_alloc(argc2 + 1);
     gsl_vector_complex_set(vnew, 0, gsl_vector_complex_get(v0, i));
-    for (j = 0; j < argc2; j++) {
+    for (j = 0; (int) j < argc2; j++) {
       if (i < vp[j]->size) {
-	gsl_vector_complex_set(vnew, j+1, gsl_vector_complex_get(vp[j], i));
+        gsl_vector_complex_set(vnew, j+1, gsl_vector_complex_get(vp[j], i));
       } else {
-	gsl_vector_complex_set(vnew, j+1, zzero);
+        gsl_vector_complex_set(vnew, j+1, zzero);
       }
     }
     rb_ary_store(ary, i, Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, vnew));
   }
-  
   free((gsl_vector_complex**) vp);
   return ary;
 }
@@ -1990,7 +1985,7 @@ static VALUE rb_gsl_vector_complex_zip(int argc, VALUE *argv, VALUE obj)
 // function, but it only determines absolute equality (i.e. is has no epsilon
 // argument).
 static int gsl_vector_complex_equal_eps(const gsl_vector_complex *v1,
-  const gsl_vector_complex *v2, double eps)
+                                        const gsl_vector_complex *v2, double eps)
 {
   gsl_complex z1, z2;
   size_t i;
@@ -2001,7 +1996,7 @@ static int gsl_vector_complex_equal_eps(const gsl_vector_complex *v1,
     if (!rbgsl_complex_equal(&z1, &z2, eps)) return 0;
   }
   return 1;
-  
+
 }
 
 static VALUE rb_gsl_vector_complex_equal(int argc, VALUE *argv, VALUE obj)
@@ -2042,8 +2037,8 @@ void Init_gsl_vector_complex(VALUE module)
   rb_define_singleton_method(cgsl_vector_complex, "alloc", rb_gsl_vector_complex_new, -1);
   rb_define_singleton_method(cgsl_vector_complex, "calloc", rb_gsl_vector_complex_calloc, 1);
 
-  rb_define_singleton_method(cgsl_vector_complex_col, "new", 
-			     rb_gsl_vector_complex_row_new, -1);
+  rb_define_singleton_method(cgsl_vector_complex_col, "new",
+                             rb_gsl_vector_complex_row_new, -1);
 
   rb_define_method(cgsl_vector_complex, "size", rb_gsl_vector_complex_size, 0);
   rb_define_alias(cgsl_vector_complex, "len", "size");
@@ -2102,7 +2097,7 @@ void Init_gsl_vector_complex(VALUE module)
   rb_define_method(cgsl_vector_complex, "subvector", rb_gsl_vector_complex_subvector, -1);
   rb_define_alias(cgsl_vector_complex, "view", "subvector");
   rb_define_method(cgsl_vector_complex, "subvector_with_stride", rb_gsl_vector_complex_subvector_with_stride, 3);
-  
+
   rb_define_singleton_method(cgsl_vector_complex, "memcpy", rb_gsl_vector_complex_memcpy, 2);
   rb_define_method(cgsl_vector_complex, "clone", rb_gsl_vector_complex_clone, 0);
   rb_define_alias(cgsl_vector_complex, "duplicate", "clone");
@@ -2131,17 +2126,17 @@ void Init_gsl_vector_complex(VALUE module)
   rb_define_alias(cgsl_vector_complex_col, "row", "trans");
   rb_define_alias(cgsl_vector_complex_col, "row!", "trans!");
 
-   /*****/
+  /*****/
   rb_define_method(cgsl_vector_complex, "to_real", rb_gsl_vector_complex_to_real, 0);
 
-  rb_define_method(cgsl_vector_complex, "add", rb_gsl_vector_complex_add, 1);  
-  rb_define_method(cgsl_vector_complex, "sub", rb_gsl_vector_complex_sub, 1);  
-  rb_define_method(cgsl_vector_complex, "mul", rb_gsl_vector_complex_mul, 1);  
-  rb_define_method(cgsl_vector_complex, "div", rb_gsl_vector_complex_div, 1);  
-  rb_define_method(cgsl_vector_complex, "add!", rb_gsl_vector_complex_add_bang, 1);  
-  rb_define_method(cgsl_vector_complex, "sub!", rb_gsl_vector_complex_sub_bang, 1);  
-  rb_define_method(cgsl_vector_complex, "mul!", rb_gsl_vector_complex_mul_bang, 1);  
-  rb_define_method(cgsl_vector_complex, "div!", rb_gsl_vector_complex_div_bang, 1);  
+  rb_define_method(cgsl_vector_complex, "add", rb_gsl_vector_complex_add, 1);
+  rb_define_method(cgsl_vector_complex, "sub", rb_gsl_vector_complex_sub, 1);
+  rb_define_method(cgsl_vector_complex, "mul", rb_gsl_vector_complex_mul, 1);
+  rb_define_method(cgsl_vector_complex, "div", rb_gsl_vector_complex_div, 1);
+  rb_define_method(cgsl_vector_complex, "add!", rb_gsl_vector_complex_add_bang, 1);
+  rb_define_method(cgsl_vector_complex, "sub!", rb_gsl_vector_complex_sub_bang, 1);
+  rb_define_method(cgsl_vector_complex, "mul!", rb_gsl_vector_complex_mul_bang, 1);
+  rb_define_method(cgsl_vector_complex, "div!", rb_gsl_vector_complex_div_bang, 1);
 
   rb_define_alias(cgsl_vector_complex, "+", "add");
   rb_define_alias(cgsl_vector_complex, "add_constant", "add");
@@ -2152,7 +2147,7 @@ void Init_gsl_vector_complex(VALUE module)
   rb_define_alias(cgsl_vector_complex, "scale!", "mul!");
   rb_define_alias(cgsl_vector_complex, "/", "div");
 
-  rb_define_method(cgsl_vector_complex, "coerce", rb_gsl_vector_complex_coerce, 1);  
+  rb_define_method(cgsl_vector_complex, "coerce", rb_gsl_vector_complex_coerce, 1);
 
   /* 2.Aug.2004 */
   rb_define_singleton_method(cgsl_vector_complex, "inner_product", rb_gsl_vector_complex_inner_product, -1);
@@ -2237,10 +2232,10 @@ void Init_gsl_vector_complex(VALUE module)
 
   rb_define_method(cgsl_vector_complex, "zip", rb_gsl_vector_complex_zip, -1);
   rb_define_singleton_method(cgsl_vector_complex, "zip", rb_gsl_vector_complex_zip, -1);
-  
+
   rb_define_method(cgsl_vector_complex, "equal?", rb_gsl_vector_complex_equal, -1);
   rb_define_alias(cgsl_vector_complex, "==", "equal?");
   rb_define_method(cgsl_vector_complex, "not_equal?", rb_gsl_vector_complex_not_equal, -1);
-  rb_define_alias(cgsl_vector_complex, "!=", "not_equal?");  
+  rb_define_alias(cgsl_vector_complex, "!=", "not_equal?");
 }