rb-gsl 1.16.0.4 → 1.16.0.5

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

@@ -2,7 +2,7 @@
   matrix_double.c
   Ruby/GSL: Ruby extension library for GSL (GNU Scientific Library)
     (C) Copyright 2001-2006 by Yoshiki Tsunesada
-  
+
   Ruby/GSL is free software: you can redistribute it and/or modify it
   under the terms of the GNU General Public License.
   This library is distributed in the hope that it will be useful, but
@@ -11,9 +11,7 @@
 
 #include "include/rb_gsl_array.h"
 #include "include/rb_gsl_complex.h"
-#ifdef HAVE_NARRAY_H
 #include "include/rb_gsl_with_narray.h"
-#endif
 
 enum {
   GSL_MATRIX_ADD,
@@ -62,29 +60,28 @@ static VALUE rb_gsl_matrix_arithmetics(int flag, VALUE obj, VALUE bb)
   default:
     if (MATRIX_INT_P(bb)) bb = rb_gsl_matrix_int_to_f(bb);
     if (VECTOR_INT_P(bb)) bb = rb_gsl_vector_int_to_f(bb);
-
     if (rb_obj_is_kind_of(bb, cgsl_matrix)) {
       Data_Get_Struct(bb, gsl_matrix, mb);
       switch (flag) {
       case GSL_MATRIX_ADD:
-	mnew = make_matrix_clone(m);
-	gsl_matrix_add(mnew, mb);
-	break;
+        mnew = make_matrix_clone(m);
+        gsl_matrix_add(mnew, mb);
+        break;
       case GSL_MATRIX_SUB:
-	mnew = make_matrix_clone(m);
-	gsl_matrix_sub(mnew,mb);
-	break;
+        mnew = make_matrix_clone(m);
+        gsl_matrix_sub(mnew,mb);
+        break;
       case GSL_MATRIX_MUL:
-	mnew = make_matrix_clone(m);
-	gsl_matrix_mul_elements(mnew, mb);
-	break;
+        mnew = make_matrix_clone(m);
+        gsl_matrix_mul_elements(mnew, mb);
+        break;
       case GSL_MATRIX_DIV:
-	mnew = make_matrix_clone(m);
-	gsl_matrix_div_elements(mnew, mb);
-	break;
+        mnew = make_matrix_clone(m);
+        gsl_matrix_div_elements(mnew, mb);
+        break;
       default:
-	rb_raise(rb_eRuntimeError, "operation not defined");
-	break;
+        rb_raise(rb_eRuntimeError, "operation not defined");
+        break;
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else if (rb_obj_is_kind_of(bb, cgsl_matrix_complex)) {
@@ -92,20 +89,20 @@ static VALUE rb_gsl_matrix_arithmetics(int flag, VALUE obj, VALUE bb)
       cmnew = matrix_to_complex(m);
       switch (flag) {
       case GSL_MATRIX_ADD:
-	gsl_matrix_complex_add(cmnew, cmb);
-	break;
+        gsl_matrix_complex_add(cmnew, cmb);
+        break;
       case GSL_MATRIX_SUB:
-	gsl_matrix_complex_sub(cmnew,cmb);
-	break;
+        gsl_matrix_complex_sub(cmnew,cmb);
+        break;
       case GSL_MATRIX_MUL:
-	gsl_matrix_complex_mul_elements(cmnew, cmb);
-	break;
+        gsl_matrix_complex_mul_elements(cmnew, cmb);
+        break;
       case GSL_MATRIX_DIV:
-	gsl_matrix_complex_div_elements(cmnew, cmb);
-	break;
+        gsl_matrix_complex_div_elements(cmnew, cmb);
+        break;
       default:
-	rb_raise(rb_eRuntimeError, "operation not defined");
-	break;
+        rb_raise(rb_eRuntimeError, "operation not defined");
+        break;
       }
       return Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, cmnew);
     } else if (rb_obj_is_kind_of(bb, cgsl_complex)) {
@@ -113,60 +110,60 @@ static VALUE rb_gsl_matrix_arithmetics(int flag, VALUE obj, VALUE bb)
       cmnew = matrix_to_complex(m);
       switch (flag) {
       case GSL_MATRIX_ADD:
-	gsl_matrix_complex_add_constant(cmnew, *c);
-	break;
+        gsl_matrix_complex_add_constant(cmnew, *c);
+        break;
       case GSL_MATRIX_SUB:
-	gsl_matrix_complex_add_constant(cmnew, gsl_complex_negative(*c));
-	break;
+        gsl_matrix_complex_add_constant(cmnew, gsl_complex_negative(*c));
+        break;
       case GSL_MATRIX_MUL:
-	gsl_matrix_complex_scale(cmnew, *c);
-	break;
+        gsl_matrix_complex_scale(cmnew, *c);
+        break;
       case GSL_MATRIX_DIV:
-	gsl_matrix_complex_scale(cmnew, gsl_complex_inverse(*c));
-	break;
+        gsl_matrix_complex_scale(cmnew, gsl_complex_inverse(*c));
+        break;
       default:
-	rb_raise(rb_eRuntimeError, "operation not defined");
-	break;
+        rb_raise(rb_eRuntimeError, "operation not defined");
+        break;
       }
       return Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, cmnew);
     } else if (rb_obj_is_kind_of(bb, cgsl_vector)) {
       if (!VECTOR_COL_P(bb))
-	rb_raise(rb_eTypeError, 
-		 "Operation with %s is not defined (GSL::Vector::Col expected)", 
-		 rb_class2name(CLASS_OF(bb)));
+        rb_raise(rb_eTypeError,
+                 "Operation with %s is not defined (GSL::Vector::Col expected)",
+                 rb_class2name(CLASS_OF(bb)));
       Data_Get_Struct(bb, gsl_vector, v);
       switch (flag) {
       case GSL_MATRIX_MUL:
-	//	vnew = gsl_vector_alloc(v->size);
-	vnew = gsl_vector_alloc(m->size1);
-	if (vnew == NULL) rb_raise(rb_eNoMemError, "gsl_vector_alloc failed");
-	gsl_matrix_mul_vector(vnew, m, v);
-	return Data_Wrap_Struct(cgsl_vector_col, 0, gsl_vector_free, vnew);
-	break;
+        //  vnew = gsl_vector_alloc(v->size);
+        vnew = gsl_vector_alloc(m->size1);
+        if (vnew == NULL) rb_raise(rb_eNoMemError, "gsl_vector_alloc failed");
+        gsl_matrix_mul_vector(vnew, m, v);
+        return Data_Wrap_Struct(cgsl_vector_col, 0, gsl_vector_free, vnew);
+        break;
       case GSL_MATRIX_DIV:
-	return rb_gsl_linalg_LU_solve(1, &bb, obj);
-	break;
+        return rb_gsl_linalg_LU_solve(1, &bb, obj);
+        break;
       default:
-	rb_raise(rb_eRuntimeError, "operation is not defined %s and Matrix",
-		 rb_class2name(CLASS_OF(bb)));
-	break;
+        rb_raise(rb_eRuntimeError, "operation is not defined %s and Matrix",
+                 rb_class2name(CLASS_OF(bb)));
+        break;
       }
     } else if (rb_obj_is_kind_of(bb, cgsl_vector_complex)) {
       Data_Get_Struct(bb, gsl_vector_complex, cv);
       switch (flag) {
       case GSL_MATRIX_MUL:
-	cm = matrix_to_complex(m);
-	//	cvnew = gsl_vector_complex_alloc(cv->size);
-	cvnew = gsl_vector_complex_alloc(m->size1);
-	if (cvnew == NULL) rb_raise(rb_eNoMemError, "gsl_vector_complex_alloc failed");
-	gsl_matrix_complex_mul_vector(cvnew, cm, cv);
-	gsl_matrix_complex_free(cm);
-	return Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, cvnew);
-	break;
+        cm = matrix_to_complex(m);
+        //  cvnew = gsl_vector_complex_alloc(cv->size);
+        cvnew = gsl_vector_complex_alloc(m->size1);
+        if (cvnew == NULL) rb_raise(rb_eNoMemError, "gsl_vector_complex_alloc failed");
+        gsl_matrix_complex_mul_vector(cvnew, cm, cv);
+        gsl_matrix_complex_free(cm);
+        return Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, cvnew);
+        break;
       default:
-	rb_raise(rb_eRuntimeError, "operation is not defined %s and Matrix",
-		 rb_class2name(CLASS_OF(bb)));
-	break;
+        rb_raise(rb_eRuntimeError, "operation is not defined %s and Matrix",
+                 rb_class2name(CLASS_OF(bb)));
+        break;
       }
     } else {
       rb_raise(rb_eTypeError, "wrong argument type %s", rb_class2name(CLASS_OF(bb)));
@@ -236,8 +233,8 @@ static VALUE rb_gsl_matrix_mul(VALUE obj, VALUE bb)
       return rb_gsl_matrix_mul_elements(obj, bb);
       break;
     default:
-      rb_raise(rb_eTypeError, 
-	       "wrong argument type %s", rb_class2name(CLASS_OF(bb)));
+      rb_raise(rb_eTypeError,
+               "wrong argument type %s", rb_class2name(CLASS_OF(bb)));
       break;
     }
   }
@@ -271,8 +268,8 @@ static VALUE rb_gsl_matrix_mul_bang(VALUE obj, VALUE bb)
       return obj;
       break;
     default:
-      rb_raise(rb_eTypeError, 
-	       "wrong argument type %s", rb_class2name(CLASS_OF(bb)));
+      rb_raise(rb_eTypeError,
+               "wrong argument type %s", rb_class2name(CLASS_OF(bb)));
       break;
     }
   }
@@ -336,8 +333,8 @@ static VALUE rb_gsl_matrix_coerce(VALUE obj, VALUE other)
       vcm = Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, cm);
       return rb_ary_new3(2, other, vcm);
     } else {
-      rb_raise(rb_eTypeError, "cannot coerce %s to Matrix", 
-	       rb_class2name(CLASS_OF(other)));
+      rb_raise(rb_eTypeError, "cannot coerce %s to Matrix",
+               rb_class2name(CLASS_OF(other)));
     }
     break;
   }
@@ -384,7 +381,7 @@ static VALUE rb_gsl_matrix_clean(int argc, VALUE *argv, VALUE obj)
   mnew = make_matrix_clone(m);
   n = m->size1*m->size2;
   for (i = 0; i < n; i++) if (fabs(mnew->data[i]) < eps) mnew->data[i] = 0.0;
-  return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);;
+  return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
 }
 
 static VALUE rb_gsl_matrix_clean_bang(int argc, VALUE *argv, VALUE obj)
@@ -411,8 +408,8 @@ static VALUE rb_gsl_matrix_clean_bang(int argc, VALUE *argv, VALUE obj)
 }
 
 
-static VALUE rb_gsl_matrix_op_inplace(VALUE mm1, VALUE mm2, 
-				      int (*f)(gsl_matrix*, const gsl_matrix*))
+static VALUE rb_gsl_matrix_op_inplace(VALUE mm1, VALUE mm2,
+                                      int (*f)(gsl_matrix*, const gsl_matrix*))
 {
   gsl_matrix *m1, *m2;
   Data_Get_Struct(mm1, gsl_matrix, m1);
@@ -467,7 +464,7 @@ static VALUE rb_gsl_matrix_log10(VALUE obj)
 #include <gsl/gsl_randist.h>
 #include "include/rb_gsl_rng.h"
 static VALUE rb_gsl_matrix_randx(int argc, VALUE *argv, VALUE klass,
-				 double (*f)(const gsl_rng*));
+                                 double (*f)(const gsl_rng*));
 static VALUE rb_gsl_matrix_rand(int argc, VALUE *argv, VALUE klass)
 {
   return rb_gsl_matrix_randx(argc, argv, klass, gsl_rng_uniform);
@@ -479,7 +476,7 @@ static VALUE rb_gsl_matrix_randn(int argc, VALUE *argv, VALUE klass)
 }
 
 static VALUE rb_gsl_matrix_randx(int argc, VALUE *argv, VALUE klass,
-				 double (*f)(const gsl_rng*))
+                                 double (*f)(const gsl_rng*))
 {
   gsl_matrix *m;
   gsl_rng *rng;
@@ -488,8 +485,8 @@ static VALUE rb_gsl_matrix_randx(int argc, VALUE *argv, VALUE klass,
   switch (argc) {
   case 3:
     if (!rb_obj_is_kind_of(argv[2], cgsl_rng)) {
-      rb_raise(rb_eTypeError, 
-	       "Wrong argument type (GSL::Rng expected)");
+      rb_raise(rb_eTypeError,
+               "Wrong argument type (GSL::Rng expected)");
     }
     Data_Get_Struct(argv[2], gsl_rng, rng);
     size1 = FIX2INT(argv[0]);
@@ -530,7 +527,7 @@ void Init_gsl_matrix(VALUE module)
   rb_define_alias(cgsl_matrix, "*", "mul");
   rb_define_method(cgsl_matrix, "mul!", rb_gsl_matrix_mul_bang, 1);
   /***/
- 
+
   rb_define_method(cgsl_matrix, "to_complex", rb_gsl_matrix_to_complex, 0);
 
   rb_define_method(cgsl_matrix, "coerce", rb_gsl_matrix_coerce, 1);

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

@@ -2,7 +2,7 @@
   matrix_int.c
   Ruby/GSL: Ruby extension library for GSL (GNU Scientific Library)
     (C) Copyright 2001-2006 by Yoshiki Tsunesada
-  
+
   Ruby/GSL is free software: you can redistribute it and/or modify it
   under the terms of the GNU General Public License.
   This library is distributed in the hope that it will be useful, but
@@ -15,8 +15,8 @@
 #include "include/rb_gsl_with_narray.h"
 #endif
 
-int gsl_linalg_matmult_int(const gsl_matrix_int *A, 
-			   const gsl_matrix_int *B, gsl_matrix_int *C);
+int gsl_linalg_matmult_int(const gsl_matrix_int *A,
+                           const gsl_matrix_int *B, gsl_matrix_int *C);
 
 
 VALUE rb_gsl_matrix_to_i(VALUE obj);
@@ -85,16 +85,16 @@ static VALUE rb_gsl_matrix_int_operation1(VALUE obj, VALUE other, int flag)
     bval = NUM2INT(other);
     anew = make_matrix_int_clone(a);
     switch (flag) {
-    case GSL_MATRIX_INT_ADD: 
+    case GSL_MATRIX_INT_ADD:
       /*result =*/ gsl_matrix_int_add_constant(anew, bval);
       break;
-    case GSL_MATRIX_INT_SUB: 
+    case GSL_MATRIX_INT_SUB:
       /*result =*/ gsl_matrix_int_add_constant(anew, -bval);
       break;
-    case GSL_MATRIX_INT_MUL: 
+    case GSL_MATRIX_INT_MUL:
       /*result =*/ gsl_matrix_int_scale(anew, bval);
       break;
-    case GSL_MATRIX_INT_DIV: 
+    case GSL_MATRIX_INT_DIV:
       /*result =*/ gsl_matrix_int_scale(anew, 1.0/bval);
       break;
     default:
@@ -109,34 +109,34 @@ static VALUE rb_gsl_matrix_int_operation1(VALUE obj, VALUE other, int flag)
       Data_Get_Struct(other, gsl_matrix_int, b);
       switch (flag) {
       case GSL_MATRIX_INT_ADD:
-	/*result =*/ gsl_matrix_int_add(anew, b);
-	break;
+        /*result =*/ gsl_matrix_int_add(anew, b);
+        break;
       case GSL_MATRIX_INT_SUB:
-	/*result =*/ gsl_matrix_int_sub(anew, b);
-	break;
+        /*result =*/ gsl_matrix_int_sub(anew, b);
+        break;
       case GSL_MATRIX_INT_MUL:
-	/*result =*/ gsl_matrix_int_mul_elements(anew, b);
-	break;
+        /*result =*/ gsl_matrix_int_mul_elements(anew, b);
+        break;
       case GSL_MATRIX_INT_DIV:
-	/*result =*/ gsl_matrix_int_div_elements(anew, b);
-	break;
+        /*result =*/ gsl_matrix_int_div_elements(anew, b);
+        break;
       default:
-	break;
+        break;
       }
     } else if (VECTOR_INT_COL_P(other)) {
       switch (flag) {
       case GSL_MATRIX_INT_MUL:
-	Data_Get_Struct(other, gsl_vector_int, vi);
-	vinew = gsl_vector_int_alloc(vi->size);
-	gsl_matrix_int_mul_vector(vinew, a, vi);
-	return Data_Wrap_Struct(cgsl_vector_int_col, 0, gsl_vector_int_free, vinew);
-	break;
+        Data_Get_Struct(other, gsl_vector_int, vi);
+        vinew = gsl_vector_int_alloc(vi->size);
+        gsl_matrix_int_mul_vector(vinew, a, vi);
+        return Data_Wrap_Struct(cgsl_vector_int_col, 0, gsl_vector_int_free, vinew);
+        break;
       default:
-	rb_raise(rb_eRuntimeError, "Operation not defined");
+        rb_raise(rb_eRuntimeError, "Operation not defined");
       }
     } else {
       rb_raise(rb_eTypeError, "Operation not defined with %s",
-	       rb_class2name(CLASS_OF(other)));
+               rb_class2name(CLASS_OF(other)));
     }
     break;
   }
@@ -183,48 +183,47 @@ static VALUE rb_gsl_matrix_int_matrix_mul(VALUE obj, VALUE bb)
     switch (TYPE(bb)) {
     case T_FIXNUM:
       return rb_gsl_matrix_int_mul(obj, bb);
-	/*      return rb_gsl_matrix_int_power(obj, bb);*/
+      /*      return rb_gsl_matrix_int_power(obj, bb);*/
       break;
     default:
       rb_raise(rb_eTypeError, "wrong argument type %s (Matrix::Int, Vector::Int::Col or Fixnum expected)",
-	       rb_class2name(CLASS_OF(bb)));
+               rb_class2name(CLASS_OF(bb)));
       break;
     }
   }
 }
 
-int gsl_linalg_matmult_int(const gsl_matrix_int *A, 
-			   const gsl_matrix_int *B, gsl_matrix_int *C)
+int gsl_linalg_matmult_int(const gsl_matrix_int *A,
+                           const gsl_matrix_int *B, gsl_matrix_int *C)
 {
   if (A->size2 != B->size1 || A->size1 != C->size1 || B->size2 != C->size2)
-    {
-      GSL_ERROR ("matrix sizes are not conformant", GSL_EBADLEN);
-    }
+  {
+    GSL_ERROR ("matrix sizes are not conformant", GSL_EBADLEN);
+  }
   else
+  {
+    int a, b;
+    int temp;
+    size_t i, j, k;
+
+    for (i = 0; i < C->size1; i++)
     {
-      int a, b;
-      int temp;
-      size_t i, j, k;
-      
-      for (i = 0; i < C->size1; i++)
+      for (j = 0; j < C->size2; j++)
+      {
+        a = gsl_matrix_int_get(A, i, 0);
+        b = gsl_matrix_int_get(B, 0, j);
+        temp = a * b;
+        for (k = 1; k < A->size2; k++)
         {
-          for (j = 0; j < C->size2; j++)
-            {
-              a = gsl_matrix_int_get(A, i, 0);
-              b = gsl_matrix_int_get(B, 0, j);
-              temp = a * b;
-              for (k = 1; k < A->size2; k++)
-                {
-                  a = gsl_matrix_int_get(A, i, k);
-                  b = gsl_matrix_int_get(B, k, j);
-                  temp += a * b;
-                }
-              gsl_matrix_int_set(C, i, j, temp);
-            }
+          a = gsl_matrix_int_get(A, i, k);
+          b = gsl_matrix_int_get(B, k, j);
+          temp += a * b;
         }
-
-      return GSL_SUCCESS;
+        gsl_matrix_int_set(C, i, j, temp);
+      }
     }
+    return GSL_SUCCESS;
+  }
 }
 
 void Init_gsl_matrix_int_init(VALUE module);

data/ext/{gsl/matrix_source.c → gsl_native/matrix_source.h}

@@ -52,14 +52,14 @@ void FUNCTION(get_range,beg_en_n)(VALUE range, BASE *beg, BASE *en, size_t *n, i
 
 // From ext/vector_source.c
 void get_range_beg_en_n_for_size(VALUE range,
-    int *beg, int *en, size_t *n, int *step, size_t size);
+                                 int *beg, int *en, size_t *n, int *step, size_t size);
 
 void parse_submatrix_args(int argc, VALUE *argv, size_t size1, size_t size2,
-    size_t *i, size_t *j, size_t *n1, size_t *n2);
+                          size_t *i, size_t *j, size_t *n1, size_t *n2);
 
 #ifdef BASE_DOUBLE
 void parse_submatrix_args(int argc, VALUE *argv, size_t size1, size_t size2,
-    size_t *i, size_t *j, size_t *n1, size_t *n2)
+                          size_t *i, size_t *j, size_t *n1, size_t *n2)
 {
   int ii, ij, in1, in2, end, step;
 
@@ -91,7 +91,7 @@ void parse_submatrix_args(int argc, VALUE *argv, size_t size1, size_t size2,
   // Fixnum, nil -> single row, all cols (Vector::View)
   // Fixnum, Range -> single row, Range cols (Vector::View)
   // Fixnum, Fixnum -> single row, single col (Matrix::View)
-  case 2: 
+  case 2:
     // nil, ...
     if(NIL_P(argv[0])) {
       // Parse second arg
@@ -114,7 +114,7 @@ void parse_submatrix_args(int argc, VALUE *argv, size_t size1, size_t size2,
         *i = 0; *j = (size_t)ij;
         *n1 = size1; *n2 = 0; // *n2 == 0 tells #submatrix to return Vector::Col::View
       }
-    // Range, ...
+      // Range, ...
     } else if(rb_obj_is_kind_of(argv[0], rb_cRange)) {
       get_range_beg_en_n_for_size(argv[0], &ii, &end, n1, &step, size1);
       if(step < 0 || *n1 <= 0) {
@@ -139,7 +139,7 @@ void parse_submatrix_args(int argc, VALUE *argv, size_t size1, size_t size2,
         *j = (size_t) ij;
         *n2 = 0; // *n2 == 0 tells #submatrix to return Vector::Col::View
       }
-    // Fixnum, ...
+      // Fixnum, ...
     } else {
       ii = NUM2INT(argv[0]);
       if(ii < 0) ii += size1;
@@ -182,7 +182,7 @@ void parse_submatrix_args(int argc, VALUE *argv, size_t size1, size_t size2,
       if(ij < 0) ij += size2;
       *j = (size_t) ij;
       *n2 = (size_t) in2;
-    // Range, Fixnum, Fixnum
+      // Range, Fixnum, Fixnum
     } else if(rb_obj_is_kind_of(argv[0], rb_cRange)) {
       // Range, Fixnum, Fixnum -> Range rows, some cols
       CHECK_FIXNUM(argv[1]); CHECK_FIXNUM(argv[2]);
@@ -196,11 +196,11 @@ void parse_submatrix_args(int argc, VALUE *argv, size_t size1, size_t size2,
       *i = (size_t)ii;
       *j = (size_t) ij;
       *n2 = (size_t) in2;
-    // Fixnum, Fixnum, ...
+      // Fixnum, Fixnum, ...
     } else {
       CHECK_FIXNUM(argv[0]); CHECK_FIXNUM(argv[1]);
       ii = FIX2INT(argv[0]);
-      if(ii < 0) ii += size1; 
+      if(ii < 0) ii += size1;
       in1 = FIX2INT(argv[1]);
       *i = (size_t)ii;
       *n1 = (size_t)in1;
@@ -218,7 +218,7 @@ void parse_submatrix_args(int argc, VALUE *argv, size_t size1, size_t size2,
         *j = (size_t)ij;
       } else {
         rb_raise(rb_eArgError, "expected third argument to be nil or Range, not %s",
-           rb_class2name(CLASS_OF(argv[2])));
+                 rb_class2name(CLASS_OF(argv[2])));
       }
     }
     break;
@@ -241,7 +241,7 @@ void parse_submatrix_args(int argc, VALUE *argv, size_t size1, size_t size2,
 }
 #endif
 
-VALUE FUNCTION(rb_gsl_matrix,do_something)(VALUE obj, void (*f)(GSL_TYPE(gsl_matrix) *))
+VALUE FUNCTION(rb_gsl_matrix,do_something)(VALUE obj, void (*f)(GSL_TYPE (gsl_matrix) *))
 {
   GSL_TYPE(gsl_matrix) *m = NULL;
   Data_Get_Struct(obj, GSL_TYPE(gsl_matrix), m);
@@ -257,16 +257,13 @@ static VALUE FUNCTION(rb_gsl_matrix,alloc)(int argc, VALUE *argv, VALUE klass)
 {
   GSL_TYPE(gsl_matrix) *m = NULL;
   size_t n1, n2;
-#ifdef HAVE_NARRAY_H
-  size_t n;
-  VALUE ary;
-  struct NARRAY *na;
-#endif
-  if (argc < 1) rb_raise(rb_eArgError, 
-			 "wrong number of arguments (%d for >= 1)", argc);
-
+  if (argc < 1) rb_raise(rb_eArgError,
+                         "wrong number of arguments (%d for >= 1)", argc);
 #ifdef HAVE_NARRAY_H
   if (NA_IsNArray(argv[0])) {
+    size_t n;
+    VALUE ary;
+    struct NARRAY *na;
     GetNArray(argv[0], na);
     n = na->shape[0]*na->shape[1];
     m = FUNCTION(gsl_matrix,alloc)(na->shape[1], na->shape[0]);
@@ -282,8 +279,8 @@ static VALUE FUNCTION(rb_gsl_matrix,alloc)(int argc, VALUE *argv, VALUE klass)
 #endif
   switch (TYPE(argv[0])) {
   case T_FIXNUM:
-    if (argc != 2) rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", 
-			    argc);
+    if (argc != 2) rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
+                            argc);
     CHECK_FIXNUM(argv[1]);
     n1 = FIX2INT(argv[0]); n2 = FIX2INT(argv[1]);
     m = FUNCTION(gsl_matrix,calloc)(n1, n2);
@@ -300,38 +297,38 @@ static VALUE FUNCTION(rb_gsl_matrix,alloc)(int argc, VALUE *argv, VALUE klass)
       break;
     case T_FIXNUM:
       if (argc != 3) rb_raise(rb_eArgError, "wrong number of arguments (%d for 3)",
-			      argc);
+                              argc);
       CHECK_FIXNUM(argv[2]);
       m = FUNCTION(gsl_matrix,alloc_from_array_sizes)(argv[0], argv[1], argv[2]);
       break;
     default:
-      rb_raise(rb_eTypeError, 
-	       "wrong argument type %s\nUsage: new(n1, n2), "
-	       "new([], [], [], ...), new([], n1, n2)", 
-	       rb_class2name(CLASS_OF(argv[1])));
+      rb_raise(rb_eTypeError,
+               "wrong argument type %s\nUsage: new(n1, n2), "
+               "new([], [], [], ...), new([], n1, n2)",
+               rb_class2name(CLASS_OF(argv[1])));
       break;
     }
     break;
   default:
     if (CLASS_OF(argv[0]) == rb_cRange) {
       if (argc==3 && TYPE(argv[1]) == T_FIXNUM && TYPE(argv[2]) == T_FIXNUM)
-	return FUNCTION(create_matrix,from_range_shape)(argv[0], argv[1], argv[2]);
+        return FUNCTION(create_matrix,from_range_shape)(argv[0], argv[1], argv[2]);
       else
-	return FUNCTION(create_matrix,from_ranges)(argc, argv);
+        return FUNCTION(create_matrix,from_ranges)(argc, argv);
     } else if (VEC_P(argv[0])) {
       if (argc == 3 && FIXNUM_P(argv[1]) && FIXNUM_P(argv[2])) {
-	m = FUNCTION(gsl_matrix,alloc_from_vector_sizes)(argv[0], argv[1], argv[2]);
+        m = FUNCTION(gsl_matrix,alloc_from_vector_sizes)(argv[0], argv[1], argv[2]);
       } else {
-	if (VEC_COL_P(argv[0])) {
-	  m = FUNCTION(gsl_matrix,alloc_from_colvectors)(argc, argv);
-	} else {
-	  m = FUNCTION(gsl_matrix,alloc_from_vectors)(argc, argv);
-	}
+        if (VEC_COL_P(argv[0])) {
+          m = FUNCTION(gsl_matrix,alloc_from_colvectors)(argc, argv);
+        } else {
+          m = FUNCTION(gsl_matrix,alloc_from_vectors)(argc, argv);
+        }
       }
     } else {
       rb_raise(rb_eTypeError, "wrong argument type %s\n"
-	       "Usage: new(n1, n2), new([], [], [], ...), new([], n1, n2)", 
-	       rb_class2name(CLASS_OF(argv[0])));
+               "Usage: new(n1, n2), new([], [], [], ...), new([], n1, n2)",
+               rb_class2name(CLASS_OF(argv[0])));
     }
     break;
   }
@@ -350,9 +347,9 @@ static GSL_TYPE(gsl_matrix)* FUNCTION(cr_matrix,from_ranges)(int argc, VALUE *ar
   m = FUNCTION(gsl_matrix,calloc)(argc, n);
   FUNCTION(set_ptr_data,by_range)(m->data, n, argv[0]);
   for (i = 1; (int) i < argc; i++) {
-    if (CLASS_OF(argv[i]) != rb_cRange) 
+    if (CLASS_OF(argv[i]) != rb_cRange)
       rb_raise(rb_eTypeError, "wrong argument type %s (Range expected)",
-	       rb_class2name(CLASS_OF(argv[i])));
+               rb_class2name(CLASS_OF(argv[i])));
     FUNCTION(set_ptr_data,by_range)(m->data+i*n, n, argv[i]);
   }
   return m;
@@ -430,7 +427,7 @@ GSL_TYPE(gsl_matrix)* FUNCTION(gsl_matrix,alloc_from_colvectors)(int argc, VALUE
   CHECK_VEC(argv[0]);
   Data_Get_Struct(argv[0], GSL_TYPE(gsl_vector), v);
 //  m = FUNCTION(gsl_matrix,alloc)(argc, v->size);
-  m = FUNCTION(gsl_matrix,alloc)(v->size, argc);  
+  m = FUNCTION(gsl_matrix,alloc)(v->size, argc);
   if (m == NULL) rb_raise(rb_eNoMemError, "gsl_matrix_alloc failed");
   for (i = 0; (int) i < argc; i++) {
     CHECK_VEC(argv[i]);
@@ -442,7 +439,7 @@ GSL_TYPE(gsl_matrix)* FUNCTION(gsl_matrix,alloc_from_colvectors)(int argc, VALUE
 
 /* create a matrix from two sizes and an array */
 GSL_TYPE(gsl_matrix)* FUNCTION(gsl_matrix,alloc_from_array_sizes)(VALUE ary,
-								  VALUE nn1, VALUE nn2)
+                                                                  VALUE nn1, VALUE nn2)
 {
   size_t n1, n2, len;
   GSL_TYPE(gsl_matrix) *m = NULL;
@@ -458,17 +455,16 @@ GSL_TYPE(gsl_matrix)* FUNCTION(gsl_matrix,alloc_from_array_sizes)(VALUE ary,
   for (i = 0; i < n1; i++) {
     for (j = 0; j < n2; j++, k++) {
       if (k >= len)
-	FUNCTION(gsl_matrix,set)(m, i, j, (BASE) 0);
+        FUNCTION(gsl_matrix,set)(m, i, j, (BASE) 0);
       else
-	FUNCTION(gsl_matrix,set)(m, i, j, (BASE) NUMCONV2(rb_ary_entry(ary, k)));
-      
+        FUNCTION(gsl_matrix,set)(m, i, j, (BASE) NUMCONV2(rb_ary_entry(ary, k)));
     }
   }
   return m;
 }
 
 GSL_TYPE(gsl_matrix)* FUNCTION(gsl_matrix,alloc_from_vector_sizes)(VALUE ary,
-								   VALUE nn1, VALUE nn2)
+                                                                   VALUE nn1, VALUE nn2)
 {
   size_t n1, n2;
   GSL_TYPE(gsl_matrix) *m = NULL;
@@ -483,10 +479,10 @@ GSL_TYPE(gsl_matrix)* FUNCTION(gsl_matrix,alloc_from_vector_sizes)(VALUE ary,
   k = 0;
   for (i = 0; i < n1; i++) {
     for (j = 0; j < n2; j++, k++) {
-      if (k >= v->size) 
-	FUNCTION(gsl_matrix,set)(m, i, j, (BASE) 0);
+      if (k >= v->size)
+        FUNCTION(gsl_matrix,set)(m, i, j, (BASE) 0);
       else
-	FUNCTION(gsl_matrix,set)(m, i, j, FUNCTION(gsl_vector,get)(v, k));
+        FUNCTION(gsl_matrix,set)(m, i, j, FUNCTION(gsl_vector,get)(v, k));
     }
   }
   return m;
@@ -515,7 +511,7 @@ static VALUE FUNCTION(rb_gsl_matrix,diagonal_singleton)(int argc, VALUE *argv, V
       len = FIX2INT(argv[0]);
       m = FUNCTION(gsl_matrix,alloc)(len, len);
       for (i = 0; i < len; i++)
-	FUNCTION(gsl_matrix,set)(m, i, i, 1);
+        FUNCTION(gsl_matrix,set)(m, i, i, 1);
       return Data_Wrap_Struct(klass, 0, FUNCTION(gsl_matrix,free), m);
       break;
     default:
@@ -530,8 +526,8 @@ static VALUE FUNCTION(rb_gsl_matrix,diagonal_singleton)(int argc, VALUE *argv, V
       len = RARRAY_LEN(ary);
       m = FUNCTION(gsl_matrix,calloc)(len, len);
       for (i = 0; i < len; i++) {
-	tmp = rb_ary_entry(ary, i);
-	FUNCTION(gsl_matrix,set)(m, i, i, NUMCONV2(tmp));
+        tmp = rb_ary_entry(ary, i);
+        FUNCTION(gsl_matrix,set)(m, i, i, NUMCONV2(tmp));
       }
       break;
     default:
@@ -540,7 +536,7 @@ static VALUE FUNCTION(rb_gsl_matrix,diagonal_singleton)(int argc, VALUE *argv, V
       len = v->size;
       m = FUNCTION(gsl_matrix,calloc)(len, len);
       for (i = 0; i < len; i++) {
-	FUNCTION(gsl_matrix,set)(m, i, i, FUNCTION(gsl_vector,get)(v, i));
+        FUNCTION(gsl_matrix,set)(m, i, i, FUNCTION(gsl_vector,get)(v, i));
       }
       break;
     }
@@ -711,7 +707,6 @@ static VALUE FUNCTION(rb_gsl_matrix,get)(int argc, VALUE *argv, VALUE obj)
   } else {
     retval = FUNCTION(rb_gsl_matrix,submatrix)(argc, argv, obj);
   }
-
   return retval;
 }
 
@@ -729,7 +724,6 @@ static VALUE FUNCTION(rb_gsl_matrix,set)(int argc, VALUE *argv, VALUE obj)
   if(argc < 1 || argc > 5) {
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 1-5)", argc);
   }
-
   Data_Get_Struct(obj, GSL_TYPE(gsl_matrix), m);
   other = argv[argc-1];
 
@@ -783,7 +777,7 @@ static VALUE FUNCTION(rb_gsl_matrix,set)(int argc, VALUE *argv, VALUE obj)
       Data_Get_Struct(other, GSL_TYPE(gsl_matrix), mother);
       if(n1 * n2 != mother->size1 * mother->size2) {
         rb_raise(rb_eRangeError, "sizes do not match (%d x %d != %d x %d)",
-		 (int) n1, (int) n2, (int) mother->size1, (int) mother->size2);
+                 (int) n1, (int) n2, (int) mother->size1, (int) mother->size2);
       }
       // TODO Change to gsl_matrix_memmove if/when GSL has such a function
       // because gsl_matrix_memcpy does not handle overlapping regions (e.g.
@@ -801,7 +795,7 @@ static VALUE FUNCTION(rb_gsl_matrix,set)(int argc, VALUE *argv, VALUE obj)
         // m[...] = [[row0], [row1], ...] # multiple rows
         if((int) n1 != RARRAY_LEN(other)) {
           rb_raise(rb_eRangeError, "row counts do not match (%d != %d)",
-		   (int) n1, (int) RARRAY_LEN(other));
+                   (int) n1, (int) RARRAY_LEN(other));
         }
         for(k = 0; k < n1; k++) {
           vv = FUNCTION(gsl_matrix,row)(&mv.matrix, k);
@@ -824,7 +818,6 @@ static VALUE FUNCTION(rb_gsl_matrix,set)(int argc, VALUE *argv, VALUE obj)
       FUNCTION(gsl_matrix,set_all)(&mv.matrix, NUMCONV2(other));
     }
   }
-
   return obj;
 }
 
@@ -893,7 +886,7 @@ static VALUE FUNCTION(rb_gsl_matrix,to_s)(VALUE obj)
   strcpy(format2, format);
 #else
   strcpy(format, PRINTF_FORMAT);
-  strcpy(format2, " "PRINTF_FORMAT);
+  strcpy(format2, " " PRINTF_FORMAT);
 #endif
   str = rb_str_new2("[ ");
   for (i = 0; i < m->size1; i++) {
@@ -904,9 +897,9 @@ static VALUE FUNCTION(rb_gsl_matrix,to_s)(VALUE obj)
     for (j = 0; j < m->size2; j++) {
       x = FUNCTION(gsl_matrix,get)(m, i, j);
       if (x < 0)
-	sprintf(buf, format, x); 
+        sprintf(buf, format, x);
       else
-	sprintf(buf, format2, x); 
+        sprintf(buf, format2, x);
       rb_str_cat(str, buf, strlen(buf));
       if ((int) j >= (55/dig)) {
         strcpy(buf, "... ");
@@ -1015,11 +1008,11 @@ static VALUE FUNCTION(rb_gsl_matrix,set_diagonal)(VALUE obj, VALUE diag)
       Data_Get_Struct(diag, GSL_TYPE(gsl_vector), v);
       len = GSL_MIN_INT(m->size1, v->size);
       for (i = 0; i < len; i++) {
-	FUNCTION(gsl_matrix,set)(m, i, i, FUNCTION(gsl_vector,get)(v, i));
+        FUNCTION(gsl_matrix,set)(m, i, i, FUNCTION(gsl_vector,get)(v, i));
       }
     } else {
       rb_raise(rb_eTypeError, "wrong argument type %s (GSL::Vector or Array expected)",
-	       rb_class2name(CLASS_OF(diag)));
+               rb_class2name(CLASS_OF(diag)));
     }
     break;
   }
@@ -1268,7 +1261,7 @@ static VALUE FUNCTION(rb_gsl_matrix,minmax_index)(VALUE obj)
   Data_Get_Struct(obj, GSL_TYPE(gsl_matrix), m);
   FUNCTION(gsl_matrix,minmax_index)(m, &imin, &jmin, &imax, &jmax);
   return rb_ary_new3(2, rb_ary_new3(2, INT2FIX(imin), INT2FIX(jmin)),
-		     rb_ary_new3(2, INT2FIX(imax), INT2FIX(jmax)));
+                     rb_ary_new3(2, INT2FIX(imax), INT2FIX(jmax)));
 }
 
 static VALUE FUNCTION(rb_gsl_matrix,fwrite)(VALUE obj, VALUE io)
@@ -1333,7 +1326,7 @@ VALUE FUNCTION(rb_gsl_matrix,power)(VALUE obj, VALUE bb)
   size_t i, b;
   CHECK_FIXNUM(bb);
   Data_Get_Struct(obj, GSL_TYPE(gsl_matrix), m);
-  b = FIX2INT(bb); 
+  b = FIX2INT(bb);
   mtmp = FUNCTION(gsl_matrix,alloc)(m->size1, m->size2);
   mnew = FUNCTION(gsl_matrix,alloc)(m->size1, m->size2);
   FUNCTION(gsl_matrix,memcpy)(mnew, m);
@@ -1374,8 +1367,8 @@ static VALUE FUNCTION(rb_gsl_matrix,submatrix)(int argc, VALUE *argv, VALUE obj)
 }
 
 static VALUE FUNCTION(rb_gsl_matrix,return_vector_view)(VALUE obj, VALUE index,
-					      QUALIFIED_VIEW(gsl_vector,view) (*f)(GSL_TYPE(gsl_matrix)*,
-								   size_t))
+                                                        QUALIFIED_VIEW(gsl_vector,view) (*f)(GSL_TYPE(gsl_matrix)*,
+                                                                                             size_t))
 {
   GSL_TYPE(gsl_matrix) *m = NULL;
   QUALIFIED_VIEW(gsl_vector,view) *vv = NULL;
@@ -1402,9 +1395,8 @@ static VALUE FUNCTION(rb_gsl_matrix,column)(VALUE obj, VALUE j)
   return Data_Wrap_Struct(QUALIFIED_VIEW(cgsl_vector,col_view), 0, free, vv);
 }
 
-#ifdef GSL_1_10_LATER
 static VALUE FUNCTION(rb_gsl_matrix,subrow)(VALUE obj, VALUE i, VALUE offset,
-  VALUE n)
+                                            VALUE n)
 {
   GSL_TYPE(gsl_matrix) *m = NULL;
   QUALIFIED_VIEW(gsl_vector,view) *vv = NULL;
@@ -1414,7 +1406,7 @@ static VALUE FUNCTION(rb_gsl_matrix,subrow)(VALUE obj, VALUE i, VALUE offset,
   return Data_Wrap_Struct(QUALIFIED_VIEW(cgsl_vector,view), 0, free, vv);
 }
 static VALUE FUNCTION(rb_gsl_matrix,subcolumn)(VALUE obj, VALUE j, VALUE offset,
-  VALUE n)
+                                               VALUE n)
 {
   GSL_TYPE(gsl_matrix) *m = NULL;
   QUALIFIED_VIEW(gsl_vector,view) *vv = NULL;
@@ -1423,7 +1415,6 @@ static VALUE FUNCTION(rb_gsl_matrix,subcolumn)(VALUE obj, VALUE j, VALUE offset,
   *vv = FUNCTION(gsl_matrix,subcolumn)(m, FIX2INT(j), FIX2INT(offset), FIX2INT(n));
   return Data_Wrap_Struct(QUALIFIED_VIEW(cgsl_vector,col_view), 0, free, vv);
 }
-#endif
 
 static VALUE FUNCTION(rb_gsl_matrix,diagonal)(VALUE obj)
 {
@@ -1499,7 +1490,7 @@ static VALUE FUNCTION(rb_gsl_matrix,scale_bang)(VALUE obj, VALUE x)
 {
   GSL_TYPE(gsl_matrix) *m;
   Data_Get_Struct(obj, GSL_TYPE(gsl_matrix), m);
-  FUNCTION(gsl_matrix,scale)(m, NUMCONV(x));
+  FUNCTION(gsl_matrix,scale)(m, NUMCONV2(x));
   return obj;
 }
 
@@ -1508,7 +1499,7 @@ static VALUE FUNCTION(rb_gsl_matrix,scale)(VALUE obj, VALUE b)
   GSL_TYPE(gsl_matrix) *m = NULL, *mnew;
   Data_Get_Struct(obj, GSL_TYPE(gsl_matrix), m);
   mnew = FUNCTION(make_matrix,clone)(m);
-  FUNCTION(gsl_matrix,scale)(mnew, NUMCONV(b));
+  FUNCTION(gsl_matrix,scale)(mnew, NUMCONV2(b));
   return Data_Wrap_Struct(GSL_TYPE(cgsl_matrix), 0, FUNCTION(gsl_matrix,free), mnew);
 }
 
@@ -1516,7 +1507,7 @@ static VALUE FUNCTION(rb_gsl_matrix,add_constant_bang)(VALUE obj, VALUE x)
 {
   GSL_TYPE(gsl_matrix) *m;
   Data_Get_Struct(obj, GSL_TYPE(gsl_matrix), m);
-  FUNCTION(gsl_matrix,add_constant)(m, NUMCONV(x));
+  FUNCTION(gsl_matrix,add_constant)(m, NUMCONV2(x));
   return obj;
 }
 
@@ -1525,7 +1516,7 @@ static VALUE FUNCTION(rb_gsl_matrix,add_constant)(VALUE obj, VALUE b)
   GSL_TYPE(gsl_matrix) *m = NULL, *mnew;
   Data_Get_Struct(obj, GSL_TYPE(gsl_matrix), m);
   mnew = FUNCTION(make_matrix,clone)(m);
-  FUNCTION(gsl_matrix,add_constant)(mnew, NUMCONV(b));
+  FUNCTION(gsl_matrix,add_constant)(mnew, NUMCONV2(b));
   return Data_Wrap_Struct(GSL_TYPE(cgsl_matrix), 0, FUNCTION(gsl_matrix,free), mnew);
 }
 
@@ -1543,7 +1534,7 @@ static int FUNCTION(mygsl_matrix,equal)(GSL_TYPE(gsl_matrix) *a, GSL_TYPE(gsl_ma
   }
   return 1;
 }
- 
+
 #ifdef HAVE_TENSOR_TENSOR_H
 EXTERN VALUE cgsl_tensor, cgsl_tensor_int;
 VALUE rb_gsl_tensor_equal(int argc, VALUE *argv, VALUE obj);
@@ -1711,7 +1702,7 @@ static VALUE FUNCTION(rb_gsl_matrix,pascal1)(VALUE obj, VALUE n)
   for (i = 1; i < dim; i++) {
     FUNCTION(gsl_matrix,set)(m, i, 0, (BASE) 1);
     for (j = 1; j < dim; j++) {
-      x=FUNCTION(gsl_matrix,get)(m,i-1,j)+FUNCTION(gsl_matrix,get)(m,i,j-1);
+      x = FUNCTION(gsl_matrix,get)(m,i-1,j)+FUNCTION(gsl_matrix,get)(m,i,j-1);
       FUNCTION(gsl_matrix,set)(m, i, j, x);
     }
   }
@@ -1785,7 +1776,7 @@ static VALUE FUNCTION(rb_gsl_matrix,vandermonde)(VALUE obj, VALUE vv)
     Data_Get_Struct(vv, GSL_TYPE(gsl_vector), v);
   } else {
     rb_raise(rb_eTypeError, "wrong argument type %s (Array or Vector expected)",
-	     rb_class2name(CLASS_OF(vv)));
+             rb_class2name(CLASS_OF(vv)));
   }
   m = FUNCTION(gsl_matrix,alloc)(v->size, v->size);
   FUNCTION(mygsl_matrix,vandermonde)(m, v);
@@ -1798,10 +1789,10 @@ static void FUNCTION(mygsl_matrix,toeplitz)(GSL_TYPE(gsl_matrix) *m, GSL_TYPE(gs
   size_t i, j;
   for (i = 0; i < v->size; i++) {
     for (j = 0; j < v->size; j++) {
-      if (j >= i) 
-	FUNCTION(gsl_matrix,set)(m, i, j, FUNCTION(gsl_vector,get)(v, j-i));
+      if (j >= i)
+        FUNCTION(gsl_matrix,set)(m, i, j, FUNCTION(gsl_vector,get)(v, j-i));
       else
-	FUNCTION(gsl_matrix,set)(m, i, j, FUNCTION(gsl_vector,get)(v, i-j));
+        FUNCTION(gsl_matrix,set)(m, i, j, FUNCTION(gsl_vector,get)(v, i-j));
     }
   }
 }
@@ -1818,7 +1809,7 @@ static VALUE FUNCTION(rb_gsl_matrix,toeplitz)(VALUE obj, VALUE vv)
     Data_Get_Struct(vv, GSL_TYPE(gsl_vector), v);
   } else {
     rb_raise(rb_eTypeError, "wrong argument type %s (Array or Vector expected)",
-	     rb_class2name(CLASS_OF(vv)));
+             rb_class2name(CLASS_OF(vv)));
   }
   m = FUNCTION(gsl_matrix,alloc)(v->size, v->size);
   FUNCTION(mygsl_matrix,toeplitz)(m, v);
@@ -1839,7 +1830,7 @@ static VALUE FUNCTION(rb_gsl_matrix,circulant)(VALUE obj, VALUE vv)
     Data_Get_Struct(vv, GSL_TYPE(gsl_vector), v);
   } else {
     rb_raise(rb_eTypeError, "wrong argument type %s (Array or Vector expected)",
-	     rb_class2name(CLASS_OF(vv)));
+             rb_class2name(CLASS_OF(vv)));
   }
   m = FUNCTION(gsl_matrix,alloc)(v->size, v->size);
   FUNCTION(mygsl_vector,to_m_circulant)(m, v);
@@ -1848,7 +1839,7 @@ static VALUE FUNCTION(rb_gsl_matrix,circulant)(VALUE obj, VALUE vv)
 }
 
 static void FUNCTION(mygsl_matrix,indgen)(GSL_TYPE(gsl_matrix) *m,
-					  BASE start, BASE step)
+                                          BASE start, BASE step)
 {
   size_t i, j;
   BASE n;
@@ -1869,10 +1860,10 @@ static VALUE FUNCTION(rb_gsl_matrix,indgen_singleton)(int argc, VALUE *argv, VAL
   switch (argc) {
   case 4:
     step = NUMCONV2(argv[3]);
-    /* no break */
+  /* no break */
   case 3:
     start = NUMCONV2(argv[2]);
-    /* no break */
+  /* no break */
   case 2:
     n1 = NUM2INT(argv[0]);
     n2 = NUM2INT(argv[1]);
@@ -1893,7 +1884,7 @@ static VALUE FUNCTION(rb_gsl_matrix,indgen)(int argc, VALUE *argv, VALUE obj)
   switch (argc) {
   case 2:
     step = NUMCONV2(argv[1]);
-    /* no break */
+  /* no break */
   case 1:
     start = NUMCONV2(argv[0]);
     break;
@@ -1916,7 +1907,7 @@ static VALUE FUNCTION(rb_gsl_matrix,indgen_bang)(int argc, VALUE *argv, VALUE ob
   switch (argc) {
   case 2:
     step = NUMCONV2(argv[1]);
-    /* no break */
+  /* no break */
   case 1:
     start = NUMCONV2(argv[0]);
     break;
@@ -1938,10 +1929,10 @@ static VALUE FUNCTION(rb_gsl_matrix,to_a)(VALUE obj)
   size_t i, j;
   Data_Get_Struct(obj, GSL_TYPE(gsl_matrix), m);
   ma = rb_ary_new2(m->size1);
-  for(i=0; i < m->size1; i++) {
+  for(i = 0; i < m->size1; i++) {
     ra = rb_ary_new2(m->size2);
     rb_ary_store(ma, i, ra);
-    for(j=0; j < m->size2; j++) {
+    for(j = 0; j < m->size2; j++) {
       rb_ary_store(ra, j, C_TO_VALUE(FUNCTION(gsl_matrix,get)(m, i, j)));
     }
   }
@@ -1961,7 +1952,6 @@ static VALUE FUNCTION(rb_gsl_matrix,to_v)(VALUE obj)
       FUNCTION(gsl_vector,set)(v, k, FUNCTION(gsl_matrix,get)(m, i, j));
     }
   }
-
   if(m->size1 > 1 && m->size2 == 1) {
     return Data_Wrap_Struct(CONCAT2(GSL_TYPE(cgsl_vector),col), 0, FUNCTION(gsl_vector,free), v);
   } else {
@@ -1994,7 +1984,7 @@ static VALUE FUNCTION(rb_gsl_matrix,norm)(VALUE obj)
 }
 
 static int FUNCTION(mygsl_matrix,reverse_columns)(GSL_TYPE(gsl_matrix) *dst,
-						   GSL_TYPE(gsl_matrix) *src)
+                                                  GSL_TYPE(gsl_matrix) *src)
 {
   size_t j;
   QUALIFIED_VIEW(gsl_vector,view) col;
@@ -2008,7 +1998,7 @@ static int FUNCTION(mygsl_matrix,reverse_columns)(GSL_TYPE(gsl_matrix) *dst,
 }
 
 static int FUNCTION(mygsl_matrix,reverse_rows)(GSL_TYPE(gsl_matrix) *dst,
-						   GSL_TYPE(gsl_matrix) *src)
+                                               GSL_TYPE(gsl_matrix) *src)
 {
   size_t i;
   QUALIFIED_VIEW(gsl_vector,view) row;
@@ -2112,14 +2102,14 @@ static VALUE FUNCTION(rb_gsl_matrix,all)(VALUE obj)
     vv = FUNCTION(gsl_matrix,column)(m, j);
     v = &vv.vector;
     /*    if (FUNCTION(gsl_vector,isnull(v))) gsl_vector_int_set(vnew, j, 0);
-	  else gsl_vector_int_set(vnew, j, 1);*/
+    else gsl_vector_int_set(vnew, j, 1);*/
     for (i = 0; i < v->size; i++) {
       if (FUNCTION(gsl_vector,get)(v, i) == (BASE) 0) {
-	gsl_vector_int_set(vnew, j, 0);
-	flag = 0;
-	break;
+        gsl_vector_int_set(vnew, j, 0);
+        flag = 0;
+        break;
       } else {
-	flag = 1;
+        flag = 1;
       }
     }
     if (flag == 1) gsl_vector_int_set(vnew, j, 1);
@@ -2181,7 +2171,7 @@ static VALUE FUNCTION(rb_gsl_matrix,rot90)(int argc, VALUE *argv, VALUE obj)
 }
 
 void FUNCTION(mygsl_vector,diff)(GSL_TYPE(gsl_vector) *vdst,
-				 GSL_TYPE(gsl_vector) *vsrc, size_t n);
+                                 GSL_TYPE(gsl_vector) *vsrc, size_t n);
 
 static VALUE FUNCTION(rb_gsl_matrix,diff)(int argc, VALUE *argv, VALUE obj)
 {
@@ -2254,7 +2244,6 @@ static VALUE FUNCTION(rb_gsl_matrix,sgn)(VALUE obj)
       FUNCTION(gsl_matrix,set)(mnew, i, j, (BASE)(x>0 ? 1 : (x<0 ? -1 : 0)));
     }
   }
-
   return Data_Wrap_Struct(GSL_TYPE(cgsl_matrix), 0, FUNCTION(gsl_matrix,free), mnew);
 }
 
@@ -2269,7 +2258,6 @@ static VALUE FUNCTION(rb_gsl_matrix,abs)(VALUE obj)
       FUNCTION(gsl_matrix,set)(mnew, i, j, (BASE) fabs(FUNCTION(gsl_matrix,get)(m, i, j)));
     }
   }
-
   return Data_Wrap_Struct(GSL_TYPE(cgsl_matrix), 0, FUNCTION(gsl_matrix,free), mnew);
 }
 
@@ -2281,9 +2269,9 @@ static VALUE FUNCTION(rb_gsl_matrix,horzcat)(VALUE obj, VALUE mm2)
   CHECK_MAT(mm2);
   Data_Get_Struct(obj, GSL_TYPE(gsl_matrix), m);
   Data_Get_Struct(mm2, GSL_TYPE(gsl_matrix), m2);
-  if (m->size1 != m2->size1) 
+  if (m->size1 != m2->size1)
     rb_raise(rb_eRuntimeError, "Different number of rows (%d and %d).",
-	     (int) m->size1, (int) m2->size1);
+             (int) m->size1, (int) m2->size1);
   mnew = FUNCTION(gsl_matrix,alloc)(m->size1, m->size2 + m2->size2);
   for (j = 0, k = 0; j < m->size2; j++, k++) {
     v = FUNCTION(gsl_matrix,column)(m, j);
@@ -2311,9 +2299,9 @@ static VALUE FUNCTION(rb_gsl_matrix,vertcat)(VALUE obj, VALUE mm2)
   CHECK_MAT(mm2);
   Data_Get_Struct(obj, GSL_TYPE(gsl_matrix), m);
   Data_Get_Struct(mm2, GSL_TYPE(gsl_matrix), m2);
-  if (m->size2 != m2->size2) 
+  if (m->size2 != m2->size2)
     rb_raise(rb_eRuntimeError, "Different number of columns (%d and %d).",
-	     (int) m->size2, (int) m2->size2);
+             (int) m->size2, (int) m2->size2);
   mnew = FUNCTION(gsl_matrix,alloc)(m->size1 + m2->size1, m->size2);
   for (i = 0, k = 0; i < m->size1; i++, k++) {
     v = FUNCTION(gsl_matrix,row)(m, i);
@@ -2332,17 +2320,16 @@ static VALUE FUNCTION(rb_gsl_matrix,vertcat_singleton)(VALUE klass, VALUE mm, VA
   return FUNCTION(rb_gsl_matrix,vertcat)(mm, mm2);
 }
 
-#ifdef GSL_1_9_LATER
 static VALUE FUNCTION(rb_gsl_matrix,property)(VALUE obj,
-  int (*f)(const GSL_TYPE(gsl_matrix)*)) {
+                                              int (*f)(const GSL_TYPE (gsl_matrix)*)) {
   GSL_TYPE(gsl_matrix) *m;
   Data_Get_Struct(obj, GSL_TYPE(gsl_matrix), m);
-  return INT2FIX((*f)(m));  
+  return INT2FIX((*f)(m));
 }
 
 static VALUE FUNCTION(rb_gsl_matrix,property2)(VALUE obj,
-  int (*f)(const GSL_TYPE(gsl_matrix) *)) {
-  GSL_TYPE(gsl_matrix) *m;  
+                                               int (*f)(const GSL_TYPE (gsl_matrix) *)) {
+  GSL_TYPE(gsl_matrix) *m;
   Data_Get_Struct(obj, GSL_TYPE(gsl_matrix), m);
   if ((*f)(m)) return Qtrue;
   else return Qfalse;
@@ -2353,28 +2340,25 @@ static VALUE FUNCTION(rb_gsl_matrix,ispos)(VALUE obj)
 }
 static VALUE FUNCTION(rb_gsl_matrix,ispos2)(VALUE obj)
 {
-  return FUNCTION(rb_gsl_matrix,property2)(obj, FUNCTION(gsl_matrix,ispos));  
+  return FUNCTION(rb_gsl_matrix,property2)(obj, FUNCTION(gsl_matrix,ispos));
 }
 static VALUE FUNCTION(rb_gsl_matrix,isneg)(VALUE obj)
 {
-  return FUNCTION(rb_gsl_matrix,property)(obj, FUNCTION(gsl_matrix,isneg));  
+  return FUNCTION(rb_gsl_matrix,property)(obj, FUNCTION(gsl_matrix,isneg));
 }
 static VALUE FUNCTION(rb_gsl_matrix,isneg2)(VALUE obj)
 {
-  return FUNCTION(rb_gsl_matrix,property2)(obj, FUNCTION(gsl_matrix,isneg));  
+  return FUNCTION(rb_gsl_matrix,property2)(obj, FUNCTION(gsl_matrix,isneg));
 }
-#endif
 
-#ifdef GSL_1_10_LATER
 static VALUE FUNCTION(rb_gsl_matrix,isnonneg)(VALUE obj)
 {
-  return FUNCTION(rb_gsl_matrix,property)(obj, FUNCTION(gsl_matrix,isnonneg));  
+  return FUNCTION(rb_gsl_matrix,property)(obj, FUNCTION(gsl_matrix,isnonneg));
 }
 static VALUE FUNCTION(rb_gsl_matrix,isnonneg2)(VALUE obj)
 {
-  return FUNCTION(rb_gsl_matrix,property2)(obj, FUNCTION(gsl_matrix,isnonneg));  
+  return FUNCTION(rb_gsl_matrix,property2)(obj, FUNCTION(gsl_matrix,isnonneg));
 }
-#endif
 
 static VALUE FUNCTION(rb_gsl_matrix,symmetrize)(VALUE obj)
 {
@@ -2419,26 +2403,26 @@ void FUNCTION(Init_gsl_matrix,init)(VALUE module)
   rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "eye", FUNCTION(rb_gsl_matrix,eye), -1);
   rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "ones", FUNCTION(rb_gsl_matrix,ones), -1);
   rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "zeros", FUNCTION(rb_gsl_matrix,zeros), -1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "diagonal", 
-			     FUNCTION(rb_gsl_matrix,diagonal_singleton), -1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "diag", 
-			     FUNCTION(rb_gsl_matrix,diagonal_singleton), -1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "identity", 
-			     FUNCTION(rb_gsl_matrix,identity), 1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "scalar", 
-			     FUNCTION(rb_gsl_matrix,identity), 1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "unit", 
-			     FUNCTION(rb_gsl_matrix,identity), 1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "I", 
-			     FUNCTION(rb_gsl_matrix,identity), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "diagonal",
+                             FUNCTION(rb_gsl_matrix,diagonal_singleton), -1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "diag",
+                             FUNCTION(rb_gsl_matrix,diagonal_singleton), -1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "identity",
+                             FUNCTION(rb_gsl_matrix,identity), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "scalar",
+                             FUNCTION(rb_gsl_matrix,identity), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "unit",
+                             FUNCTION(rb_gsl_matrix,identity), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "I",
+                             FUNCTION(rb_gsl_matrix,identity), 1);
 
   /*****/
-  rb_define_method(GSL_TYPE(cgsl_matrix), "size1", 
-		   FUNCTION(rb_gsl_matrix,size1), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "size2", 
-		   FUNCTION(rb_gsl_matrix,size2), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "shape", 
-		   FUNCTION(rb_gsl_matrix,shape), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "size1",
+                   FUNCTION(rb_gsl_matrix,size1), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "size2",
+                   FUNCTION(rb_gsl_matrix,size2), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "shape",
+                   FUNCTION(rb_gsl_matrix,shape), 0);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "size", "shape");
 
   rb_define_method(GSL_TYPE(cgsl_matrix), "get", FUNCTION(rb_gsl_matrix,get), -1);
@@ -2446,238 +2430,236 @@ void FUNCTION(Init_gsl_matrix,init)(VALUE module)
   rb_define_method(GSL_TYPE(cgsl_matrix), "set", FUNCTION(rb_gsl_matrix,set), -1);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "[]=", "set");
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "set_all", 
-		   FUNCTION(rb_gsl_matrix,set_all), 1);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "set_zero",  
-		   FUNCTION(rb_gsl_matrix,set_zero), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "set_identity",  
-		   FUNCTION(rb_gsl_matrix,set_identity), 0);
-
-  rb_define_method(GSL_TYPE(cgsl_matrix), "print", 
-		   FUNCTION(rb_gsl_matrix,print), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "inspect",  
-		   FUNCTION(rb_gsl_matrix,inspect), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "to_s", 
-		   FUNCTION(rb_gsl_matrix,to_s), 0);
-  
-  rb_define_method(GSL_TYPE(cgsl_matrix), "set_diagonal", 
-		   FUNCTION(rb_gsl_matrix,set_diagonal), 1);
-  
-  rb_define_method(GSL_TYPE(cgsl_matrix), "get_row", 
-		   FUNCTION(rb_gsl_matrix,get_row), 1);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "get_column", 
-		   FUNCTION(rb_gsl_matrix,get_col), 1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "set_all",
+                   FUNCTION(rb_gsl_matrix,set_all), 1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "set_zero",
+                   FUNCTION(rb_gsl_matrix,set_zero), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "set_identity",
+                   FUNCTION(rb_gsl_matrix,set_identity), 0);
+
+  rb_define_method(GSL_TYPE(cgsl_matrix), "print",
+                   FUNCTION(rb_gsl_matrix,print), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "inspect",
+                   FUNCTION(rb_gsl_matrix,inspect), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "to_s",
+                   FUNCTION(rb_gsl_matrix,to_s), 0);
+
+  rb_define_method(GSL_TYPE(cgsl_matrix), "set_diagonal",
+                   FUNCTION(rb_gsl_matrix,set_diagonal), 1);
+
+  rb_define_method(GSL_TYPE(cgsl_matrix), "get_row",
+                   FUNCTION(rb_gsl_matrix,get_row), 1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "get_column",
+                   FUNCTION(rb_gsl_matrix,get_col), 1);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "get_col", "get_column");
-  rb_define_method(GSL_TYPE(cgsl_matrix), "set_column", 
-		   FUNCTION(rb_gsl_matrix,set_col), 2);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "set_column",
+                   FUNCTION(rb_gsl_matrix,set_col), 2);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "set_col", "set_column");
-  rb_define_method(GSL_TYPE(cgsl_matrix), "set_row", 
-		   FUNCTION(rb_gsl_matrix,set_row), 2);
-  
-  rb_define_method(GSL_TYPE(cgsl_matrix), "clone", 
-		   FUNCTION(rb_gsl_matrix,clone), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "set_row",
+                   FUNCTION(rb_gsl_matrix,set_row), 2);
+
+  rb_define_method(GSL_TYPE(cgsl_matrix), "clone",
+                   FUNCTION(rb_gsl_matrix,clone), 0);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "duplicate", "clone");
   rb_define_alias(GSL_TYPE(cgsl_matrix), "dup", "clone");
-  rb_define_method(GSL_TYPE(cgsl_matrix), "isnull", 
-		   FUNCTION(rb_gsl_matrix,isnull), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "isnull?", 
-		   FUNCTION(rb_gsl_matrix,isnull2), 0);
-  
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "memcpy", 
-			     FUNCTION(rb_gsl_matrix,memcpy), 2);
-  
-  rb_define_method(GSL_TYPE(cgsl_matrix), "swap_rows", 
-		   FUNCTION(rb_gsl_matrix,swap_rows), 2);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "isnull",
+                   FUNCTION(rb_gsl_matrix,isnull), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "isnull?",
+                   FUNCTION(rb_gsl_matrix,isnull2), 0);
+
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "memcpy",
+                             FUNCTION(rb_gsl_matrix,memcpy), 2);
+
+  rb_define_method(GSL_TYPE(cgsl_matrix), "swap_rows",
+                   FUNCTION(rb_gsl_matrix,swap_rows), 2);
   rb_define_method(GSL_TYPE(cgsl_matrix), "swap_rows!",
-		   FUNCTION(rb_gsl_matrix,swap_rows_bang), 2);
+                   FUNCTION(rb_gsl_matrix,swap_rows_bang), 2);
   rb_define_method(GSL_TYPE(cgsl_matrix), "swap_columns",
-		   FUNCTION(rb_gsl_matrix,swap_columns), 2);
+                   FUNCTION(rb_gsl_matrix,swap_columns), 2);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "swap_cols", "swap_columns");
   rb_define_method(GSL_TYPE(cgsl_matrix), "swap_columns!",
-		   FUNCTION(rb_gsl_matrix,swap_columns_bang), 2);
+                   FUNCTION(rb_gsl_matrix,swap_columns_bang), 2);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "swap_cols!", "swap_columns!");
-  rb_define_method(GSL_TYPE(cgsl_matrix), "swap_rowcol", 
-		   FUNCTION(rb_gsl_matrix,swap_rowcol), 2);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "swap_rowcol!", 
-		   FUNCTION(rb_gsl_matrix,swap_rowcol_bang), 2);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "swap_rowcol",
+                   FUNCTION(rb_gsl_matrix,swap_rowcol), 2);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "swap_rowcol!",
+                   FUNCTION(rb_gsl_matrix,swap_rowcol_bang), 2);
   rb_define_method(GSL_TYPE(cgsl_matrix), "transpose_memcpy",
-		   FUNCTION(rb_gsl_matrix,transpose_memcpy), 0);
+                   FUNCTION(rb_gsl_matrix,transpose_memcpy), 0);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "transpose", "transpose_memcpy");
   rb_define_alias(GSL_TYPE(cgsl_matrix), "trans", "transpose_memcpy");
-  rb_define_method(GSL_TYPE(cgsl_matrix), "transpose!", 
-		   FUNCTION(rb_gsl_matrix,transpose_bang), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "transpose!",
+                   FUNCTION(rb_gsl_matrix,transpose_bang), 0);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "trans!", "transpose!");
-  rb_define_method(GSL_TYPE(cgsl_matrix), "reverse_columns", 
-		   FUNCTION(rb_gsl_matrix,reverse_columns), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "reverse_columns",
+                   FUNCTION(rb_gsl_matrix,reverse_columns), 0);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "fliplr", "reverse_columns");
-  rb_define_method(GSL_TYPE(cgsl_matrix), "reverse_columns!", 
-		   FUNCTION(rb_gsl_matrix,reverse_columns_bang), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "reverse_rows", 
-		   FUNCTION(rb_gsl_matrix,reverse_rows), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "reverse_columns!",
+                   FUNCTION(rb_gsl_matrix,reverse_columns_bang), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "reverse_rows",
+                   FUNCTION(rb_gsl_matrix,reverse_rows), 0);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "flipud", "reverse_rows");
-  rb_define_method(GSL_TYPE(cgsl_matrix), "reverse_rows!", 
-		   FUNCTION(rb_gsl_matrix,reverse_rows_bang), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "reverse_rows!",
+                   FUNCTION(rb_gsl_matrix,reverse_rows_bang), 0);
   /*****/
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "swap", 
-			     FUNCTION(rb_gsl_matrix,swap), 2);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "swap",
+                             FUNCTION(rb_gsl_matrix,swap), 2);
 
   rb_define_method(GSL_TYPE(cgsl_matrix), "max", FUNCTION(rb_gsl_matrix,max), 0);
   rb_define_method(GSL_TYPE(cgsl_matrix), "min", FUNCTION(rb_gsl_matrix,min), 0);
   rb_define_method(GSL_TYPE(cgsl_matrix), "minmax",
-		   FUNCTION(rb_gsl_matrix,minmax), 0);
+                   FUNCTION(rb_gsl_matrix,minmax), 0);
   rb_define_method(GSL_TYPE(cgsl_matrix), "max_index",
-		   FUNCTION(rb_gsl_matrix,max_index), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "min_index", 
-		   FUNCTION(rb_gsl_matrix,min_index), 0);
+                   FUNCTION(rb_gsl_matrix,max_index), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "min_index",
+                   FUNCTION(rb_gsl_matrix,min_index), 0);
   rb_define_method(GSL_TYPE(cgsl_matrix), "minmax_index",
-		   FUNCTION(rb_gsl_matrix,minmax_index), 0);
+                   FUNCTION(rb_gsl_matrix,minmax_index), 0);
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "fwrite", 
-		   FUNCTION(rb_gsl_matrix,fwrite), 1);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "fread", 
-		   FUNCTION(rb_gsl_matrix,fread), 1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "fwrite",
+                   FUNCTION(rb_gsl_matrix,fwrite), 1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "fread",
+                   FUNCTION(rb_gsl_matrix,fread), 1);
   rb_define_method(GSL_TYPE(cgsl_matrix), "fprintf",
-		   FUNCTION(rb_gsl_matrix,fprintf), -1);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "printf", 
-		   FUNCTION(rb_gsl_matrix,printf), -1);
+                   FUNCTION(rb_gsl_matrix,fprintf), -1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "printf",
+                   FUNCTION(rb_gsl_matrix,printf), -1);
   rb_define_method(GSL_TYPE(cgsl_matrix), "fscanf",
-		   FUNCTION(rb_gsl_matrix,fscanf), 1);
+                   FUNCTION(rb_gsl_matrix,fscanf), 1);
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "trace", 
-		   FUNCTION(rb_gsl_matrix,trace), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "trace",
+                   FUNCTION(rb_gsl_matrix,trace), 0);
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "-@",  
-		   FUNCTION(rb_gsl_matrix,uminus), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "+@",  
-		   FUNCTION(rb_gsl_matrix,uplus), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "-@",
+                   FUNCTION(rb_gsl_matrix,uminus), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "+@",
+                   FUNCTION(rb_gsl_matrix,uplus), 0);
 
 
 /*****/
-  rb_define_method(GSL_TYPE(cgsl_matrix), "submatrix", 
-		   FUNCTION(rb_gsl_matrix,submatrix), -1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "submatrix",
+                   FUNCTION(rb_gsl_matrix,submatrix), -1);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "view", "submatrix");
 
   rb_define_method(GSL_TYPE(cgsl_matrix), "row", FUNCTION(rb_gsl_matrix,row), 1);
   /*  rb_define_alias(GSL_TYPE(cgsl_matrix), "[]", "row");*/
-  rb_define_method(GSL_TYPE(cgsl_matrix), "column", 
-		   FUNCTION(rb_gsl_matrix,column), 1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "column",
+                   FUNCTION(rb_gsl_matrix,column), 1);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "col", "column");
 
-#ifdef GSL_1_10_LATER
- rb_define_method(GSL_TYPE(cgsl_matrix), "subrow", 
-		   FUNCTION(rb_gsl_matrix,subrow), 3);
- rb_define_method(GSL_TYPE(cgsl_matrix), "subcolumn", 
-		   FUNCTION(rb_gsl_matrix,subcolumn), 3);
-  rb_define_alias(GSL_TYPE(cgsl_matrix), "subcol", "subcolumn");		   
-#endif
+  rb_define_method(GSL_TYPE(cgsl_matrix), "subrow",
+                   FUNCTION(rb_gsl_matrix,subrow), 3);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "subcolumn",
+                   FUNCTION(rb_gsl_matrix,subcolumn), 3);
+  rb_define_alias(GSL_TYPE(cgsl_matrix), "subcol", "subcolumn");
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "diagonal", 
-		   FUNCTION(rb_gsl_matrix,diagonal), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "diagonal",
+                   FUNCTION(rb_gsl_matrix,diagonal), 0);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "diag", "diagonal");
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "subdiagonal", 
-		   FUNCTION(rb_gsl_matrix,subdiagonal), 1);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "superdiagonal", 
-		   FUNCTION(rb_gsl_matrix,superdiagonal), 1);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "vector_view", 
-		   FUNCTION(rb_gsl_matrix,vector_view), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "subdiagonal",
+                   FUNCTION(rb_gsl_matrix,subdiagonal), 1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "superdiagonal",
+                   FUNCTION(rb_gsl_matrix,superdiagonal), 1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "vector_view",
+                   FUNCTION(rb_gsl_matrix,vector_view), 0);
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "each_row", 
-		   FUNCTION(rb_gsl_matrix,each_row), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "each_row",
+                   FUNCTION(rb_gsl_matrix,each_row), 0);
   rb_define_method(GSL_TYPE(cgsl_matrix), "each_col",
-		   FUNCTION(rb_gsl_matrix,each_col), 0);
+                   FUNCTION(rb_gsl_matrix,each_col), 0);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "each_column", "each_col");
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "scale", 
-		   FUNCTION(rb_gsl_matrix,scale), 1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "scale",
+                   FUNCTION(rb_gsl_matrix,scale), 1);
   rb_define_method(GSL_TYPE(cgsl_matrix), "scale!",
-		   FUNCTION(rb_gsl_matrix,scale_bang), 1);
+                   FUNCTION(rb_gsl_matrix,scale_bang), 1);
   rb_define_method(GSL_TYPE(cgsl_matrix), "add_constant",
-		   FUNCTION(rb_gsl_matrix,add_constant), 1);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "add_constant!", 
-		   FUNCTION(rb_gsl_matrix,add_constant_bang), 1);
+                   FUNCTION(rb_gsl_matrix,add_constant), 1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "add_constant!",
+                   FUNCTION(rb_gsl_matrix,add_constant_bang), 1);
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "equal?", 
-		   FUNCTION(rb_gsl_matrix,equal), -1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "equal?",
+                   FUNCTION(rb_gsl_matrix,equal), -1);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "==", "equal?");
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "equal?", 
-			     FUNCTION(rb_gsl_matrix,equal_singleton), -1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "equal?",
+                             FUNCTION(rb_gsl_matrix,equal_singleton), -1);
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "power", 
-		   FUNCTION(rb_gsl_matrix,power), 1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "power",
+                   FUNCTION(rb_gsl_matrix,power), 1);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "**", "power");
   rb_define_alias(GSL_TYPE(cgsl_matrix), "^", "power");
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "collect", 
-		   FUNCTION(rb_gsl_matrix,collect), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "collect!", 
-		   FUNCTION(rb_gsl_matrix,collect_bang), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "collect",
+                   FUNCTION(rb_gsl_matrix,collect), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "collect!",
+                   FUNCTION(rb_gsl_matrix,collect_bang), 0);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "map", "collect");
   rb_define_alias(GSL_TYPE(cgsl_matrix), "map!", "collect!");
 #ifdef HAVE_TENSOR_TENSOR_H
-  rb_define_method(GSL_TYPE(cgsl_matrix), "to_tensor", 
-		   FUNCTION(rb_gsl_matrix,to_tensor), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "to_tensor",
+                   FUNCTION(rb_gsl_matrix,to_tensor), 0);
 #endif
 
   /*****/
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "to_a", 
-		   FUNCTION(rb_gsl_matrix,to_a), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "to_v", 
-		   FUNCTION(rb_gsl_matrix,to_v), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "to_vview", 
-		   FUNCTION(rb_gsl_matrix,to_vview), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "to_a",
+                   FUNCTION(rb_gsl_matrix,to_a), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "to_v",
+                   FUNCTION(rb_gsl_matrix,to_v), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "to_vview",
+                   FUNCTION(rb_gsl_matrix,to_vview), 0);
   rb_define_alias(GSL_TYPE(cgsl_matrix), "data", "to_vview");
   rb_define_method(GSL_TYPE(cgsl_matrix), "norm",
-		   FUNCTION(rb_gsl_matrix,norm), 0);
+                   FUNCTION(rb_gsl_matrix,norm), 0);
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "upper", 
-		   FUNCTION(rb_gsl_matrix,upper), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "lower", 
-		   FUNCTION(rb_gsl_matrix,lower), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "block", 
-		   FUNCTION(rb_gsl_matrix,block), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "upper",
+                   FUNCTION(rb_gsl_matrix,upper), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "lower",
+                   FUNCTION(rb_gsl_matrix,lower), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "block",
+                   FUNCTION(rb_gsl_matrix,block), 0);
 
   /***** Special matrices *****/
   rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "pascal",
-			     FUNCTION(rb_gsl_matrix,pascal1), 1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "vandermonde", 
-			     FUNCTION(rb_gsl_matrix,vandermonde), 1);
+                             FUNCTION(rb_gsl_matrix,pascal1), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "vandermonde",
+                             FUNCTION(rb_gsl_matrix,vandermonde), 1);
   rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "vander",
-			     FUNCTION(rb_gsl_matrix,vandermonde), 1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "toeplitz", 
-			     FUNCTION(rb_gsl_matrix,toeplitz), 1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "circulant", 
-			     FUNCTION(rb_gsl_matrix,circulant), 1);
+                             FUNCTION(rb_gsl_matrix,vandermonde), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "toeplitz",
+                             FUNCTION(rb_gsl_matrix,toeplitz), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "circulant",
+                             FUNCTION(rb_gsl_matrix,circulant), 1);
   rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "indgen",
-			     FUNCTION(rb_gsl_matrix,indgen_singleton), -1);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "indgen", 
-		   FUNCTION(rb_gsl_matrix,indgen), -1);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "indgen!", 
-		   FUNCTION(rb_gsl_matrix,indgen_bang), -1);
-
-  rb_define_method(GSL_TYPE(cgsl_matrix), "info", 
-		   FUNCTION(rb_gsl_matrix,info), 0);
+                             FUNCTION(rb_gsl_matrix,indgen_singleton), -1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "indgen",
+                   FUNCTION(rb_gsl_matrix,indgen), -1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "indgen!",
+                   FUNCTION(rb_gsl_matrix,indgen_bang), -1);
+
+  rb_define_method(GSL_TYPE(cgsl_matrix), "info",
+                   FUNCTION(rb_gsl_matrix,info), 0);
 #ifdef BASE_DOUBLE
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "hilbert", 
-			     FUNCTION(rb_gsl_matrix,hilbert), 1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "hilb", 
-			     FUNCTION(rb_gsl_matrix,hilbert), 1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "invhilbert", 
-			     FUNCTION(rb_gsl_matrix,invhilbert), 1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "invhilb", 
-			     FUNCTION(rb_gsl_matrix,invhilbert), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "hilbert",
+                             FUNCTION(rb_gsl_matrix,hilbert), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "hilb",
+                             FUNCTION(rb_gsl_matrix,hilbert), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "invhilbert",
+                             FUNCTION(rb_gsl_matrix,invhilbert), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "invhilb",
+                             FUNCTION(rb_gsl_matrix,invhilbert), 1);
 #endif
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "any", 
-		   FUNCTION(rb_gsl_matrix,any), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "all", 
-		   FUNCTION(rb_gsl_matrix,all), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "rot90", 
-		   FUNCTION(rb_gsl_matrix,rot90), -1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "any",
+                   FUNCTION(rb_gsl_matrix,any), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "all",
+                   FUNCTION(rb_gsl_matrix,all), 0);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "rot90",
+                   FUNCTION(rb_gsl_matrix,rot90), -1);
 
-  rb_define_method(GSL_TYPE(cgsl_matrix), "diff", 
-		   FUNCTION(rb_gsl_matrix,diff), -1);
+  rb_define_method(GSL_TYPE(cgsl_matrix), "diff",
+                   FUNCTION(rb_gsl_matrix,diff), -1);
   rb_define_method(GSL_TYPE(cgsl_matrix), "isnan", FUNCTION(rb_gsl_matrix,isnan), 0);
   rb_define_method(GSL_TYPE(cgsl_matrix), "isinf", FUNCTION(rb_gsl_matrix,isinf), 0);
   rb_define_method(GSL_TYPE(cgsl_matrix), "finite", FUNCTION(rb_gsl_matrix,finite), 0);
@@ -2694,17 +2676,13 @@ void FUNCTION(Init_gsl_matrix,init)(VALUE module)
   rb_define_method(GSL_TYPE(cgsl_matrix), "vertcat", FUNCTION(rb_gsl_matrix,vertcat), 1);
   rb_define_singleton_method(GSL_TYPE(cgsl_matrix), "vertcat", FUNCTION(rb_gsl_matrix,vertcat_singleton), 2);
 
-#ifdef GSL_1_9_LATER
   rb_define_method(GSL_TYPE(cgsl_matrix), "ispos", FUNCTION(rb_gsl_matrix,ispos), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "ispos?", FUNCTION(rb_gsl_matrix,ispos2), 0); 
+  rb_define_method(GSL_TYPE(cgsl_matrix), "ispos?", FUNCTION(rb_gsl_matrix,ispos2), 0);
   rb_define_method(GSL_TYPE(cgsl_matrix), "isneg", FUNCTION(rb_gsl_matrix,isneg), 0);
-  rb_define_method(GSL_TYPE(cgsl_matrix), "isneg?", FUNCTION(rb_gsl_matrix,isneg2), 0);    
-#endif
+  rb_define_method(GSL_TYPE(cgsl_matrix), "isneg?", FUNCTION(rb_gsl_matrix,isneg2), 0);
 
-#ifdef GSL_1_10_LATER
   rb_define_method(GSL_TYPE(cgsl_matrix), "isnonneg", FUNCTION(rb_gsl_matrix,isnonneg), 0);
   rb_define_method(GSL_TYPE(cgsl_matrix), "isnonneg?", FUNCTION(rb_gsl_matrix,isnonneg2), 0);
-#endif
 
   rb_define_method(GSL_TYPE(cgsl_matrix), "symmetrize", FUNCTION(rb_gsl_matrix,symmetrize), 0);
   rb_define_method(GSL_TYPE(cgsl_matrix), "symmetrize!", FUNCTION(rb_gsl_matrix,symmetrize_bang), 0);