gsl 1.15.3 → 1.16.0.6

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

@@ -9,11 +9,11 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl.h"
-#include "rb_gsl_array.h"
+#include "include/rb_gsl.h"
+#include "include/rb_gsl_array.h"
 
-#include "rb_gsl_eigen.h"
-#include "rb_gsl_complex.h"
+#include "include/rb_gsl_eigen.h"
+#include "include/rb_gsl_complex.h"
 #include <gsl/gsl_complex.h>
 #include <gsl/gsl_complex_math.h>
 #include <gsl/gsl_math.h>
@@ -29,16 +29,13 @@ static VALUE cgsl_eigen_vector;
 static VALUE cgsl_eigen_vector_complex;
 static VALUE cgsl_eigen_herm_vectors;
 
-#ifdef HAVE_EIGEN_FRANCIS
+#ifdef HAVE_GSL_EIGEN_FRANCIS
 static VALUE cgsl_eigen_francis_workspace;
 
 #endif
-#ifdef GSL_1_9_LATER
 static VALUE cgsl_eigen_nonsymm_workspace;
 static VALUE cgsl_eigen_nonsymmv_workspace;
-#endif
 
-#ifdef GSL_1_10_LATER
 static VALUE cgensymm, mgensymm;
 static VALUE cgensymmv, mgensymmv;
 static VALUE cgenherm, mgenherm;
@@ -46,15 +43,14 @@ static VALUE cgenhermv, mgenhermv;
 
 static VALUE mgen, mgenv;
 static VALUE cgenw, cgenvw;
-#endif
 
 static VALUE rb_gsl_eigen_symm_alloc(VALUE klass, VALUE nn)
 {
   gsl_eigen_symm_workspace *w = NULL;
   CHECK_FIXNUM(nn);
   w = gsl_eigen_symm_alloc(FIX2INT(nn));
-  return Data_Wrap_Struct(cgsl_eigen_symm_workspace, 0, 
-			  gsl_eigen_symm_free, w);
+  return Data_Wrap_Struct(cgsl_eigen_symm_workspace, 0,
+                          gsl_eigen_symm_free, w);
 }
 
 static VALUE rb_gsl_eigen_symmv_alloc(VALUE klass, VALUE nn)
@@ -70,8 +66,8 @@ static VALUE rb_gsl_eigen_herm_alloc(VALUE klass, VALUE nn)
   gsl_eigen_herm_workspace *w = NULL;
   CHECK_FIXNUM(nn);
   w = gsl_eigen_herm_alloc(FIX2INT(nn));
-  return Data_Wrap_Struct(cgsl_eigen_herm_workspace, 0, 
-			  gsl_eigen_herm_free, w);
+  return Data_Wrap_Struct(cgsl_eigen_herm_workspace, 0,
+                          gsl_eigen_herm_free, w);
 }
 
 static VALUE rb_gsl_eigen_hermv_alloc(VALUE klass, VALUE nn)
@@ -79,12 +75,64 @@ static VALUE rb_gsl_eigen_hermv_alloc(VALUE klass, VALUE nn)
   gsl_eigen_hermv_workspace *w = NULL;
   CHECK_FIXNUM(nn);
   w = gsl_eigen_hermv_alloc(FIX2INT(nn));
-  return Data_Wrap_Struct(cgsl_eigen_hermv_workspace, 0, 
-			  gsl_eigen_hermv_free, w);
+  return Data_Wrap_Struct(cgsl_eigen_hermv_workspace, 0,
+                          gsl_eigen_hermv_free, w);
 }
 
 #ifdef HAVE_NARRAY_H
-static VALUE rb_gsl_eigen_symm_narray(int argc, VALUE *argv, VALUE obj);
+static VALUE rb_gsl_eigen_symm_narray(int argc, VALUE *argv, VALUE obj)
+{
+  struct NARRAY *na;
+  VALUE nary;
+  gsl_matrix *A = NULL;
+  gsl_eigen_symm_workspace *w = NULL;
+  gsl_vector_view vv;
+  int shape[1];
+  int flagw = 0;
+  switch (argc) {
+  case 2:
+    if (!NA_IsNArray(argv[0]))
+      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)",
+               rb_class2name(CLASS_OF(argv[0])));
+    GetNArray(argv[0], na);
+    if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
+    if (na->shape[0] != na->shape[1])
+      rb_raise(rb_eRuntimeError, "square matrix required");
+    A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
+    memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
+    if (CLASS_OF(argv[1]) != cgsl_eigen_symm_workspace)
+      rb_raise(rb_eTypeError,
+               "argv[1]:  wrong argument type %s (Eigen::Symm::Workspace expected",
+               rb_class2name(CLASS_OF(argv[1])));
+    Data_Get_Struct(argv[1], gsl_eigen_symm_workspace, w);
+    flagw = 0;
+    break;
+  case 1:
+    if (!NA_IsNArray(argv[0]))
+      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)",
+               rb_class2name(CLASS_OF(argv[0])));
+    GetNArray(argv[0], na);
+    if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
+    if (na->shape[0] != na->shape[1])
+      rb_raise(rb_eRuntimeError, "square matrix required");
+    A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
+    memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
+    w = gsl_eigen_symm_alloc(A->size1);
+    flagw = 1;
+    break;
+  default:
+    rb_raise(rb_eArgError, "matrix not given");
+    break;
+  }
+  shape[0] = A->size1;
+  nary = na_make_object(NA_DFLOAT, 1, shape, cNVector);
+  vv = gsl_vector_view_array(NA_PTR_TYPE(nary,double*), A->size1);
+  gsl_eigen_symm(A, &vv.vector, w);
+  /*  gsl_sort_vector(v);*/
+  gsl_matrix_free(A);
+  if (flagw == 1) gsl_eigen_symm_free(w);
+  return nary;
+}
 #endif
 
 static VALUE rb_gsl_eigen_symm(int argc, VALUE *argv, VALUE obj)
@@ -100,19 +148,19 @@ static VALUE rb_gsl_eigen_symm(int argc, VALUE *argv, VALUE obj)
     switch (argc) {
     case 2:
 #ifdef HAVE_NARRAY_H
-    if (NA_IsNArray(argv[0])) return rb_gsl_eigen_symm_narray(argc, argv, obj);
+      if (NA_IsNArray(argv[0])) return rb_gsl_eigen_symm_narray(argc, argv, obj);
 #endif
       CHECK_MATRIX(argv[0]);
       Data_Get_Struct(argv[0], gsl_matrix, Atmp);
       if (CLASS_OF(argv[1]) != cgsl_eigen_symm_workspace)
-	rb_raise(rb_eTypeError,
-		 "argv[1]: wrong argument type %s (Eigen::Symm::Workspace expected)", 
-		 rb_class2name(CLASS_OF(argv[1])));
+        rb_raise(rb_eTypeError,
+                 "argv[1]: wrong argument type %s (Eigen::Symm::Workspace expected)",
+                 rb_class2name(CLASS_OF(argv[1])));
       Data_Get_Struct(argv[1], gsl_eigen_symm_workspace, w);
       break;
     case 1:
 #ifdef HAVE_NARRAY_H
-    if (NA_IsNArray(argv[0])) return rb_gsl_eigen_symm_narray(argc, argv, obj);
+      if (NA_IsNArray(argv[0])) return rb_gsl_eigen_symm_narray(argc, argv, obj);
 #endif
       CHECK_MATRIX(argv[0]);
       Data_Get_Struct(argv[0], gsl_matrix, Atmp);
@@ -130,10 +178,9 @@ static VALUE rb_gsl_eigen_symm(int argc, VALUE *argv, VALUE obj)
     switch (argc) {
     case 1:
       if (CLASS_OF(argv[0]) != cgsl_eigen_symm_workspace)
-	rb_raise(rb_eTypeError, 
-		 "argv[0]:  wrong argument type %s (Eigen::Symm::Workspace expected", 
-		 rb_class2name(CLASS_OF(argv[0])));
-
+        rb_raise(rb_eTypeError,
+                 "argv[0]:  wrong argument type %s (Eigen::Symm::Workspace expected",
+                 rb_class2name(CLASS_OF(argv[0])));
       Data_Get_Struct(argv[0], gsl_eigen_symm_workspace, w);
       break;
     case 0:
@@ -154,65 +201,66 @@ static VALUE rb_gsl_eigen_symm(int argc, VALUE *argv, VALUE obj)
 }
 
 #ifdef HAVE_NARRAY_H
-static VALUE rb_gsl_eigen_symm_narray(int argc, VALUE *argv, VALUE obj)
+static VALUE rb_gsl_eigen_symmv_narray(int argc, VALUE *argv, VALUE obj)
 {
   struct NARRAY *na;
-  VALUE nary;
+  VALUE eval, evec;
   gsl_matrix *A = NULL;
-  gsl_eigen_symm_workspace *w = NULL;
+  gsl_eigen_symmv_workspace *w = NULL;
+  gsl_matrix_view mv;
   gsl_vector_view vv;
-  int shape[1];
+  int shape1[1], shape2[2];
   int flagw = 0;
   switch (argc) {
   case 2:
-    if (!NA_IsNArray(argv[0])) 
-      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)", 
-	       rb_class2name(CLASS_OF(argv[0])));
+    if (!NA_IsNArray(argv[0]))
+      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)",
+               rb_class2name(CLASS_OF(argv[0])));
     GetNArray(argv[0], na);
     if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
     if (na->shape[0] != na->shape[1])
       rb_raise(rb_eRuntimeError, "square matrix required");
     A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
     memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
-    if (CLASS_OF(argv[1]) != cgsl_eigen_symm_workspace)
-      rb_raise(rb_eTypeError, 
-	       "argv[1]:  wrong argument type %s (Eigen::Symm::Workspace expected", 
-	       rb_class2name(CLASS_OF(argv[1])));
-    Data_Get_Struct(argv[1], gsl_eigen_symm_workspace, w);
+    if (CLASS_OF(argv[1]) != cgsl_eigen_symmv_workspace)
+      rb_raise(rb_eTypeError,
+               "argv[1]:  wrong argument type %s (Eigen::Symm::Workspace expected",
+               rb_class2name(CLASS_OF(argv[1])));
+    Data_Get_Struct(argv[1], gsl_eigen_symmv_workspace, w);
     flagw = 0;
     break;
   case 1:
-    if (!NA_IsNArray(argv[0])) 
-      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)", 
-	       rb_class2name(CLASS_OF(argv[0])));
+    if (!NA_IsNArray(argv[0]))
+      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)",
+               rb_class2name(CLASS_OF(argv[0])));
     GetNArray(argv[0], na);
     if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
     if (na->shape[0] != na->shape[1])
       rb_raise(rb_eRuntimeError, "square matrix required");
     A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
     memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
-    w = gsl_eigen_symm_alloc(A->size1);
+    w = gsl_eigen_symmv_alloc(A->size1);
     flagw = 1;
     break;
   default:
     rb_raise(rb_eArgError, "matrix not given");
     break;
   }
-  shape[0] = A->size1;
-  nary = na_make_object(NA_DFLOAT, 1, shape, cNVector);
-  vv = gsl_vector_view_array(NA_PTR_TYPE(nary,double*), A->size1);
-  gsl_eigen_symm(A, &vv.vector, w);
+  shape1[0] = A->size1;
+  shape2[0] = A->size1;
+  shape2[1] = A->size1;
+  eval = na_make_object(NA_DFLOAT, 1, shape1, cNVector);
+  evec = na_make_object(NA_DFLOAT, 2, shape2, CLASS_OF(argv[0]));
+  vv = gsl_vector_view_array(NA_PTR_TYPE(eval,double*), A->size1);
+  mv = gsl_matrix_view_array(NA_PTR_TYPE(evec,double*), A->size1, A->size2);
+  gsl_eigen_symmv(A, &vv.vector, &mv.matrix, w);
   /*  gsl_sort_vector(v);*/
   gsl_matrix_free(A);
-  if (flagw == 1) gsl_eigen_symm_free(w);
-  return nary;
+  if (flagw == 1) gsl_eigen_symmv_free(w);
+  return rb_ary_new3(2, eval, evec);
 }
 #endif
 
-#ifdef HAVE_NARRAY_H
-static VALUE rb_gsl_eigen_symmv_narray(int argc, VALUE *argv, VALUE obj);
-#endif
-
 static VALUE rb_gsl_eigen_symmv(int argc, VALUE *argv, VALUE obj)
 {
   gsl_matrix *Atmp = NULL, *A = NULL, *em = NULL;
@@ -227,19 +275,19 @@ static VALUE rb_gsl_eigen_symmv(int argc, VALUE *argv, VALUE obj)
     switch (argc) {
     case 2:
 #ifdef HAVE_NARRAY_H
-    if (NA_IsNArray(argv[0])) return rb_gsl_eigen_symmv_narray(argc, argv, obj);
+      if (NA_IsNArray(argv[0])) return rb_gsl_eigen_symmv_narray(argc, argv, obj);
 #endif
       CHECK_MATRIX(argv[0]);
       Data_Get_Struct(argv[0], gsl_matrix, Atmp);
       if (CLASS_OF(argv[1]) != cgsl_eigen_symmv_workspace)
-	rb_raise(rb_eTypeError, 
-		 "argv[1]: wrong argument type %s (Eigen::Symmv::Workspace expected)",
-		 rb_class2name(CLASS_OF(argv[1])));
+        rb_raise(rb_eTypeError,
+                 "argv[1]: wrong argument type %s (Eigen::Symmv::Workspace expected)",
+                 rb_class2name(CLASS_OF(argv[1])));
       Data_Get_Struct(argv[1], gsl_eigen_symmv_workspace, w);
       break;
     case 1:
 #ifdef HAVE_NARRAY_H
-    if (NA_IsNArray(argv[0])) return rb_gsl_eigen_symmv_narray(argc, argv, obj);
+      if (NA_IsNArray(argv[0])) return rb_gsl_eigen_symmv_narray(argc, argv, obj);
 #endif
       CHECK_MATRIX(argv[0]);
       Data_Get_Struct(argv[0], gsl_matrix, Atmp);
@@ -256,10 +304,9 @@ static VALUE rb_gsl_eigen_symmv(int argc, VALUE *argv, VALUE obj)
     switch (argc) {
     case 1:
       if (CLASS_OF(argv[0]) != cgsl_eigen_symmv_workspace)
-	rb_raise(rb_eTypeError, 
-		 "argv[0]: wrong argument type %s (Eigen::Symmv::Workspace expected)", 
-		 rb_class2name(CLASS_OF(argv[0])));
-
+        rb_raise(rb_eTypeError,
+                 "argv[0]: wrong argument type %s (Eigen::Symmv::Workspace expected)",
+                 rb_class2name(CLASS_OF(argv[0])));
       Data_Get_Struct(argv[0], gsl_eigen_symmv_workspace, w);
       break;
     case 0:
@@ -283,67 +330,6 @@ static VALUE rb_gsl_eigen_symmv(int argc, VALUE *argv, VALUE obj)
   return rb_ary_new3(2, vval, vvec);
 }
 
-#ifdef HAVE_NARRAY_H
-static VALUE rb_gsl_eigen_symmv_narray(int argc, VALUE *argv, VALUE obj)
-{
-  struct NARRAY *na;
-  VALUE eval, evec;
-  gsl_matrix *A = NULL;
-  gsl_eigen_symmv_workspace *w = NULL;
-  gsl_matrix_view mv;
-  gsl_vector_view vv;
-  int shape1[1], shape2[2];
-  int flagw = 0;
-  switch (argc) {
-  case 2:
-    if (!NA_IsNArray(argv[0])) 
-      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)", 
-	       rb_class2name(CLASS_OF(argv[0])));
-    GetNArray(argv[0], na);
-    if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
-    if (na->shape[0] != na->shape[1])
-      rb_raise(rb_eRuntimeError, "square matrix required");
-    A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
-    memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
-    if (CLASS_OF(argv[1]) != cgsl_eigen_symmv_workspace)
-      rb_raise(rb_eTypeError, 
-	       "argv[1]:  wrong argument type %s (Eigen::Symm::Workspace expected", 
-	       rb_class2name(CLASS_OF(argv[1])));
-    Data_Get_Struct(argv[1], gsl_eigen_symmv_workspace, w);
-    flagw = 0;
-    break;
-  case 1:
-    if (!NA_IsNArray(argv[0])) 
-      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)", 
-	       rb_class2name(CLASS_OF(argv[0])));
-    GetNArray(argv[0], na);
-    if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
-    if (na->shape[0] != na->shape[1])
-      rb_raise(rb_eRuntimeError, "square matrix required");
-    A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
-    memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
-    w = gsl_eigen_symmv_alloc(A->size1);
-    flagw = 1;
-    break;
-  default:
-    rb_raise(rb_eArgError, "matrix not given");
-    break;
-  }
-  shape1[0] = A->size1;
-  shape2[0] = A->size1;
-  shape2[1] = A->size1;
-  eval = na_make_object(NA_DFLOAT, 1, shape1, cNVector);
-  evec = na_make_object(NA_DFLOAT, 2, shape2, CLASS_OF(argv[0]));
-  vv = gsl_vector_view_array(NA_PTR_TYPE(eval,double*), A->size1);
-  mv = gsl_matrix_view_array(NA_PTR_TYPE(evec,double*), A->size1, A->size2);
-  gsl_eigen_symmv(A, &vv.vector, &mv.matrix, w);
-  /*  gsl_sort_vector(v);*/
-  gsl_matrix_free(A);
-  if (flagw == 1) gsl_eigen_symmv_free(w);
-  return rb_ary_new3(2, eval, evec);
-}
-#endif
-
 static VALUE rb_gsl_eigen_herm(int argc, VALUE *argv, VALUE obj)
 {
   gsl_matrix_complex *Atmp = NULL, *A = NULL;
@@ -360,9 +346,9 @@ static VALUE rb_gsl_eigen_herm(int argc, VALUE *argv, VALUE obj)
       CHECK_MATRIX_COMPLEX(argv[0]);
       Data_Get_Struct(argv[0], gsl_matrix_complex, Atmp);
       if (CLASS_OF(argv[1]) != cgsl_eigen_herm_workspace)
-	rb_raise(rb_eTypeError, 
-		 "argv[1]: wrong argument type %s (Eigen::Herm::Workspace expected)", 
-		 rb_class2name(CLASS_OF(argv[1])));
+        rb_raise(rb_eTypeError,
+                 "argv[1]: wrong argument type %s (Eigen::Herm::Workspace expected)",
+                 rb_class2name(CLASS_OF(argv[1])));
       Data_Get_Struct(argv[1], gsl_eigen_herm_workspace, w);
       break;
     case 1:
@@ -381,10 +367,9 @@ static VALUE rb_gsl_eigen_herm(int argc, VALUE *argv, VALUE obj)
     switch (argc) {
     case 1:
       if (CLASS_OF(argv[0]) != cgsl_eigen_herm_workspace)
-	rb_raise(rb_eTypeError, 
-		 "argv[0]: wrong argument type %s (Eigen::Herm::Workspace expected)", 
-		 rb_class2name(CLASS_OF(argv[0])));
-
+        rb_raise(rb_eTypeError,
+                 "argv[0]: wrong argument type %s (Eigen::Herm::Workspace expected)",
+                 rb_class2name(CLASS_OF(argv[0])));
       Data_Get_Struct(argv[0], gsl_eigen_herm_workspace, w);
       break;
     case 0:
@@ -420,9 +405,9 @@ static VALUE rb_gsl_eigen_hermv(int argc, VALUE *argv, VALUE obj)
       CHECK_MATRIX_COMPLEX(argv[0]);
       Data_Get_Struct(argv[0], gsl_matrix_complex, Atmp);
       if (CLASS_OF(argv[1]) != cgsl_eigen_hermv_workspace)
-	rb_raise(rb_eTypeError, 
-		 "argv[1]: wrong argument type %s (Eigen::Hermv::Workspace expected)", 
-		 rb_class2name(CLASS_OF(argv[1])));
+        rb_raise(rb_eTypeError,
+                 "argv[1]: wrong argument type %s (Eigen::Hermv::Workspace expected)",
+                 rb_class2name(CLASS_OF(argv[1])));
       Data_Get_Struct(argv[1], gsl_eigen_hermv_workspace, w);
       break;
     case 1:
@@ -441,10 +426,9 @@ static VALUE rb_gsl_eigen_hermv(int argc, VALUE *argv, VALUE obj)
     switch (argc) {
     case 1:
       if (CLASS_OF(argv[0]) != cgsl_eigen_hermv_workspace)
-	rb_raise(rb_eTypeError, 
-		 "argv[0]: wrong argument type %s (Eigen::Hermv::Workspace expected)", 
-		 rb_class2name(CLASS_OF(argv[0])));
-
+        rb_raise(rb_eTypeError,
+                 "argv[0]: wrong argument type %s (Eigen::Hermv::Workspace expected)",
+                 rb_class2name(CLASS_OF(argv[0])));
       Data_Get_Struct(argv[0], gsl_eigen_hermv_workspace, w);
       break;
     case 0:
@@ -500,7 +484,7 @@ static VALUE rb_gsl_eigen_vectors_complex_unpack(VALUE obj)
   for (i = 0; i < m->size1; i++) {
     v = gsl_vector_complex_alloc(m->size2);
     for (j = 0; j < m->size2; j++) {
-      z= gsl_matrix_complex_get(m, j, i);
+      z = gsl_matrix_complex_get(m, j, i);
       gsl_vector_complex_set(v, j, z);
     }
     tmp = Data_Wrap_Struct(cgsl_eigen_vector_complex, 0, gsl_vector_complex_free, v);
@@ -515,7 +499,7 @@ static void rb_gsl_eigen_define_const(VALUE topmodule, VALUE module)
   rb_define_const(topmodule, "EIGEN_SORT_VAL_DESC", INT2FIX(GSL_EIGEN_SORT_VAL_DESC));
   rb_define_const(topmodule, "EIGEN_SORT_ABS_ASC", INT2FIX(GSL_EIGEN_SORT_ABS_ASC));
   rb_define_const(topmodule, "EIGEN_SORT_ABS_DESC", INT2FIX(GSL_EIGEN_SORT_ABS_DESC));
-    
+
   rb_define_const(module, "SORT_VAL_ASC", INT2FIX(GSL_EIGEN_SORT_VAL_ASC));
   rb_define_const(module, "SORT_VAL_DESC", INT2FIX(GSL_EIGEN_SORT_VAL_DESC));
   rb_define_const(module, "SORT_ABS_ASC", INT2FIX(GSL_EIGEN_SORT_ABS_ASC));
@@ -528,7 +512,7 @@ static void rb_gsl_eigen_define_const(VALUE topmodule, VALUE module)
 }
 
 static VALUE rb_gsl_eigen_real_sort(int argc, VALUE *argv, VALUE obj,
-  int (*sortfunc)(gsl_vector*, gsl_matrix*, gsl_eigen_sort_t))
+                                    int (*sortfunc)(gsl_vector*, gsl_matrix*, gsl_eigen_sort_t))
 {
   gsl_vector *v = NULL;
   gsl_matrix *m = NULL;
@@ -537,10 +521,10 @@ static VALUE rb_gsl_eigen_real_sort(int argc, VALUE *argv, VALUE obj,
   case 3:
     CHECK_FIXNUM(argv[2]);
     type = FIX2INT(argv[2]);
-    /* no break, do next */
+  /* no break, do next */
   case 2:
     if (argv[0] == Qnil) {
-       v = NULL;
+      v = NULL;
     } else {
       CHECK_VECTOR(argv[0]);
       Data_Get_Struct(argv[0], gsl_vector, v);
@@ -560,7 +544,7 @@ static VALUE rb_gsl_eigen_real_sort(int argc, VALUE *argv, VALUE obj,
 
 
 static VALUE rb_gsl_eigen_complex_sort(int argc, VALUE *argv, VALUE obj,
-  int (*sortfunc)(gsl_vector*, gsl_matrix_complex*, gsl_eigen_sort_t))
+                                       int (*sortfunc)(gsl_vector*, gsl_matrix_complex*, gsl_eigen_sort_t))
 {
   gsl_vector *v = NULL;
   gsl_matrix_complex *m = NULL;
@@ -570,7 +554,7 @@ static VALUE rb_gsl_eigen_complex_sort(int argc, VALUE *argv, VALUE obj,
   case 3:
     CHECK_FIXNUM(argv[2]);
     type = FIX2INT(argv[2]);
-    /* no break, do next */
+  /* no break, do next */
   case 2:
     if (argv[0] == Qnil) {
       v = NULL;
@@ -582,7 +566,7 @@ static VALUE rb_gsl_eigen_complex_sort(int argc, VALUE *argv, VALUE obj,
       m = NULL;
     } else {
       CHECK_MATRIX_COMPLEX(argv[1]);
-      Data_Get_Struct(argv[1], gsl_matrix_complex, m);        
+      Data_Get_Struct(argv[1], gsl_matrix_complex, m);
     }
     break;
   default:
@@ -596,11 +580,11 @@ static VALUE rb_gsl_eigen_symmv_sort(int argc, VALUE *argv, VALUE obj)
 }
 static VALUE rb_gsl_eigen_hermv_sort(int argc, VALUE *argv, VALUE obj)
 {
-  return rb_gsl_eigen_complex_sort(argc, argv, obj, gsl_eigen_hermv_sort);  
+  return rb_gsl_eigen_complex_sort(argc, argv, obj, gsl_eigen_hermv_sort);
 }
 
 
-#ifdef HAVE_EIGEN_FRANCIS
+#ifdef HAVE_GSL_EIGEN_FRANCIS
 static VALUE rb_gsl_eigen_francis_alloc(VALUE klass)
 {
   gsl_eigen_francis_workspace *w = NULL;
@@ -626,7 +610,59 @@ static VALUE rb_gsl_eigen_francis_T(int argc, VALUE *argv, VALUE obj)
 }
 
 #ifdef HAVE_NARRAY_H
-static VALUE rb_gsl_eigen_francis_narray(int argc, VALUE *argv, VALUE obj);
+static VALUE rb_gsl_eigen_francis_narray(int argc, VALUE *argv, VALUE obj)
+{
+  struct NARRAY *na;
+  VALUE nary;
+  gsl_matrix *A = NULL;
+  gsl_eigen_francis_workspace *w = NULL;
+  gsl_vector_complex_view vv;
+  int shape[1];
+  int flagw = 0;
+  switch (argc) {
+  case 2:
+    if (!NA_IsNArray(argv[0]))
+      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)",
+               rb_class2name(CLASS_OF(argv[0])));
+    GetNArray(argv[0], na);
+    if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
+    if (na->shape[0] != na->shape[1])
+      rb_raise(rb_eRuntimeError, "square matrix required");
+    A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
+    memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
+    if (CLASS_OF(argv[1]) != cgsl_eigen_francis_workspace)
+      rb_raise(rb_eTypeError,
+               "argv[1]:  wrong argument type %s (Eigen::Symm::Workspace expected",
+               rb_class2name(CLASS_OF(argv[1])));
+    Data_Get_Struct(argv[1], gsl_eigen_francis_workspace, w);
+    flagw = 0;
+    break;
+  case 1:
+    if (!NA_IsNArray(argv[0]))
+      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)",
+               rb_class2name(CLASS_OF(argv[0])));
+    GetNArray(argv[0], na);
+    if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
+    if (na->shape[0] != na->shape[1])
+      rb_raise(rb_eRuntimeError, "square matrix required");
+    A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
+    memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
+    w = gsl_eigen_francis_alloc();
+    flagw = 1;
+    break;
+  default:
+    rb_raise(rb_eArgError, "matrix not given");
+    break;
+  }
+  shape[0] = A->size1;
+  nary = na_make_object(NA_DCOMPLEX, 1, shape, cNVector);
+  vv = gsl_vector_complex_view_array(NA_PTR_TYPE(nary,double*), A->size1);
+  gsl_eigen_francis(A, &vv.vector, w);
+  /*  gsl_sort_vector(v);*/
+  gsl_matrix_free(A);
+  if (flagw == 1) gsl_eigen_francis_free(w);
+  return nary;
+}
 #endif
 
 static VALUE rb_gsl_eigen_francis(int argc, VALUE *argv, VALUE obj)
@@ -640,7 +676,7 @@ static VALUE rb_gsl_eigen_francis(int argc, VALUE *argv, VALUE obj)
 
 #ifdef HAVE_NARRAY_H
   if (NA_IsNArray(obj)) return rb_gsl_eigen_francis_narray(argc, argv, obj);
-  if (argc >= 1 && NA_IsNArray(argv[0])) 
+  if (argc >= 1 && NA_IsNArray(argv[0]))
     return rb_gsl_eigen_francis_narray(argc, argv, obj);
 #endif
 
@@ -654,7 +690,6 @@ static VALUE rb_gsl_eigen_francis(int argc, VALUE *argv, VALUE obj)
     istart = 1;
     argv2 = argv + 1;
   }
-
   switch (argc-istart) {
   case 0:
     v = gsl_vector_complex_alloc(m->size1);
@@ -666,7 +701,7 @@ static VALUE rb_gsl_eigen_francis(int argc, VALUE *argv, VALUE obj)
     if (CLASS_OF(argv2[0]) == cgsl_vector_complex) {
       Data_Get_Struct(argv2[0], gsl_vector_complex, v);
       w = gsl_eigen_francis_alloc();
-      wflag = 1;      
+      wflag = 1;
     } else if (CLASS_OF(argv2[0]) == cgsl_eigen_francis_workspace) {
       v = gsl_vector_complex_alloc(m->size1);
       vflag = 1;
@@ -696,62 +731,6 @@ static VALUE rb_gsl_eigen_francis(int argc, VALUE *argv, VALUE obj)
     return argv2[0];
 }
 
-#ifdef HAVE_NARRAY_H
-static VALUE rb_gsl_eigen_francis_narray(int argc, VALUE *argv, VALUE obj)
-{
-  struct NARRAY *na;
-  VALUE nary;
-  gsl_matrix *A = NULL;
-  gsl_eigen_francis_workspace *w = NULL;
-  gsl_vector_complex_view vv;
-  int shape[1];
-  int flagw = 0;
-  switch (argc) {
-  case 2:
-    if (!NA_IsNArray(argv[0])) 
-      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)", 
-	       rb_class2name(CLASS_OF(argv[0])));
-    GetNArray(argv[0], na);
-    if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
-    if (na->shape[0] != na->shape[1])
-      rb_raise(rb_eRuntimeError, "square matrix required");
-    A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
-    memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
-    if (CLASS_OF(argv[1]) != cgsl_eigen_francis_workspace)
-      rb_raise(rb_eTypeError, 
-	       "argv[1]:  wrong argument type %s (Eigen::Symm::Workspace expected", 
-	       rb_class2name(CLASS_OF(argv[1])));
-    Data_Get_Struct(argv[1], gsl_eigen_francis_workspace, w);
-    flagw = 0;
-    break;
-  case 1:
-    if (!NA_IsNArray(argv[0])) 
-      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)", 
-	       rb_class2name(CLASS_OF(argv[0])));
-    GetNArray(argv[0], na);
-    if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
-    if (na->shape[0] != na->shape[1])
-      rb_raise(rb_eRuntimeError, "square matrix required");
-    A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
-    memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
-    w = gsl_eigen_francis_alloc();
-    flagw = 1;
-    break;
-  default:
-    rb_raise(rb_eArgError, "matrix not given");
-    break;
-  }
-  shape[0] = A->size1;
-  nary = na_make_object(NA_DCOMPLEX, 1, shape, cNVector);
-  vv = gsl_vector_complex_view_array(NA_PTR_TYPE(nary,double*), A->size1);
-  gsl_eigen_francis(A, &vv.vector, w);
-  /*  gsl_sort_vector(v);*/
-  gsl_matrix_free(A);
-  if (flagw == 1) gsl_eigen_francis_free(w);
-  return nary;
-}
-#endif
-
 static VALUE rb_gsl_eigen_francis_Z(int argc, VALUE *argv, VALUE obj)
 {
   gsl_matrix *m, *mtmp, *Z;
@@ -771,7 +750,6 @@ static VALUE rb_gsl_eigen_francis_Z(int argc, VALUE *argv, VALUE obj)
     istart = 1;
     argv2 = argv + 1;
   }
-
   switch (argc-istart) {
   case 0:
     v = gsl_vector_complex_alloc(m->size1);
@@ -819,7 +797,6 @@ static VALUE rb_gsl_eigen_francis_Z(int argc, VALUE *argv, VALUE obj)
 }
 #endif
 
-#ifdef GSL_1_9_LATER
 static VALUE rb_gsl_eigen_nonsymm_alloc(VALUE klass, VALUE nn)
 {
   size_t n;
@@ -852,78 +829,7 @@ static VALUE rb_gsl_eigen_nonsymm_params(int argc, VALUE *argv, VALUE obj)
 }
 
 #ifdef HAVE_NARRAY_H
-static VALUE rb_gsl_eigen_nonsymm_narray(int argc, VALUE *argv, VALUE obj);
-#endif
-
-static VALUE rb_gsl_eigen_nonsymm(int argc, VALUE *argv, VALUE obj)
-{
-  gsl_matrix *m;
-  gsl_vector_complex *v;
-  gsl_eigen_nonsymm_workspace *w;
-  int vflag = 0, wflag = 0;
-  int istart = 0;
-  VALUE *argv2;
-
-#ifdef HAVE_NARRAY_H
-  if (NA_IsNArray(obj)) return rb_gsl_eigen_nonsymm_narray(argc, argv, obj);
-  if (argc >= 1 && NA_IsNArray(argv[0])) 
-    return rb_gsl_eigen_nonsymm_narray(argc, argv, obj);
-#endif
-
-  if (MATRIX_P(obj)) {
-    Data_Get_Struct(obj, gsl_matrix, m);
-    argv2 = argv;
-    istart = 0;
-  } else {
-    if (argc < 1) rb_raise(rb_eArgError, "Wrong number of arguments.\n");
-    Data_Get_Struct(argv[0], gsl_matrix, m);
-    istart = 1;
-    argv2 = argv + 1;
-  }
-
-  switch (argc-istart) {
-  case 0:
-    v = gsl_vector_complex_alloc(m->size1);
-    w = gsl_eigen_nonsymm_alloc(m->size1);
-    vflag = 1;
-    wflag = 1;
-    break;
-  case 1:
-    if (CLASS_OF(argv2[0]) == cgsl_vector_complex) {
-      Data_Get_Struct(argv2[0], gsl_vector_complex, v);
-      w = gsl_eigen_nonsymm_alloc(m->size1);
-      wflag = 1;      
-    } else if (CLASS_OF(argv2[0]) == cgsl_eigen_nonsymm_workspace) {
-      v = gsl_vector_complex_alloc(m->size1);
-      vflag = 1;
-      Data_Get_Struct(argv2[0], gsl_eigen_nonsymm_workspace, w);
-    } else {
-      rb_raise(rb_eArgError, "Wrong argument type.\n");
-    }
-    break;
-  case 2:
-    CHECK_VECTOR_COMPLEX(argv2[0]);
-    if (CLASS_OF(argv2[1]) != cgsl_eigen_nonsymm_workspace) {
-      rb_raise(rb_eArgError, "argv[1] must be a GSL::Eigen::Nonsymm::Workspace.\n");
-    }
-    Data_Get_Struct(argv2[0], gsl_vector_complex, v);
-    Data_Get_Struct(argv2[1], gsl_eigen_nonsymm_workspace, w);
-    break;
-  default:
-    rb_raise(rb_eArgError, "Wrong number of arguments (%d for 0-2).\n", argc);
-  }
-//  mtmp = make_matrix_clone(m);
-  gsl_eigen_nonsymm(m, v, w);
-//  gsl_matrix_free(mtmp);
-  if (wflag == 1) gsl_eigen_nonsymm_free(w);
-  if (vflag == 1)
-    return Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, v);
-  else
-    return argv2[0];
-}
-
-#ifdef HAVE_NARRAY_H
-static VALUE rb_gsl_eigen_nonsymm_narray(int argc, VALUE *argv, VALUE obj)
+static VALUE rb_gsl_eigen_nonsymm_narray(int argc, VALUE *argv, VALUE obj)
 {
   struct NARRAY *na;
   VALUE nary;
@@ -934,9 +840,9 @@ static VALUE rb_gsl_eigen_nonsymm_narray(int argc, VALUE *argv, VALUE obj)
   int flagw = 0;
   switch (argc) {
   case 2:
-    if (!NA_IsNArray(argv[0])) 
-      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)", 
-	       rb_class2name(CLASS_OF(argv[0])));
+    if (!NA_IsNArray(argv[0]))
+      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)",
+               rb_class2name(CLASS_OF(argv[0])));
     GetNArray(argv[0], na);
     if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
     if (na->shape[0] != na->shape[1])
@@ -944,16 +850,16 @@ static VALUE rb_gsl_eigen_nonsymm_narray(int argc, VALUE *argv, VALUE obj)
     A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
     memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
     if (CLASS_OF(argv[1]) != cgsl_eigen_nonsymm_workspace)
-      rb_raise(rb_eTypeError, 
-	       "argv[1]:  wrong argument type %s (Eigen::Symm::Workspace expected", 
-	       rb_class2name(CLASS_OF(argv[1])));
+      rb_raise(rb_eTypeError,
+               "argv[1]:  wrong argument type %s (Eigen::Symm::Workspace expected",
+               rb_class2name(CLASS_OF(argv[1])));
     Data_Get_Struct(argv[1], gsl_eigen_nonsymm_workspace, w);
     flagw = 0;
     break;
   case 1:
-    if (!NA_IsNArray(argv[0])) 
-      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)", 
-	       rb_class2name(CLASS_OF(argv[0])));
+    if (!NA_IsNArray(argv[0]))
+      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)",
+               rb_class2name(CLASS_OF(argv[0])));
     GetNArray(argv[0], na);
     if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
     if (na->shape[0] != na->shape[1])
@@ -978,6 +884,72 @@ static VALUE rb_gsl_eigen_nonsymm_narray(int argc, VALUE *argv, VALUE obj)
 }
 #endif
 
+static VALUE rb_gsl_eigen_nonsymm(int argc, VALUE *argv, VALUE obj)
+{
+  gsl_matrix *m;
+  gsl_vector_complex *v;
+  gsl_eigen_nonsymm_workspace *w;
+  int vflag = 0, wflag = 0;
+  int istart = 0;
+  VALUE *argv2;
+
+#ifdef HAVE_NARRAY_H
+  if (NA_IsNArray(obj)) return rb_gsl_eigen_nonsymm_narray(argc, argv, obj);
+  if (argc >= 1 && NA_IsNArray(argv[0]))
+    return rb_gsl_eigen_nonsymm_narray(argc, argv, obj);
+#endif
+
+  if (MATRIX_P(obj)) {
+    Data_Get_Struct(obj, gsl_matrix, m);
+    argv2 = argv;
+    istart = 0;
+  } else {
+    if (argc < 1) rb_raise(rb_eArgError, "Wrong number of arguments.\n");
+    Data_Get_Struct(argv[0], gsl_matrix, m);
+    istart = 1;
+    argv2 = argv + 1;
+  }
+  switch (argc-istart) {
+  case 0:
+    v = gsl_vector_complex_alloc(m->size1);
+    w = gsl_eigen_nonsymm_alloc(m->size1);
+    vflag = 1;
+    wflag = 1;
+    break;
+  case 1:
+    if (CLASS_OF(argv2[0]) == cgsl_vector_complex) {
+      Data_Get_Struct(argv2[0], gsl_vector_complex, v);
+      w = gsl_eigen_nonsymm_alloc(m->size1);
+      wflag = 1;
+    } else if (CLASS_OF(argv2[0]) == cgsl_eigen_nonsymm_workspace) {
+      v = gsl_vector_complex_alloc(m->size1);
+      vflag = 1;
+      Data_Get_Struct(argv2[0], gsl_eigen_nonsymm_workspace, w);
+    } else {
+      rb_raise(rb_eArgError, "Wrong argument type.\n");
+    }
+    break;
+  case 2:
+    CHECK_VECTOR_COMPLEX(argv2[0]);
+    if (CLASS_OF(argv2[1]) != cgsl_eigen_nonsymm_workspace) {
+      rb_raise(rb_eArgError, "argv[1] must be a GSL::Eigen::Nonsymm::Workspace.\n");
+    }
+    Data_Get_Struct(argv2[0], gsl_vector_complex, v);
+    Data_Get_Struct(argv2[1], gsl_eigen_nonsymm_workspace, w);
+    break;
+  default:
+    rb_raise(rb_eArgError, "Wrong number of arguments (%d for 0-2).\n", argc);
+  }
+//  mtmp = make_matrix_clone(m);
+  gsl_eigen_nonsymm(m, v, w);
+//  gsl_matrix_free(mtmp);
+  if (wflag == 1) gsl_eigen_nonsymm_free(w);
+  if (vflag == 1)
+    return Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, v);
+  else
+    return argv2[0];
+}
+
 static VALUE rb_gsl_eigen_nonsymm_Z(int argc, VALUE *argv, VALUE obj)
 {
   gsl_matrix *m, *Z;
@@ -997,7 +969,6 @@ static VALUE rb_gsl_eigen_nonsymm_Z(int argc, VALUE *argv, VALUE obj)
     istart = 1;
     argv2 = argv + 1;
   }
-
   switch (argc-istart) {
   case 0:
     v = gsl_vector_complex_alloc(m->size1);
@@ -1054,14 +1025,69 @@ static VALUE rb_gsl_eigen_nonsymmv_alloc(VALUE klass, VALUE nn)
 }
 
 #ifdef HAVE_NARRAY_H
-static VALUE rb_gsl_eigen_nonsymmv_narray(int argc, VALUE *argv, VALUE obj);
+static VALUE rb_gsl_eigen_nonsymmv_narray(int argc, VALUE *argv, VALUE obj)
+{
+  struct NARRAY *na;
+  VALUE nary, nvec;
+  gsl_matrix *A = NULL;
+  gsl_eigen_nonsymmv_workspace *w = NULL;
+  gsl_vector_complex_view vv;
+  gsl_matrix_complex_view mm;
+  int shape[1], shape2[2];
+  int flagw = 0;
+  switch (argc) {
+  case 2:
+    if (!NA_IsNArray(argv[0]))
+      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)",
+               rb_class2name(CLASS_OF(argv[0])));
+    GetNArray(argv[0], na);
+    if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
+    if (na->shape[0] != na->shape[1])
+      rb_raise(rb_eRuntimeError, "square matrix required");
+    A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
+    memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
+    if (CLASS_OF(argv[1]) != cgsl_eigen_nonsymmv_workspace)
+      rb_raise(rb_eTypeError,
+               "argv[1]:  wrong argument type %s (Eigen::Symm::Workspace expected",
+               rb_class2name(CLASS_OF(argv[1])));
+    Data_Get_Struct(argv[1], gsl_eigen_nonsymmv_workspace, w);
+    flagw = 0;
+    break;
+  case 1:
+    if (!NA_IsNArray(argv[0]))
+      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)",
+               rb_class2name(CLASS_OF(argv[0])));
+    GetNArray(argv[0], na);
+    if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
+    if (na->shape[0] != na->shape[1])
+      rb_raise(rb_eRuntimeError, "square matrix required");
+    A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
+    memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
+    w = gsl_eigen_nonsymmv_alloc(A->size1);
+    flagw = 1;
+    break;
+  default:
+    rb_raise(rb_eArgError, "matrix not given");
+    break;
+  }
+  shape[0] = A->size1; shape2[0] = A->size1; shape2[1] = A->size2;
+  nary = na_make_object(NA_DCOMPLEX, 1, shape, cNVector);
+  vv = gsl_vector_complex_view_array(NA_PTR_TYPE(nary,double*), A->size1);
+  nvec = na_make_object(NA_DCOMPLEX, 2, shape2, CLASS_OF(argv[0]));
+  mm = gsl_matrix_complex_view_array(NA_PTR_TYPE(nvec,double*), A->size1, A->size2);
+  gsl_eigen_nonsymmv(A, &vv.vector, &mm.matrix, w);
+  /*  gsl_sort_vector(v);*/
+  gsl_matrix_free(A);
+  if (flagw == 1) gsl_eigen_nonsymmv_free(w);
+  return rb_ary_new3(2, nary, nvec);
+}
 #endif
 
 static VALUE rb_gsl_eigen_nonsymmv(int argc, VALUE *argv, VALUE obj)
 {
   gsl_matrix *m;
-  gsl_vector_complex *v;
-  gsl_matrix_complex *evec;
+  gsl_vector_complex *v = NULL;
+  gsl_matrix_complex *evec = NULL;
   gsl_eigen_nonsymmv_workspace *w;
   int vflag = 0, wflag = 0;
   int istart = 0;
@@ -1069,7 +1095,7 @@ static VALUE rb_gsl_eigen_nonsymmv(int argc, VALUE *argv, VALUE obj)
 
 #ifdef HAVE_NARRAY_H
   if (NA_IsNArray(obj)) return rb_gsl_eigen_nonsymmv_narray(argc, argv, obj);
-  if (argc >= 1 && NA_IsNArray(argv[0])) 
+  if (argc >= 1 && NA_IsNArray(argv[0]))
     return rb_gsl_eigen_nonsymmv_narray(argc, argv, obj);
 #endif
 
@@ -1083,7 +1109,6 @@ static VALUE rb_gsl_eigen_nonsymmv(int argc, VALUE *argv, VALUE obj)
     istart = 1;
     argv2 = argv + 1;
   }
-
   switch (argc-istart) {
   case 0:
     v = gsl_vector_complex_alloc(m->size1);
@@ -1127,78 +1152,19 @@ static VALUE rb_gsl_eigen_nonsymmv(int argc, VALUE *argv, VALUE obj)
 
   if (wflag == 1) gsl_eigen_nonsymmv_free(w);
   if (vflag == 1) {
-    return rb_ary_new3(2, 
-		       Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, v),
-		       Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, evec));
+    return rb_ary_new3(2,
+                       Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, v),
+                       Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, evec));
   }  else {
     return rb_ary_new3(2, argv2[0], argv2[1]);
   }
 }
 
-#ifdef HAVE_NARRAY_H
-static VALUE rb_gsl_eigen_nonsymmv_narray(int argc, VALUE *argv, VALUE obj)
-{
-  struct NARRAY *na;
-  VALUE nary, nvec;
-  gsl_matrix *A = NULL;
-  gsl_eigen_nonsymmv_workspace *w = NULL;
-  gsl_vector_complex_view vv;
-  gsl_matrix_complex_view mm;
-  int shape[1], shape2[2];
-  int flagw = 0;
-  switch (argc) {
-  case 2:
-    if (!NA_IsNArray(argv[0])) 
-      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)", 
-	       rb_class2name(CLASS_OF(argv[0])));
-    GetNArray(argv[0], na);
-    if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
-    if (na->shape[0] != na->shape[1])
-      rb_raise(rb_eRuntimeError, "square matrix required");
-    A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
-    memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
-    if (CLASS_OF(argv[1]) != cgsl_eigen_nonsymmv_workspace)
-      rb_raise(rb_eTypeError, 
-	       "argv[1]:  wrong argument type %s (Eigen::Symm::Workspace expected", 
-	       rb_class2name(CLASS_OF(argv[1])));
-    Data_Get_Struct(argv[1], gsl_eigen_nonsymmv_workspace, w);
-    flagw = 0;
-    break;
-  case 1:
-    if (!NA_IsNArray(argv[0])) 
-      rb_raise(rb_eTypeError, "wrong argument type %s (NArray expected)", 
-	       rb_class2name(CLASS_OF(argv[0])));
-    GetNArray(argv[0], na);
-    if (na->rank < 2) rb_raise(rb_eRuntimeError, "rank >= 2 required");
-    if (na->shape[0] != na->shape[1])
-      rb_raise(rb_eRuntimeError, "square matrix required");
-    A = gsl_matrix_alloc(na->shape[1], na->shape[0]);
-    memcpy(A->data, (double*) na->ptr, sizeof(double)*A->size1*A->size2);
-    w = gsl_eigen_nonsymmv_alloc(A->size1);
-    flagw = 1;
-    break;
-  default:
-    rb_raise(rb_eArgError, "matrix not given");
-    break;
-  }
-  shape[0] = A->size1; shape2[0] = A->size1; shape2[1] = A->size2;
-  nary = na_make_object(NA_DCOMPLEX, 1, shape, cNVector);
-  vv = gsl_vector_complex_view_array(NA_PTR_TYPE(nary,double*), A->size1);
-  nvec = na_make_object(NA_DCOMPLEX, 2, shape2, CLASS_OF(argv[0]));
-  mm = gsl_matrix_complex_view_array(NA_PTR_TYPE(nvec,double*), A->size1, A->size2);
-  gsl_eigen_nonsymmv(A, &vv.vector, &mm.matrix, w);
-  /*  gsl_sort_vector(v);*/
-  gsl_matrix_free(A);
-  if (flagw == 1) gsl_eigen_nonsymmv_free(w);
-  return rb_ary_new3(2, nary, nvec);
-}
-#endif
-
 static VALUE rb_gsl_eigen_nonsymmv_Z(int argc, VALUE *argv, VALUE obj)
 {
-  gsl_matrix *m, *Z;
-  gsl_vector_complex *v;
-  gsl_matrix_complex *evec;
+  gsl_matrix *m, *Z = NULL;
+  gsl_vector_complex *v = NULL;
+  gsl_matrix_complex *evec = NULL;
   gsl_eigen_nonsymmv_workspace *w;
   int vflag = 0, wflag = 0;
   int istart = 0;
@@ -1214,7 +1180,6 @@ static VALUE rb_gsl_eigen_nonsymmv_Z(int argc, VALUE *argv, VALUE obj)
     istart = 1;
     argv2 = argv + 1;
   }
-
   switch (argc-istart) {
   case 0:
     v = gsl_vector_complex_alloc(m->size1);
@@ -1262,17 +1227,17 @@ static VALUE rb_gsl_eigen_nonsymmv_Z(int argc, VALUE *argv, VALUE obj)
 
   if (wflag == 1) gsl_eigen_nonsymmv_free(w);
   if (vflag == 1) {
-    return rb_ary_new3(3, 
-		       Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, v),
-		       Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, evec),
-Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, Z));
+    return rb_ary_new3(3,
+                       Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, v),
+                       Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, evec),
+                       Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, Z));
   }  else {
     return rb_ary_new3(2, argv2[0], argv2[1], argv2[2]);
   }
 }
 
 static VALUE rb_gsl_eigen_complex_sort2(int argc, VALUE *argv, VALUE obj,
-  int (*sortfunc)(gsl_vector_complex*, gsl_matrix_complex*, gsl_eigen_sort_t))
+                                        int (*sortfunc)(gsl_vector_complex*, gsl_matrix_complex*, gsl_eigen_sort_t))
 {
   gsl_vector_complex *v = NULL;
   gsl_matrix_complex *m = NULL;
@@ -1282,19 +1247,19 @@ static VALUE rb_gsl_eigen_complex_sort2(int argc, VALUE *argv, VALUE obj,
   case 3:
     CHECK_FIXNUM(argv[2]);
     type = FIX2INT(argv[2]);
-    /* no break, do next */
+  /* no break, do next */
   case 2:
     if (argv[0] == Qnil) {
       v = NULL;
     } else {
       CHECK_VECTOR_COMPLEX(argv[0]);
-      Data_Get_Struct(argv[0], gsl_vector_complex, v);      
+      Data_Get_Struct(argv[0], gsl_vector_complex, v);
     }
     if (argv[1] == Qnil) {
       m = NULL;
     } else {
       CHECK_MATRIX_COMPLEX(argv[1]);
-      Data_Get_Struct(argv[1], gsl_matrix_complex, m);  
+      Data_Get_Struct(argv[1], gsl_matrix_complex, m);
     }
     break;
   default:
@@ -1306,13 +1271,9 @@ static VALUE rb_gsl_eigen_complex_sort2(int argc, VALUE *argv, VALUE obj,
 
 static VALUE rb_gsl_eigen_nonsymmv_sort(int argc, VALUE *argv, VALUE obj)
 {
-  return rb_gsl_eigen_complex_sort2(argc, argv, obj, gsl_eigen_nonsymmv_sort);  
+  return rb_gsl_eigen_complex_sort2(argc, argv, obj, gsl_eigen_nonsymmv_sort);
 }
 
-#endif
-
-#ifdef GSL_1_10_LATER
-
 static VALUE rb_gsl_eigen_gensymm_alloc(VALUE klass, VALUE nn)
 {
   gsl_eigen_gensymm_workspace *w = NULL;
@@ -1343,373 +1304,371 @@ static VALUE rb_gsl_eigen_genhermv_alloc(VALUE klass, VALUE nn)
 }
 
 static int check_argv_gensymm(int argc, VALUE *argv, VALUE obj, gsl_matrix **A, gsl_matrix **B,
-	gsl_vector **eval, gsl_eigen_gensymm_workspace **w)
+                              gsl_vector **eval, gsl_eigen_gensymm_workspace **w)
 {
-	int argc2 = argc;
-	int flag = 0;
-	if (CLASS_OF(obj) == cgensymm) {
-		Data_Get_Struct(obj, gsl_eigen_gensymm_workspace, *w);
-	} else {
-		if (rb_obj_is_kind_of(argv[argc-1], cgensymm)) {
-			Data_Get_Struct(argv[argc-1], gsl_eigen_gensymm_workspace, *w);
-			argc2 = argc-1;
-		} else {
-			/* workspace is not given */
-		}
-	}
-	switch (argc2) {
-	case 2:
-		CHECK_MATRIX(argv[0]); CHECK_MATRIX(argv[1]);
-		Data_Get_Struct(argv[0], gsl_matrix, *A);
-		Data_Get_Struct(argv[1], gsl_matrix, *B);
-		break;
-	case 3:
-		if (rb_obj_is_kind_of(argv[2], cgensymm)) {
-			Data_Get_Struct(argv[2], gsl_eigen_gensymm_workspace, *w);
-		} else {
-			CHECK_VECTOR(argv[2]);
-			Data_Get_Struct(argv[2], gsl_vector, *eval);
-		}
-		CHECK_MATRIX(argv[0]); CHECK_MATRIX(argv[1]);
-		Data_Get_Struct(argv[0], gsl_matrix, *A);
-		Data_Get_Struct(argv[1], gsl_matrix, *B);
-		break;
-	default:
-		rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or 3)", argc);
-	}
-	if (*eval == NULL) {
-		*eval = gsl_vector_alloc((*A)->size1);
-		flag += 1;
-	}
-	if (*w == NULL) {
-		*w = gsl_eigen_gensymm_alloc((*A)->size1);
-		flag += 2;
-	}
-	return flag;
+  int argc2 = argc;
+  int flag = 0;
+  if (CLASS_OF(obj) == cgensymm) {
+    Data_Get_Struct(obj, gsl_eigen_gensymm_workspace, *w);
+  } else {
+    if (rb_obj_is_kind_of(argv[argc-1], cgensymm)) {
+      Data_Get_Struct(argv[argc-1], gsl_eigen_gensymm_workspace, *w);
+      argc2 = argc-1;
+    } else {
+      /* workspace is not given */
+    }
+  }
+  switch (argc2) {
+  case 2:
+    CHECK_MATRIX(argv[0]); CHECK_MATRIX(argv[1]);
+    Data_Get_Struct(argv[0], gsl_matrix, *A);
+    Data_Get_Struct(argv[1], gsl_matrix, *B);
+    break;
+  case 3:
+    if (rb_obj_is_kind_of(argv[2], cgensymm)) {
+      Data_Get_Struct(argv[2], gsl_eigen_gensymm_workspace, *w);
+    } else {
+      CHECK_VECTOR(argv[2]);
+      Data_Get_Struct(argv[2], gsl_vector, *eval);
+    }
+    CHECK_MATRIX(argv[0]); CHECK_MATRIX(argv[1]);
+    Data_Get_Struct(argv[0], gsl_matrix, *A);
+    Data_Get_Struct(argv[1], gsl_matrix, *B);
+    break;
+  default:
+    rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or 3)", argc);
+  }
+  if (*eval == NULL) {
+    *eval = gsl_vector_alloc((*A)->size1);
+    flag += 1;
+  }
+  if (*w == NULL) {
+    *w = gsl_eigen_gensymm_alloc((*A)->size1);
+    flag += 2;
+  }
+  return flag;
 }
 
 static int check_argv_gensymmv(int argc, VALUE *argv, VALUE obj, gsl_matrix **A, gsl_matrix **B,
-	gsl_vector **eval, gsl_matrix **evec, gsl_eigen_gensymmv_workspace **w)
+                               gsl_vector **eval, gsl_matrix **evec, gsl_eigen_gensymmv_workspace **w)
 {
-	int argc2 = argc;
-	int flag = 0;
-	if (CLASS_OF(obj) == cgensymmv) {
-		Data_Get_Struct(obj, gsl_eigen_gensymmv_workspace, *w);
-	} else {
-		if (rb_obj_is_kind_of(argv[argc-1], cgensymmv)) {
-			Data_Get_Struct(argv[argc-1], gsl_eigen_gensymmv_workspace, *w);
-			argc2 = argc-1;
-		} else {
-
-			/* workspace is not given */
-		}
-	}
-
-	switch (argc2) {
-	case 2:
-		CHECK_MATRIX(argv[0]); CHECK_MATRIX(argv[1]);
-		Data_Get_Struct(argv[0], gsl_matrix, *A);
-		Data_Get_Struct(argv[1], gsl_matrix, *B);
-		break;
-	case 3:
-		if (rb_obj_is_kind_of(argv[2], cgensymmv)) {
-			Data_Get_Struct(argv[2], gsl_eigen_gensymmv_workspace, *w);
-		} else {
+  int argc2 = argc;
+  int flag = 0;
+  if (CLASS_OF(obj) == cgensymmv) {
+    Data_Get_Struct(obj, gsl_eigen_gensymmv_workspace, *w);
+  } else {
+    if (rb_obj_is_kind_of(argv[argc-1], cgensymmv)) {
+      Data_Get_Struct(argv[argc-1], gsl_eigen_gensymmv_workspace, *w);
+      argc2 = argc-1;
+    } else {
+
+      /* workspace is not given */
+    }
+  }
+  switch (argc2) {
+  case 2:
+    CHECK_MATRIX(argv[0]); CHECK_MATRIX(argv[1]);
+    Data_Get_Struct(argv[0], gsl_matrix, *A);
+    Data_Get_Struct(argv[1], gsl_matrix, *B);
+    break;
+  case 3:
+    if (rb_obj_is_kind_of(argv[2], cgensymmv)) {
+      Data_Get_Struct(argv[2], gsl_eigen_gensymmv_workspace, *w);
+    } else {
       rb_raise(rb_eTypeError, "Wrong argument type %s (GSL::Eigen::Gensymmv::Workspace expected)",
-        rb_class2name(CLASS_OF(argv[2])));
-		}
-		CHECK_MATRIX(argv[0]); CHECK_MATRIX(argv[1]);
-		Data_Get_Struct(argv[0], gsl_matrix, *A);
-		Data_Get_Struct(argv[1], gsl_matrix, *B);
-
-		break;
-	case 5:
-		if (rb_obj_is_kind_of(argv[4], cgensymmv)) {
-			Data_Get_Struct(argv[4], gsl_eigen_gensymmv_workspace, *w);
-		} else {
+               rb_class2name(CLASS_OF(argv[2])));
+    }
+    CHECK_MATRIX(argv[0]); CHECK_MATRIX(argv[1]);
+    Data_Get_Struct(argv[0], gsl_matrix, *A);
+    Data_Get_Struct(argv[1], gsl_matrix, *B);
+
+    break;
+  case 5:
+    if (rb_obj_is_kind_of(argv[4], cgensymmv)) {
+      Data_Get_Struct(argv[4], gsl_eigen_gensymmv_workspace, *w);
+    } else {
       rb_raise(rb_eTypeError, "Wrong argument type %s (GSL::Eigen::Gensymmv::Workspace expected)",
-        rb_class2name(CLASS_OF(argv[4])));      
+               rb_class2name(CLASS_OF(argv[4])));
     }
-		CHECK_VECTOR(argv[2]);
-		Data_Get_Struct(argv[2], gsl_vector, *eval);
-		CHECK_MATRIX(argv[3]);
-		Data_Get_Struct(argv[3], gsl_matrix, *evec);			
-		
-		CHECK_MATRIX(argv[0]); CHECK_MATRIX(argv[1]);
-		Data_Get_Struct(argv[0], gsl_matrix, *A);
-		Data_Get_Struct(argv[1], gsl_matrix, *B);
-		break;		
-	default:
-		rb_raise(rb_eArgError, "wrong number of arguments (%d for 2, 3 or 5)", argc);
-  }
-	if (*eval == NULL && *evec == NULL) {
-		*eval = gsl_vector_alloc((*A)->size1);
-		*evec = gsl_matrix_alloc((*A)->size1, (*A)->size2);		
-		flag += 1;
-	}
-	if (*w == NULL) {
-		*w = gsl_eigen_gensymmv_alloc((*A)->size1);
-		flag += 2;
-	}
-	return flag;
+    CHECK_VECTOR(argv[2]);
+    Data_Get_Struct(argv[2], gsl_vector, *eval);
+    CHECK_MATRIX(argv[3]);
+    Data_Get_Struct(argv[3], gsl_matrix, *evec);
+
+    CHECK_MATRIX(argv[0]); CHECK_MATRIX(argv[1]);
+    Data_Get_Struct(argv[0], gsl_matrix, *A);
+    Data_Get_Struct(argv[1], gsl_matrix, *B);
+    break;
+  default:
+    rb_raise(rb_eArgError, "wrong number of arguments (%d for 2, 3 or 5)", argc);
+  }
+  if (*eval == NULL && *evec == NULL) {
+    *eval = gsl_vector_alloc((*A)->size1);
+    *evec = gsl_matrix_alloc((*A)->size1, (*A)->size2);
+    flag += 1;
+  }
+  if (*w == NULL) {
+    *w = gsl_eigen_gensymmv_alloc((*A)->size1);
+    flag += 2;
+  }
+  return flag;
 }
 
 static int check_argv_genherm(int argc, VALUE *argv, VALUE obj, gsl_matrix_complex **A, gsl_matrix_complex **B,
-	gsl_vector **eval, gsl_eigen_genherm_workspace **w)
+                              gsl_vector **eval, gsl_eigen_genherm_workspace **w)
 {
-	int argc2 = argc;
-	int flag = 0;
-	if (CLASS_OF(obj) == cgenherm) {
-		Data_Get_Struct(obj, gsl_eigen_genherm_workspace, *w);
-	} else {
-		if (rb_obj_is_kind_of(argv[argc-1], cgenherm)) {
-			Data_Get_Struct(argv[argc-1], gsl_eigen_genherm_workspace, *w);
-			argc2 = argc-1;
-		} else {
-			/* workspace is not given */
-		}
-	}
-	switch (argc2) {
-	case 2:
-		CHECK_MATRIX_COMPLEX(argv[0]); CHECK_MATRIX_COMPLEX(argv[1]);
-		Data_Get_Struct(argv[0], gsl_matrix_complex, *A);
-		Data_Get_Struct(argv[1], gsl_matrix_complex, *B);
-		break;
-	case 3:
-		if (rb_obj_is_kind_of(argv[2], cgenherm)) {
-			Data_Get_Struct(argv[2], gsl_eigen_genherm_workspace, *w);
-		} else {
-			CHECK_VECTOR(argv[2]);
-			Data_Get_Struct(argv[2], gsl_vector, *eval);
-		}
-		CHECK_MATRIX_COMPLEX(argv[0]); CHECK_MATRIX_COMPLEX(argv[1]);
-		Data_Get_Struct(argv[0], gsl_matrix_complex, *A);
-		Data_Get_Struct(argv[1], gsl_matrix_complex, *B);
-		break;
-	default:
-		rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or 3)", argc);
-	}
-	if (*eval == NULL) {
-		*eval = gsl_vector_alloc((*A)->size1);
-		flag += 1;
-	}
-	if (*w == NULL) {
-		*w = gsl_eigen_genherm_alloc((*A)->size1);
-		flag += 2;
-	}
-	return flag;
+  int argc2 = argc;
+  int flag = 0;
+  if (CLASS_OF(obj) == cgenherm) {
+    Data_Get_Struct(obj, gsl_eigen_genherm_workspace, *w);
+  } else {
+    if (rb_obj_is_kind_of(argv[argc-1], cgenherm)) {
+      Data_Get_Struct(argv[argc-1], gsl_eigen_genherm_workspace, *w);
+      argc2 = argc-1;
+    } else {
+      /* workspace is not given */
+    }
+  }
+  switch (argc2) {
+  case 2:
+    CHECK_MATRIX_COMPLEX(argv[0]); CHECK_MATRIX_COMPLEX(argv[1]);
+    Data_Get_Struct(argv[0], gsl_matrix_complex, *A);
+    Data_Get_Struct(argv[1], gsl_matrix_complex, *B);
+    break;
+  case 3:
+    if (rb_obj_is_kind_of(argv[2], cgenherm)) {
+      Data_Get_Struct(argv[2], gsl_eigen_genherm_workspace, *w);
+    } else {
+      CHECK_VECTOR(argv[2]);
+      Data_Get_Struct(argv[2], gsl_vector, *eval);
+    }
+    CHECK_MATRIX_COMPLEX(argv[0]); CHECK_MATRIX_COMPLEX(argv[1]);
+    Data_Get_Struct(argv[0], gsl_matrix_complex, *A);
+    Data_Get_Struct(argv[1], gsl_matrix_complex, *B);
+    break;
+  default:
+    rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or 3)", argc);
+  }
+  if (*eval == NULL) {
+    *eval = gsl_vector_alloc((*A)->size1);
+    flag += 1;
+  }
+  if (*w == NULL) {
+    *w = gsl_eigen_genherm_alloc((*A)->size1);
+    flag += 2;
+  }
+  return flag;
 }
 static int check_argv_genhermv(int argc, VALUE *argv, VALUE obj, gsl_matrix_complex **A, gsl_matrix_complex **B,
-	gsl_vector **eval, gsl_matrix_complex **evec, gsl_eigen_genhermv_workspace **w)
+                               gsl_vector **eval, gsl_matrix_complex **evec, gsl_eigen_genhermv_workspace **w)
 {
-	int argc2 = argc;
-	int flag = 0;
-	if (CLASS_OF(obj) == cgenhermv) {
-		Data_Get_Struct(obj, gsl_eigen_genhermv_workspace, *w);
-	} else {
-		if (rb_obj_is_kind_of(argv[argc-1], cgenhermv)) {
-			Data_Get_Struct(argv[argc-1], gsl_eigen_genhermv_workspace, *w);
-			argc2 = argc-1;
-		} else {
-
-			/* workspace is not given */
-		}
-	}
-
-	switch (argc2) {
-	case 2:
-		CHECK_MATRIX_COMPLEX(argv[0]); CHECK_MATRIX_COMPLEX(argv[1]);
-		Data_Get_Struct(argv[0], gsl_matrix_complex, *A);
-		Data_Get_Struct(argv[1], gsl_matrix_complex, *B);
-		break;
-	case 3:
-		if (rb_obj_is_kind_of(argv[2], cgenhermv)) {
-			Data_Get_Struct(argv[2], gsl_eigen_genhermv_workspace, *w);
-		} else {
+  int argc2 = argc;
+  int flag = 0;
+  if (CLASS_OF(obj) == cgenhermv) {
+    Data_Get_Struct(obj, gsl_eigen_genhermv_workspace, *w);
+  } else {
+    if (rb_obj_is_kind_of(argv[argc-1], cgenhermv)) {
+      Data_Get_Struct(argv[argc-1], gsl_eigen_genhermv_workspace, *w);
+      argc2 = argc-1;
+    } else {
+
+      /* workspace is not given */
+    }
+  }
+  switch (argc2) {
+  case 2:
+    CHECK_MATRIX_COMPLEX(argv[0]); CHECK_MATRIX_COMPLEX(argv[1]);
+    Data_Get_Struct(argv[0], gsl_matrix_complex, *A);
+    Data_Get_Struct(argv[1], gsl_matrix_complex, *B);
+    break;
+  case 3:
+    if (rb_obj_is_kind_of(argv[2], cgenhermv)) {
+      Data_Get_Struct(argv[2], gsl_eigen_genhermv_workspace, *w);
+    } else {
       rb_raise(rb_eTypeError, "Wrong argument type %s (GSL::Eigen::Genhermv::Workspace expected)",
-        rb_class2name(CLASS_OF(argv[2])));
-		}
-		CHECK_MATRIX_COMPLEX(argv[0]); CHECK_MATRIX_COMPLEX(argv[1]);
-		Data_Get_Struct(argv[0], gsl_matrix_complex, *A);
-		Data_Get_Struct(argv[1], gsl_matrix_complex, *B);
-
-		break;
-	case 5:
-		if (rb_obj_is_kind_of(argv[4], cgenhermv)) {
-			Data_Get_Struct(argv[4], gsl_eigen_genhermv_workspace, *w);
-		} else {
+               rb_class2name(CLASS_OF(argv[2])));
+    }
+    CHECK_MATRIX_COMPLEX(argv[0]); CHECK_MATRIX_COMPLEX(argv[1]);
+    Data_Get_Struct(argv[0], gsl_matrix_complex, *A);
+    Data_Get_Struct(argv[1], gsl_matrix_complex, *B);
+
+    break;
+  case 5:
+    if (rb_obj_is_kind_of(argv[4], cgenhermv)) {
+      Data_Get_Struct(argv[4], gsl_eigen_genhermv_workspace, *w);
+    } else {
       rb_raise(rb_eTypeError, "Wrong argument type %s (GSL::Eigen::Genhermv::Workspace expected)",
-        rb_class2name(CLASS_OF(argv[4])));      
+               rb_class2name(CLASS_OF(argv[4])));
     }
-		CHECK_VECTOR(argv[2]);
-		Data_Get_Struct(argv[2], gsl_vector, *eval);
-		CHECK_MATRIX_COMPLEX(argv[3]);
-		Data_Get_Struct(argv[3], gsl_matrix_complex, *evec);			
-		
-		CHECK_MATRIX_COMPLEX(argv[0]); CHECK_MATRIX_COMPLEX(argv[1]);
-		Data_Get_Struct(argv[0], gsl_matrix_complex, *A);
-		Data_Get_Struct(argv[1], gsl_matrix_complex, *B);
-		break;		
-	default:
-		rb_raise(rb_eArgError, "wrong number of arguments (%d for 2, 3 or 5)", argc);
-  }
-	if (*eval == NULL && *evec == NULL) {
-		*eval = gsl_vector_alloc((*A)->size1);
-		*evec = gsl_matrix_complex_alloc((*A)->size1, (*A)->size2);		
-		flag += 1;
-	}
-	if (*w == NULL) {
-		*w = gsl_eigen_genhermv_alloc((*A)->size1);
-		flag += 2;
-	}
-	return flag;
+    CHECK_VECTOR(argv[2]);
+    Data_Get_Struct(argv[2], gsl_vector, *eval);
+    CHECK_MATRIX_COMPLEX(argv[3]);
+    Data_Get_Struct(argv[3], gsl_matrix_complex, *evec);
+
+    CHECK_MATRIX_COMPLEX(argv[0]); CHECK_MATRIX_COMPLEX(argv[1]);
+    Data_Get_Struct(argv[0], gsl_matrix_complex, *A);
+    Data_Get_Struct(argv[1], gsl_matrix_complex, *B);
+    break;
+  default:
+    rb_raise(rb_eArgError, "wrong number of arguments (%d for 2, 3 or 5)", argc);
+  }
+  if (*eval == NULL && *evec == NULL) {
+    *eval = gsl_vector_alloc((*A)->size1);
+    *evec = gsl_matrix_complex_alloc((*A)->size1, (*A)->size2);
+    flag += 1;
+  }
+  if (*w == NULL) {
+    *w = gsl_eigen_genhermv_alloc((*A)->size1);
+    flag += 2;
+  }
+  return flag;
 }
 static VALUE rb_gsl_eigen_gensymm(int argc, VALUE *argv, VALUE obj)
 {
-	gsl_matrix *A = NULL, *B = NULL;
-	gsl_matrix *Atmp = NULL;	
-	gsl_vector *eval = NULL;
-	gsl_eigen_gensymm_workspace *w = NULL;
-	int flag;
-	VALUE veval;
-	flag = check_argv_gensymm(argc, argv, obj, &A, &B, &eval, &w);
+  gsl_matrix *A = NULL, *B = NULL;
+  gsl_matrix *Atmp = NULL;
+  gsl_vector *eval = NULL;
+  gsl_eigen_gensymm_workspace *w = NULL;
+  int flag;
+  VALUE veval = Qnil;
+  flag = check_argv_gensymm(argc, argv, obj, &A, &B, &eval, &w);
   Atmp = make_matrix_clone(A);
-//  Btmp = make_matrix_clone(B);  
-	gsl_eigen_gensymm(Atmp, B, eval, w);
+//  Btmp = make_matrix_clone(B);
+  gsl_eigen_gensymm(Atmp, B, eval, w);
   gsl_matrix_free(Atmp);
-//  gsl_matrix_free(Btmp);  
-	switch (flag) {
-	case 0:
-		veval = argv[2];
-		break;
-	case 1:
-		veval = Data_Wrap_Struct(cgsl_eigen_values, 0, gsl_vector_free, eval);
-		break;
-	case 2:
-		veval = argv[2];
-		gsl_eigen_gensymm_free(w);
-		break;
-	case 3:
-		veval = Data_Wrap_Struct(cgsl_eigen_values, 0, gsl_vector_free, eval);
-		gsl_eigen_gensymm_free(w);
-		break;
-	}
-
-	return veval;
+//  gsl_matrix_free(Btmp);
+  switch (flag) {
+  case 0:
+    veval = argv[2];
+    break;
+  case 1:
+    veval = Data_Wrap_Struct(cgsl_eigen_values, 0, gsl_vector_free, eval);
+    break;
+  case 2:
+    veval = argv[2];
+    gsl_eigen_gensymm_free(w);
+    break;
+  case 3:
+    veval = Data_Wrap_Struct(cgsl_eigen_values, 0, gsl_vector_free, eval);
+    gsl_eigen_gensymm_free(w);
+    break;
+  }
+
+  return veval;
 }
 
 static VALUE rb_gsl_eigen_gensymmv(int argc, VALUE *argv, VALUE obj)
 {
-	gsl_matrix *A = NULL, *B = NULL;
-	gsl_matrix *Atmp = NULL;
-	gsl_vector *eval = NULL;
-	gsl_matrix *evec = NULL;
-	gsl_eigen_gensymmv_workspace *w = NULL;
-	int flag;
-	VALUE veval, vevec;
-	flag = check_argv_gensymmv(argc, argv, obj, &A, &B, &eval, &evec, &w);
+  gsl_matrix *A = NULL, *B = NULL;
+  gsl_matrix *Atmp = NULL;
+  gsl_vector *eval = NULL;
+  gsl_matrix *evec = NULL;
+  gsl_eigen_gensymmv_workspace *w = NULL;
+  int flag;
+  VALUE veval = Qnil, vevec = Qnil;
+  flag = check_argv_gensymmv(argc, argv, obj, &A, &B, &eval, &evec, &w);
   Atmp = make_matrix_clone(A);
-//  Btmp = make_matrix_clone(B);  	
-	gsl_eigen_gensymmv(Atmp, B, eval, evec, w);
+//  Btmp = make_matrix_clone(B);
+  gsl_eigen_gensymmv(Atmp, B, eval, evec, w);
   gsl_matrix_free(Atmp);
-//  gsl_matrix_free(Btmp);  
-    
-	switch (flag) {
-	case 0:
-		veval = argv[2];
-		vevec = argv[3];		
-		break;
-	case 1:
-		veval = Data_Wrap_Struct(cgsl_eigen_values, 0, gsl_vector_free, eval);
-		vevec = Data_Wrap_Struct(cgsl_eigen_vectors, 0, gsl_matrix_free, evec);		
-		break;
-	case 2:
-		veval = argv[2];
-		vevec = argv[3];
-		gsl_eigen_gensymmv_free(w);
-	  break;
-	case 3:
-		veval = Data_Wrap_Struct(cgsl_eigen_values, 0, gsl_vector_free, eval);
-		vevec = Data_Wrap_Struct(cgsl_eigen_vectors, 0, gsl_matrix_free, evec);	
-		gsl_eigen_gensymmv_free(w);
-		break;
-	}
-
-	return rb_ary_new3(2, veval, vevec);
+//  gsl_matrix_free(Btmp);
+
+  switch (flag) {
+  case 0:
+    veval = argv[2];
+    vevec = argv[3];
+    break;
+  case 1:
+    veval = Data_Wrap_Struct(cgsl_eigen_values, 0, gsl_vector_free, eval);
+    vevec = Data_Wrap_Struct(cgsl_eigen_vectors, 0, gsl_matrix_free, evec);
+    break;
+  case 2:
+    veval = argv[2];
+    vevec = argv[3];
+    gsl_eigen_gensymmv_free(w);
+    break;
+  case 3:
+    veval = Data_Wrap_Struct(cgsl_eigen_values, 0, gsl_vector_free, eval);
+    vevec = Data_Wrap_Struct(cgsl_eigen_vectors, 0, gsl_matrix_free, evec);
+    gsl_eigen_gensymmv_free(w);
+    break;
+  }
+
+  return rb_ary_new3(2, veval, vevec);
 }
 
 static VALUE rb_gsl_eigen_genherm(int argc, VALUE *argv, VALUE obj)
 {
-	gsl_matrix_complex *A = NULL, *B = NULL;
-	gsl_matrix_complex *Atmp = NULL, *Btmp = NULL;	
-	gsl_vector *eval = NULL;
-	gsl_eigen_genherm_workspace *w = NULL;
-	int flag;
-	VALUE veval;
-	flag = check_argv_genherm(argc, argv, obj, &A, &B, &eval, &w);
+  gsl_matrix_complex *A = NULL, *B = NULL;
+  gsl_matrix_complex *Atmp = NULL, *Btmp = NULL;
+  gsl_vector *eval = NULL;
+  gsl_eigen_genherm_workspace *w = NULL;
+  int flag;
+  VALUE veval = Qnil;
+  flag = check_argv_genherm(argc, argv, obj, &A, &B, &eval, &w);
   Atmp = make_matrix_complex_clone(A);
-  Btmp = make_matrix_complex_clone(B);  
-	gsl_eigen_genherm(Atmp, Btmp, eval, w);
+  Btmp = make_matrix_complex_clone(B);
+  gsl_eigen_genherm(Atmp, Btmp, eval, w);
   gsl_matrix_complex_free(Atmp);
-  gsl_matrix_complex_free(Btmp);  
-	switch (flag) {
-	case 0:
-		veval = argv[2];
-		break;
-	case 1:
-		veval = Data_Wrap_Struct(cgsl_eigen_values, 0, gsl_vector_free, eval);
-		break;
-	case 2:
-		veval = argv[2];
-		gsl_eigen_genherm_free(w);
-		break;
-	case 3:
-		veval = Data_Wrap_Struct(cgsl_eigen_values, 0, gsl_vector_free, eval);
-		gsl_eigen_genherm_free(w);
-		break;
-	}
-
-	return veval;
+  gsl_matrix_complex_free(Btmp);
+  switch (flag) {
+  case 0:
+    veval = argv[2];
+    break;
+  case 1:
+    veval = Data_Wrap_Struct(cgsl_eigen_values, 0, gsl_vector_free, eval);
+    break;
+  case 2:
+    veval = argv[2];
+    gsl_eigen_genherm_free(w);
+    break;
+  case 3:
+    veval = Data_Wrap_Struct(cgsl_eigen_values, 0, gsl_vector_free, eval);
+    gsl_eigen_genherm_free(w);
+    break;
+  }
+
+  return veval;
 }
 
 static VALUE rb_gsl_eigen_genhermv(int argc, VALUE *argv, VALUE obj)
 {
-	gsl_matrix_complex *A = NULL, *B = NULL;
-	gsl_matrix_complex *Atmp = NULL, *Btmp = NULL;		
-	gsl_vector *eval = NULL;
-	gsl_matrix_complex *evec = NULL;
-	gsl_eigen_genhermv_workspace *w = NULL;
-	int flag;
-	VALUE veval, vevec;
-	flag = check_argv_genhermv(argc, argv, obj, &A, &B, &eval, &evec, &w);
+  gsl_matrix_complex *A = NULL, *B = NULL;
+  gsl_matrix_complex *Atmp = NULL, *Btmp = NULL;
+  gsl_vector *eval = NULL;
+  gsl_matrix_complex *evec = NULL;
+  gsl_eigen_genhermv_workspace *w = NULL;
+  int flag;
+  VALUE veval = Qnil, vevec = Qnil;
+  flag = check_argv_genhermv(argc, argv, obj, &A, &B, &eval, &evec, &w);
   Atmp = make_matrix_complex_clone(A);
-  Btmp = make_matrix_complex_clone(B);  	
-	gsl_eigen_genhermv(Atmp, Btmp, eval, evec, w);
+  Btmp = make_matrix_complex_clone(B);
+  gsl_eigen_genhermv(Atmp, Btmp, eval, evec, w);
   gsl_matrix_complex_free(Atmp);
-  gsl_matrix_complex_free(Btmp);  
-    
-	switch (flag) {