rb-gsl 1.16.0.4 → 1.16.0.5

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

@@ -18,9 +18,7 @@ EXTERN VALUE mgsl_linalg;
 EXTERN VALUE cgsl_complex;
 
 static VALUE cgsl_matrix_complex_LU;
-#ifdef GSL_1_10_LATER
 static VALUE cgsl_matrix_complex_C;
-#endif
 
 VALUE rb_gsl_linalg_complex_LU_decomp(int argc, VALUE *argv, VALUE obj)
 {
@@ -35,7 +33,7 @@ VALUE rb_gsl_linalg_complex_LU_decomp(int argc, VALUE *argv, VALUE obj)
   case T_CLASS:
   case T_OBJECT:
     if (argc != 1) rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)",
-			    argc);
+                            argc);
     CHECK_MATRIX_COMPLEX(argv[0]);
     Data_Get_Struct(argv[0], gsl_matrix_complex, m);
     itmp = 1;
@@ -81,7 +79,7 @@ VALUE rb_gsl_linalg_complex_LU_decomp2(int argc, VALUE *argv, VALUE obj)
   case T_CLASS:
   case T_OBJECT:
     if (argc != 1) rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)",
-			    argc);
+                            argc);
     CHECK_MATRIX_COMPLEX(argv[0]);
     Data_Get_Struct(argv[0], gsl_matrix_complex, m);
     itmp = 1;
@@ -100,13 +98,13 @@ VALUE rb_gsl_linalg_complex_LU_decomp2(int argc, VALUE *argv, VALUE obj)
     p = gsl_permutation_alloc(size);
     gsl_linalg_complex_LU_decomp(mnew, p, &signum);
     obj2 = Data_Wrap_Struct(cgsl_permutation, 0, gsl_permutation_free, p);
-    return rb_ary_new3(3, objm ,obj2, INT2FIX(signum));
+    return rb_ary_new3(3, objm,obj2, INT2FIX(signum));
     break;
   case 1:  /* when a permutation object is given */
     CHECK_PERMUTATION(argv[itmp]);
     Data_Get_Struct(argv[itmp], gsl_permutation, p);
     gsl_linalg_complex_LU_decomp(m, p, &signum);
-    return rb_ary_new3(3, objm , argv[itmp], INT2FIX(signum));
+    return rb_ary_new3(3, objm, argv[itmp], INT2FIX(signum));
     break;
   default:
     rb_raise(rb_eArgError, "Usage: LU_decomp!() or LU_decomp!(permutation)");
@@ -119,14 +117,13 @@ static VALUE rb_gsl_linalg_complex_LU_solve(int argc, VALUE *argv, VALUE obj)
   gsl_permutation *p = NULL;
   gsl_vector_complex *b = NULL, *x = NULL;
   int flagm = 0, flagx = 0, itmp, signum;
-  
+
   switch (TYPE(obj)) {
   case T_MODULE:
   case T_CLASS:
   case T_OBJECT:
-    if (argc < 2 || argc > 4) 
+    if (argc < 2 || argc > 4)
       rb_raise(rb_eArgError, "Usage: solve(m, b), solve(m, b, x), solve(lu, p, b), solve(lu, p, b, x)");
-
     CHECK_MATRIX(argv[0]);
     Data_Get_Struct(argv[0], gsl_matrix_complex, m);
     if (CLASS_OF(argv[0]) != cgsl_matrix_complex_LU) {
@@ -139,7 +136,7 @@ static VALUE rb_gsl_linalg_complex_LU_solve(int argc, VALUE *argv, VALUE obj)
     itmp = 1;
     break;
   default:
-    if (argc < 1 || argc > 3) 
+    if (argc < 1 || argc > 3)
       rb_raise(rb_eArgError, "Usage: LU_solve(b), LU_solve(p, b), LU_solve(b, x), solve(p, b, x)");
     Data_Get_Struct(obj, gsl_matrix_complex, m);
     if (CLASS_OF(obj) != cgsl_matrix_complex_LU) {
@@ -185,7 +182,7 @@ static VALUE rb_gsl_linalg_complex_LU_svx(int argc, VALUE *argv, VALUE obj)
   gsl_permutation *p = NULL;
   gsl_vector_complex *x = NULL;
   int flagm = 0, itmp, signum;
-  
+
   switch (TYPE(obj)) {
   case T_MODULE:
   case T_CLASS:
@@ -232,8 +229,8 @@ static VALUE rb_gsl_linalg_complex_LU_svx(int argc, VALUE *argv, VALUE obj)
 }
 
 static VALUE rb_gsl_linalg_complex_LU_refine(VALUE obj, VALUE vm,
-					     VALUE lu, VALUE pp, VALUE bb,
-					     VALUE xx)
+                                             VALUE lu, VALUE pp, VALUE bb,
+                                             VALUE xx)
 {
   gsl_matrix_complex *m = NULL, *mlu = NULL;
   gsl_permutation *p = NULL;
@@ -306,7 +303,6 @@ static VALUE rb_gsl_linalg_complex_LU_invert(int argc, VALUE *argv, VALUE obj)
   }
   return Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, inverse);
 }
-#ifdef GSL_1_1_1_LATER
 static VALUE rb_gsl_linalg_complex_LU_det(int argc, VALUE *argv, VALUE obj)
 {
   gsl_matrix_complex *m = NULL, *mtmp = NULL;
@@ -389,7 +385,7 @@ static VALUE rb_gsl_linalg_complex_LU_lndet(int argc, VALUE *argv, VALUE obj)
   if (flagm == 1) {
     p = gsl_permutation_alloc(m->size1);
     gsl_linalg_complex_LU_decomp(mtmp, p, &signum);
-  } 
+  }
   lndet = gsl_linalg_complex_LU_lndet(mtmp);
   if (flagm == 1) {
     gsl_matrix_complex_free(mtmp);
@@ -446,9 +442,6 @@ static VALUE rb_gsl_linalg_complex_LU_sgndet(int argc, VALUE *argv, VALUE obj)
   }
   return vz;
 }
-#endif
-
-#ifdef GSL_1_10_LATER
 
 static VALUE rb_gsl_linalg_cholesky_decomp(int argc, VALUE *argv, VALUE obj)
 {
@@ -456,7 +449,7 @@ static VALUE rb_gsl_linalg_cholesky_decomp(int argc, VALUE *argv, VALUE obj)
   switch(TYPE(obj)) {
   case T_MODULE:  case T_CLASS:  case T_OBJECT:
     if (argc != 1) rb_raise(rb_eArgError, "wrong number of argument (%d for 1)",
-			    argc);
+                            argc);
     CHECK_MATRIX_COMPLEX(argv[0]);
     Data_Get_Struct(argv[0], gsl_matrix_complex, Atmp);
     break;
@@ -479,13 +472,13 @@ static VALUE rb_gsl_linalg_cholesky_solve(int argc, VALUE *argv, VALUE obj)
   switch(TYPE(obj)) {
   case T_MODULE:  case T_CLASS:  case T_OBJECT:
     if (argc != 2) rb_raise(rb_eArgError, "wrong number of argument (%d for 2)",
-			    argc);
+                            argc);
     vA = argv[0];
     vb = argv[1];
     break;
   default:
     if (argc != 1) rb_raise(rb_eArgError, "wrong number of argument (%d for 1)",
-			    argc);
+                            argc);
     vA = obj;
     vb = argv[0];
     break;
@@ -519,13 +512,13 @@ static VALUE rb_gsl_linalg_cholesky_svx(int argc, VALUE *argv, VALUE obj)
   switch(TYPE(obj)) {
   case T_MODULE:  case T_CLASS:  case T_OBJECT:
     if (argc != 2) rb_raise(rb_eArgError, "wrong number of argument (%d for 2)",
-			    argc);
+                            argc);
     vA = argv[0];
     vb = argv[1];
     break;
   default:
     if (argc != 1) rb_raise(rb_eArgError, "wrong number of argument (%d for 1)",
-			    argc);
+                            argc);
     vA = obj;
     vb = argv[0];
     break;
@@ -572,7 +565,7 @@ static VALUE rb_gsl_linalg_complex_householder_hm(VALUE obj, VALUE t, VALUE vv,
   gsl_vector_complex *v = NULL;
   gsl_complex *tau;
   gsl_matrix_complex *A = NULL;
-  CHECK_COMPLEX(t);  
+  CHECK_COMPLEX(t);
   CHECK_VECTOR_COMPLEX(vv);
   CHECK_MATRIX_COMPLEX(aa);
   Data_Get_Struct(t, gsl_complex, tau);
@@ -587,7 +580,7 @@ static VALUE rb_gsl_linalg_complex_householder_mh(VALUE obj, VALUE t, VALUE vv,
   gsl_vector_complex *v = NULL;
   gsl_complex *tau;
   gsl_matrix_complex *A = NULL;
-  CHECK_COMPLEX(t);  
+  CHECK_COMPLEX(t);
   CHECK_VECTOR_COMPLEX(vv);
   CHECK_MATRIX_COMPLEX(aa);
   Data_Get_Struct(t, gsl_complex, tau);
@@ -601,7 +594,7 @@ static VALUE rb_gsl_linalg_complex_householder_hv(VALUE obj, VALUE t, VALUE vv,
 {
   gsl_vector_complex *v = NULL, *w = NULL;
   gsl_complex *tau;
-  CHECK_COMPLEX(t);    
+  CHECK_COMPLEX(t);
   CHECK_VECTOR_COMPLEX(vv);
   CHECK_VECTOR_COMPLEX(ww);
   Data_Get_Struct(t, gsl_complex, tau);
@@ -610,103 +603,97 @@ static VALUE rb_gsl_linalg_complex_householder_hv(VALUE obj, VALUE t, VALUE vv,
   gsl_linalg_complex_householder_hv(*tau, v, w);
   return ww;
 }
-#endif
 
 void Init_gsl_linalg_complex(VALUE module)
 {
   VALUE mgsl_linalg_complex;
   VALUE mgsl_linalg_complex_LU;
-#ifdef GSL_1_10_LATER
   VALUE mgsl_linalg_complex_chol, mgsl_linalg_complex_Householder;
-#endif
 
   mgsl_linalg_complex = rb_define_module_under(module, "Complex");
   mgsl_linalg_complex_LU = rb_define_module_under(mgsl_linalg_complex, "LU");
 
   cgsl_matrix_complex_LU = rb_define_class_under(mgsl_linalg_complex_LU,
-						 "LUMatrix", cgsl_matrix_complex);
+                                                 "LUMatrix", cgsl_matrix_complex);
 
   rb_define_singleton_method(mgsl_linalg_complex, "LU_decomp!",
-			     rb_gsl_linalg_complex_LU_decomp, -1);
+                             rb_gsl_linalg_complex_LU_decomp, -1);
   rb_define_singleton_method(mgsl_linalg_complex_LU, "decomp!",
-			     rb_gsl_linalg_complex_LU_decomp, -1);
-  rb_define_method(cgsl_matrix_complex, "LU_decomp!", 
-		   rb_gsl_linalg_complex_LU_decomp, -1);
+                             rb_gsl_linalg_complex_LU_decomp, -1);
+  rb_define_method(cgsl_matrix_complex, "LU_decomp!",
+                   rb_gsl_linalg_complex_LU_decomp, -1);
   rb_define_alias(cgsl_matrix_complex, "decomp!", "LU_decomp!");
 
   rb_define_singleton_method(mgsl_linalg_complex, "LU_decomp",
-			     rb_gsl_linalg_complex_LU_decomp2, -1);
+                             rb_gsl_linalg_complex_LU_decomp2, -1);
   rb_define_singleton_method(mgsl_linalg_complex_LU, "decomp",
-			     rb_gsl_linalg_complex_LU_decomp2, -1);
-  rb_define_method(cgsl_matrix_complex, "LU_decomp", 
-		   rb_gsl_linalg_complex_LU_decomp2, -1);
+                             rb_gsl_linalg_complex_LU_decomp2, -1);
+  rb_define_method(cgsl_matrix_complex, "LU_decomp",
+                   rb_gsl_linalg_complex_LU_decomp2, -1);
   rb_define_alias(cgsl_matrix_complex, "decomp", "LU_decomp");
 
   rb_define_singleton_method(mgsl_linalg_complex, "LU_solve",
-			     rb_gsl_linalg_complex_LU_solve, -1);
+                             rb_gsl_linalg_complex_LU_solve, -1);
   rb_define_singleton_method(mgsl_linalg_complex_LU, "solve",
-			     rb_gsl_linalg_complex_LU_solve, -1);
-  rb_define_method(cgsl_matrix_complex, "LU_solve", 
-		   rb_gsl_linalg_complex_LU_solve, -1);
-  rb_define_method(cgsl_matrix_complex_LU, "solve", 
-		   rb_gsl_linalg_complex_LU_solve, -1);
+                             rb_gsl_linalg_complex_LU_solve, -1);
+  rb_define_method(cgsl_matrix_complex, "LU_solve",
+                   rb_gsl_linalg_complex_LU_solve, -1);
+  rb_define_method(cgsl_matrix_complex_LU, "solve",
+                   rb_gsl_linalg_complex_LU_solve, -1);
 
   rb_define_singleton_method(mgsl_linalg_complex, "LU_svx",
-			     rb_gsl_linalg_complex_LU_svx, -1);
+                             rb_gsl_linalg_complex_LU_svx, -1);
   rb_define_singleton_method(mgsl_linalg_complex_LU, "svx",
-			     rb_gsl_linalg_complex_LU_svx, -1);
-  rb_define_method(cgsl_matrix_complex, "LU_svx", 
-		   rb_gsl_linalg_complex_LU_svx, -1);
-  rb_define_method(cgsl_matrix_complex_LU, "svx", 
-		   rb_gsl_linalg_complex_LU_svx, -1);
+                             rb_gsl_linalg_complex_LU_svx, -1);
+  rb_define_method(cgsl_matrix_complex, "LU_svx",
+                   rb_gsl_linalg_complex_LU_svx, -1);
+  rb_define_method(cgsl_matrix_complex_LU, "svx",
+                   rb_gsl_linalg_complex_LU_svx, -1);
 
   rb_define_singleton_method(mgsl_linalg_complex, "LU_refine",
-			     rb_gsl_linalg_complex_LU_refine, 5);
+                             rb_gsl_linalg_complex_LU_refine, 5);
   rb_define_singleton_method(mgsl_linalg_complex_LU, "refine",
-			     rb_gsl_linalg_complex_LU_refine, 5);
+                             rb_gsl_linalg_complex_LU_refine, 5);
 
   rb_define_singleton_method(mgsl_linalg_complex, "LU_invert",
-			     rb_gsl_linalg_complex_LU_invert, -1);
+                             rb_gsl_linalg_complex_LU_invert, -1);
   rb_define_singleton_method(mgsl_linalg_complex_LU, "invert",
-			     rb_gsl_linalg_complex_LU_invert, -1);
-  rb_define_method(cgsl_matrix_complex, "LU_invert", 
-		   rb_gsl_linalg_complex_LU_invert, -1);
+                             rb_gsl_linalg_complex_LU_invert, -1);
+  rb_define_method(cgsl_matrix_complex, "LU_invert",
+                   rb_gsl_linalg_complex_LU_invert, -1);
   rb_define_alias(cgsl_matrix_complex, "invert", "LU_invert");
   rb_define_alias(cgsl_matrix_complex, "inv", "LU_invert");
-  rb_define_method(cgsl_matrix_complex_LU, "invert", 
-		   rb_gsl_linalg_complex_LU_invert, -1);
-
-#ifdef GSL_1_1_1_LATER
-  rb_define_singleton_method(mgsl_linalg_complex, "LU_det", 
-			     rb_gsl_linalg_complex_LU_det, -1);
-  rb_define_singleton_method(mgsl_linalg_complex_LU, "det", 
-			     rb_gsl_linalg_complex_LU_det, -1);
+  rb_define_method(cgsl_matrix_complex_LU, "invert",
+                   rb_gsl_linalg_complex_LU_invert, -1);
+
+  rb_define_singleton_method(mgsl_linalg_complex, "LU_det",
+                             rb_gsl_linalg_complex_LU_det, -1);
+  rb_define_singleton_method(mgsl_linalg_complex_LU, "det",
+                             rb_gsl_linalg_complex_LU_det, -1);
   rb_define_method(cgsl_matrix_complex, "LU_det", rb_gsl_linalg_complex_LU_det, -1);
   rb_define_alias(cgsl_matrix_complex, "det", "LU_det");
   rb_define_method(cgsl_matrix_complex_LU, "det", rb_gsl_linalg_complex_LU_det, -1);
 
-  rb_define_singleton_method(mgsl_linalg_complex, "LU_lndet", 
-			     rb_gsl_linalg_complex_LU_lndet, -1);
-  rb_define_singleton_method(mgsl_linalg_complex_LU, "lndet", 
-			     rb_gsl_linalg_complex_LU_lndet, -1);
+  rb_define_singleton_method(mgsl_linalg_complex, "LU_lndet",
+                             rb_gsl_linalg_complex_LU_lndet, -1);
+  rb_define_singleton_method(mgsl_linalg_complex_LU, "lndet",
+                             rb_gsl_linalg_complex_LU_lndet, -1);
   rb_define_method(cgsl_matrix_complex, "LU_lndet", rb_gsl_linalg_complex_LU_lndet, -1);
   rb_define_alias(cgsl_matrix_complex, "lndet", "LU_lndet");
   rb_define_method(cgsl_matrix_complex_LU, "LU_lndet", rb_gsl_linalg_complex_LU_lndet, -1);
 
-  rb_define_singleton_method(mgsl_linalg_complex, "LU_sgndet", 
-			     rb_gsl_linalg_complex_LU_sgndet, -1);
-  rb_define_singleton_method(mgsl_linalg_complex_LU, "sgndet", 
-			     rb_gsl_linalg_complex_LU_sgndet, -1);
+  rb_define_singleton_method(mgsl_linalg_complex, "LU_sgndet",
+                             rb_gsl_linalg_complex_LU_sgndet, -1);
+  rb_define_singleton_method(mgsl_linalg_complex_LU, "sgndet",
+                             rb_gsl_linalg_complex_LU_sgndet, -1);
   rb_define_method(cgsl_matrix_complex, "LU_sgndet", rb_gsl_linalg_complex_LU_sgndet, -1);
   rb_define_alias(cgsl_matrix_complex, "sgndet", "LU_sgndet");
   rb_define_method(cgsl_matrix_complex_LU, "LU_sgndet", rb_gsl_linalg_complex_LU_sgndet, -1);
-#endif
 
-#ifdef GSL_1_10_LATER
   mgsl_linalg_complex_chol = rb_define_module_under(mgsl_linalg_complex, "Cholesky");
-  cgsl_matrix_complex_C = rb_define_class_under(mgsl_linalg_complex_chol, "CholeskyMatrix", cgsl_matrix_complex);    
+  cgsl_matrix_complex_C = rb_define_class_under(mgsl_linalg_complex_chol, "CholeskyMatrix", cgsl_matrix_complex);
   rb_define_singleton_method(mgsl_linalg_complex_chol, "decomp", rb_gsl_linalg_cholesky_decomp, -1);
-  rb_define_method(cgsl_matrix_complex, "cholesky_decomp", rb_gsl_linalg_cholesky_decomp, -1);  
+  rb_define_method(cgsl_matrix_complex, "cholesky_decomp", rb_gsl_linalg_cholesky_decomp, -1);
   rb_define_singleton_method(mgsl_linalg_complex_chol, "solve", rb_gsl_linalg_cholesky_solve, -1);
   rb_define_method(cgsl_matrix_complex, "cholesky_solve", rb_gsl_linalg_cholesky_solve, -1);
   rb_define_method(cgsl_matrix_complex_C, "solve", rb_gsl_linalg_cholesky_solve, -1);
@@ -715,26 +702,25 @@ void Init_gsl_linalg_complex(VALUE module)
   rb_define_method(cgsl_matrix_complex_C, "svx", rb_gsl_linalg_cholesky_svx, -1);
 
   mgsl_linalg_complex_Householder = rb_define_module_under(mgsl_linalg_complex, "Householder");
- rb_define_singleton_method(mgsl_linalg_complex, "householder_transform", 
-			     rb_gsl_linalg_complex_householder_transform, -1);
-  rb_define_singleton_method(mgsl_linalg_complex_Householder, "transform", 
-			     rb_gsl_linalg_complex_householder_transform, -1);
-  rb_define_method(cgsl_vector_complex, "householder_transform", 
-		   rb_gsl_linalg_complex_householder_transform, -1);
-
-  rb_define_singleton_method(mgsl_linalg_complex, "householder_hm", 
-			     rb_gsl_linalg_complex_householder_hm, 3);
-  rb_define_singleton_method(mgsl_linalg_complex_Householder, "hm", 
-			     rb_gsl_linalg_complex_householder_hm, 3);
-
-  rb_define_singleton_method(mgsl_linalg_complex, "householder_mh", 
-			     rb_gsl_linalg_complex_householder_mh, 3);
-  rb_define_singleton_method(mgsl_linalg_complex_Householder, "mh", 
-			     rb_gsl_linalg_complex_householder_mh, 3);
-
-  rb_define_singleton_method(mgsl_linalg_complex, "householder_hv", 
-			     rb_gsl_linalg_complex_householder_hv, 3);
-  rb_define_singleton_method(mgsl_linalg_complex_Householder, "hv", 
-			     rb_gsl_linalg_complex_householder_hv, 3);
-#endif			     
+  rb_define_singleton_method(mgsl_linalg_complex, "householder_transform",
+                             rb_gsl_linalg_complex_householder_transform, -1);
+  rb_define_singleton_method(mgsl_linalg_complex_Householder, "transform",
+                             rb_gsl_linalg_complex_householder_transform, -1);
+  rb_define_method(cgsl_vector_complex, "householder_transform",
+                   rb_gsl_linalg_complex_householder_transform, -1);
+
+  rb_define_singleton_method(mgsl_linalg_complex, "householder_hm",
+                             rb_gsl_linalg_complex_householder_hm, 3);
+  rb_define_singleton_method(mgsl_linalg_complex_Householder, "hm",
+                             rb_gsl_linalg_complex_householder_hm, 3);
+
+  rb_define_singleton_method(mgsl_linalg_complex, "householder_mh",
+                             rb_gsl_linalg_complex_householder_mh, 3);
+  rb_define_singleton_method(mgsl_linalg_complex_Householder, "mh",
+                             rb_gsl_linalg_complex_householder_mh, 3);
+
+  rb_define_singleton_method(mgsl_linalg_complex, "householder_hv",
+                             rb_gsl_linalg_complex_householder_hv, 3);
+  rb_define_singleton_method(mgsl_linalg_complex_Householder, "hv",
+                             rb_gsl_linalg_complex_householder_hv, 3);
 }

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

@@ -12,9 +12,6 @@
 
 #include "include/rb_gsl_math.h"
 #include "include/rb_gsl_complex.h"
-#ifdef HAVE_NARRAY_H
-#include "narray.h"
-#endif
 
 static void rb_gsl_define_const(VALUE module);
 
@@ -124,15 +121,15 @@ VALUE rb_gsl_math_complex_eval(gsl_complex (*func)(gsl_complex), VALUE obj)
     mnew = gsl_matrix_complex_alloc(m->size1, m->size2);
     for (i = 0; i < m->size1; i++) {
       for (j = 0; j < m->size2; j++) {
-	gsl_matrix_complex_set(mnew, i, j, (*func)(gsl_matrix_complex_get(m, i, j)));
+        gsl_matrix_complex_set(mnew, i, j, (*func)(gsl_matrix_complex_get(m, i, j)));
       }
     }
     return Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, mnew);
   } else {
-    rb_raise(rb_eTypeError, 
-	     "wrong argument type %s "
-	     " (GSL::Complex or GSL::Vector::Complex expected)", 
-	     rb_class2name(CLASS_OF(obj)));
+    rb_raise(rb_eTypeError,
+             "wrong argument type %s "
+             " (GSL::Complex or GSL::Vector::Complex expected)",
+             rb_class2name(CLASS_OF(obj)));
   }
 }
 
@@ -140,10 +137,6 @@ static VALUE rb_gsl_math_eval(double (*func)(const double), VALUE xx)
 {
   VALUE x, ary;
   size_t i, size;
-#ifdef HAVE_NARRAY_H
-  struct NARRAY *na;
-  double *ptr1, *ptr2;
-#endif
   if (CLASS_OF(xx) == rb_cRange) xx = rb_gsl_range2ary(xx);
   switch (TYPE(xx)) {
   case T_FIXNUM:
@@ -165,6 +158,8 @@ static VALUE rb_gsl_math_eval(double (*func)(const double), VALUE xx)
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(xx)) {
+      struct NARRAY *na;
+      double *ptr1, *ptr2;
       GetNArray(xx, na);
       ptr1 = (double*) na->ptr;
       size = na->total;
@@ -188,18 +183,14 @@ static VALUE rb_gsl_math_eval(double (*func)(const double), VALUE xx)
 }
 
 static VALUE rb_gsl_math_eval2(double (*func)(const double, const double), VALUE xx,
-			       VALUE yy);
+                               VALUE yy);
 static VALUE rb_gsl_math_eval2(double (*func)(const double, const double), VALUE xx,
-			       VALUE yy)
+                               VALUE yy)
 {
   VALUE x, y, ary;
   size_t i, j, size;
   gsl_vector *v = NULL, *v2 = NULL, *vnew = NULL;
   gsl_matrix *m = NULL, *m2 = NULL, *mnew = NULL;
-#ifdef HAVE_NARRAY_H
-  struct NARRAY *nax, *nay;
-  double *ptr1, *ptr2, *ptr3;
-#endif
   if (CLASS_OF(xx) == rb_cRange) xx = rb_gsl_range2ary(xx);
   switch (TYPE(xx)) {
   case T_FIXNUM:
@@ -226,6 +217,8 @@ static VALUE rb_gsl_math_eval2(double (*func)(const double, const double), VALUE
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(xx)) {
+      struct NARRAY *nax, *nay;
+      double *ptr1, *ptr2, *ptr3;
       GetNArray(xx, nax);
       GetNArray(yy, nay);
       ptr1 = (double*) nax->ptr;
@@ -243,7 +236,7 @@ static VALUE rb_gsl_math_eval2(double (*func)(const double, const double), VALUE
       Data_Get_Struct(yy, gsl_vector, v2);
       vnew = gsl_vector_alloc(v->size);
       for (i = 0; i < v->size; i++) {
-	gsl_vector_set(vnew, i, (*func)(gsl_vector_get(v, i), gsl_vector_get(v2, i)));
+        gsl_vector_set(vnew, i, (*func)(gsl_vector_get(v, i), gsl_vector_get(v2, i)));
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     } else if (MATRIX_P(xx)) {
@@ -252,15 +245,15 @@ static VALUE rb_gsl_math_eval2(double (*func)(const double, const double), VALUE
       Data_Get_Struct(yy, gsl_matrix, m2);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (j = 0; j < m->size2; j++) {
-	  gsl_matrix_set(mnew, i, j, (*func)(gsl_matrix_get(m, i, j), gsl_matrix_get(m2, i, j)));
-	}
+        for (j = 0; j < m->size2; j++) {
+          gsl_matrix_set(mnew, i, j, (*func)(gsl_matrix_get(m, i, j), gsl_matrix_get(m2, i, j)));
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
-      rb_raise(rb_eTypeError, 
-	       "wrong argument type %s "
-	       "(Array or Vector or Matrix expected)", rb_class2name(CLASS_OF(xx)));
+      rb_raise(rb_eTypeError,
+               "wrong argument type %s "
+               "(Array or Vector or Matrix expected)", rb_class2name(CLASS_OF(xx)));
     }
     break;
   }
@@ -287,32 +280,32 @@ static VALUE rb_gsl_hypot(VALUE obj, VALUE x, VALUE y)
 {
   return rb_gsl_math_eval2(gsl_hypot, x, y);
 }
-#ifdef GSL_1_10_LATER
+
 static VALUE rb_gsl_hypot3(VALUE obj, VALUE x, VALUE y, VALUE z)
 {
   Need_Float(x);
   Need_Float(y);
-  Need_Float(z);    
+  Need_Float(z);
   return rb_float_new(gsl_hypot3(NUM2DBL(x), NUM2DBL(y), NUM2DBL(z)));
 }
-#endif
+
 static VALUE rb_gsl_acosh(VALUE obj, VALUE x)
 {
-  if (COMPLEX_P(x) || VECTOR_COMPLEX_P(x) || MATRIX_COMPLEX_P(x)) 
+  if (COMPLEX_P(x) || VECTOR_COMPLEX_P(x) || MATRIX_COMPLEX_P(x))
     return rb_gsl_math_complex_eval(gsl_complex_arccosh, x);
   return rb_gsl_math_eval(gsl_acosh, x);
 }
 
 static VALUE rb_gsl_asinh(VALUE obj, VALUE x)
 {
-  if (COMPLEX_P(x) || VECTOR_COMPLEX_P(x) || MATRIX_COMPLEX_P(x)) 
+  if (COMPLEX_P(x) || VECTOR_COMPLEX_P(x) || MATRIX_COMPLEX_P(x))
     return rb_gsl_math_complex_eval(gsl_complex_arcsinh, x);
   return rb_gsl_math_eval(gsl_asinh, x);
 }
 
 static VALUE rb_gsl_atanh(VALUE obj, VALUE x)
 {
-  if (COMPLEX_P(x) || VECTOR_COMPLEX_P(x) || MATRIX_COMPLEX_P(x)) 
+  if (COMPLEX_P(x) || VECTOR_COMPLEX_P(x) || MATRIX_COMPLEX_P(x))
     return rb_gsl_math_complex_eval(gsl_complex_arctanh, x);
   return rb_gsl_math_eval(gsl_atanh, x);
 }
@@ -328,10 +321,6 @@ VALUE rb_gsl_pow(VALUE obj, VALUE xx, VALUE nn)
   double n;
   gsl_vector *v = NULL, *vnew = NULL;
   gsl_matrix *m = NULL, *mnew = NULL;
-#ifdef HAVE_NARRAY_H
-  struct NARRAY *na;
-  double *ptr1, *ptr2;
-#endif
   if (CLASS_OF(xx) == rb_cRange) xx = rb_gsl_range2ary(xx);
   switch (TYPE(xx)) {
   case T_FIXNUM:
@@ -353,6 +342,8 @@ VALUE rb_gsl_pow(VALUE obj, VALUE xx, VALUE nn)
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(xx)) {
+      struct NARRAY *na;
+      double *ptr1, *ptr2;
       n = NUM2DBL(nn);
       GetNArray(xx, na);
       ptr1 = (double*) na->ptr;
@@ -368,21 +359,21 @@ VALUE rb_gsl_pow(VALUE obj, VALUE xx, VALUE nn)
       Data_Get_Struct(xx, gsl_vector, v);
       vnew = gsl_vector_alloc(v->size);
       for (i = 0; i < v->size; i++) {
-	gsl_vector_set(vnew, i, pow(gsl_vector_get(v, i), n));
+        gsl_vector_set(vnew, i, pow(gsl_vector_get(v, i), n));
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
-    } 
+    }
     if (MATRIX_P(xx)) {
       n = NUM2DBL(nn);
       Data_Get_Struct(xx, gsl_matrix, m);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (j = 0; j < m->size2; j++) {
-	  gsl_matrix_set(mnew, i, j, pow(gsl_matrix_get(m, i, j), n));
-	}
+        for (j = 0; j < m->size2; j++) {
+          gsl_matrix_set(mnew, i, j, pow(gsl_matrix_get(m, i, j), n));
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
-    } 
+    }
     if (COMPLEX_P(xx) || VECTOR_COMPLEX_P(xx) || MATRIX_COMPLEX_P(xx)) {
       argv[0] = xx;
       argv[1] = nn;
@@ -402,10 +393,6 @@ static VALUE rb_gsl_pow_int(VALUE obj, VALUE xx, VALUE nn)
   int n;
   gsl_vector *v = NULL, *vnew = NULL;
   gsl_matrix *m = NULL, *mnew = NULL;
-#ifdef HAVE_NARRAY_H
-  struct NARRAY *na;
-  double *ptr1, *ptr2;
-#endif
 
   if (CLASS_OF(xx) == rb_cRange) xx = rb_gsl_range2ary(xx);
   switch (TYPE(xx)) {
@@ -430,6 +417,8 @@ static VALUE rb_gsl_pow_int(VALUE obj, VALUE xx, VALUE nn)
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(xx)) {
+      struct NARRAY *na;
+      double *ptr1, *ptr2;
       CHECK_FIXNUM(nn);
       n = FIX2INT(nn);
       GetNArray(xx, na);
@@ -447,7 +436,7 @@ static VALUE rb_gsl_pow_int(VALUE obj, VALUE xx, VALUE nn)
       Data_Get_Struct(xx, gsl_vector, v);
       vnew = gsl_vector_alloc(v->size);
       for (i = 0; i < v->size; i++) {
-	gsl_vector_set(vnew, i, gsl_pow_int(gsl_vector_get(v, i), n));
+        gsl_vector_set(vnew, i, gsl_pow_int(gsl_vector_get(v, i), n));
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     } else if (MATRIX_P(xx)) {
@@ -456,9 +445,9 @@ static VALUE rb_gsl_pow_int(VALUE obj, VALUE xx, VALUE nn)
       Data_Get_Struct(xx, gsl_matrix, m);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (j = 0; j < m->size2; j++) {
-	  gsl_matrix_set(mnew, i, j, gsl_pow_int(gsl_matrix_get(m, i, j), n));
-	}
+        for (j = 0; j < m->size2; j++) {
+          gsl_matrix_set(mnew, i, j, gsl_pow_int(gsl_matrix_get(m, i, j), n));
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else if (COMPLEX_P(xx) || VECTOR_COMPLEX_P(xx) || MATRIX_COMPLEX_P(xx)) {
@@ -556,7 +545,6 @@ static VALUE rb_GSL_MAX(VALUE obj, VALUE aa, VALUE bb)
   max = GSL_MAX_DBL(a, b);
   if (gsl_fcmp(max, a, 1.0e-10) == 0) return aa;
   else return bb;
-
 }
 
 static VALUE rb_GSL_MIN(VALUE obj, VALUE aa, VALUE bb)
@@ -587,7 +575,7 @@ static VALUE rb_GSL_MAX_INT(VALUE obj, VALUE aa, VALUE bb)
 {
   if (TYPE(aa) != T_FIXNUM || TYPE(bb) != T_FIXNUM)
     return rb_GSL_MAX(obj, aa, bb);
-  else 
+  else
     return INT2FIX(GSL_MAX_INT(FIX2INT(aa), FIX2INT(bb)));
 }
 
@@ -595,11 +583,10 @@ static VALUE rb_GSL_MIN_INT(VALUE obj, VALUE aa, VALUE bb)
 {
   if (TYPE(aa) != T_FIXNUM || TYPE(bb) != T_FIXNUM)
     return rb_GSL_MIN(obj, aa, bb);
-  return 
+  return
     INT2FIX(GSL_MIN_INT(FIX2INT(aa), FIX2INT(bb)));
 }
 
-#ifdef GSL_1_3_LATER
 static VALUE rb_gsl_ldexp(VALUE obj, VALUE x, VALUE e)
 {
   return rb_float_new(gsl_ldexp(NUM2DBL(x), FIX2INT(e)));
@@ -613,7 +600,6 @@ static VALUE rb_gsl_frexp(VALUE obj, VALUE x)
   val = gsl_frexp(NUM2DBL(x), &e);
   return rb_ary_new3(2, rb_float_new(val), INT2FIX(e));
 }
-#endif
 
 static VALUE rb_gsl_fcmp(int argc, VALUE *argv, VALUE obj)
 {
@@ -621,7 +607,7 @@ static VALUE rb_gsl_fcmp(int argc, VALUE *argv, VALUE obj)
   switch (argc) {
   case 3:
     epsilon = NUM2DBL(argv[2]);
-    /* no break, do next */
+  /* no break, do next */
   case 2:
     a = NUM2DBL(argv[0]);
     b = NUM2DBL(argv[1]);
@@ -641,7 +627,7 @@ static VALUE rb_gsl_equal(int argc, VALUE *argv, VALUE obj)
   switch (argc) {
   case 3:
     epsilon = NUM2DBL(argv[2]);
-    /* no break, do next */
+  /* no break, do next */
   case 2:
     a = NUM2DBL(argv[0]);
     b = NUM2DBL(argv[1]);
@@ -668,14 +654,12 @@ void Init_gsl_math(VALUE module)
   rb_define_module_function(module, "isinf?", rb_gsl_isinf2, 1);
   rb_define_module_function(module, "finite", rb_gsl_finite, 1);
   rb_define_module_function(module, "finite?", rb_gsl_finite2, 1);
-			    
+
   rb_define_module_function(module, "sqrt", rb_gsl_sqrt, 1);
   rb_define_module_function(module, "log1p", rb_gsl_log1p, 1);
   rb_define_module_function(module, "expm1", rb_gsl_expm1, 1);
   rb_define_module_function(module, "hypot", rb_gsl_hypot, 2);
-#ifdef GSL_1_10_LATER
-  rb_define_module_function(module, "hypot3", rb_gsl_hypot3, 3);  
-#endif
+  rb_define_module_function(module, "hypot3", rb_gsl_hypot3, 3);
   rb_define_module_function(module, "acosh", rb_gsl_acosh, 1);
   rb_define_module_function(module, "asinh", rb_gsl_asinh, 1);
   rb_define_module_function(module, "atanh", rb_gsl_atanh, 1);
@@ -691,7 +675,7 @@ void Init_gsl_math(VALUE module)
   rb_define_module_function(module, "pow_9", rb_gsl_pow_9, 1);
   rb_define_module_function(module, "sign", rb_GSL_SIGN, 1);
   rb_define_module_function(module, "SIGN", rb_GSL_SIGN, 1);
-  
+
   rb_define_module_function(module, "is_odd", rb_GSL_IS_ODD, 1);
   rb_define_module_function(module, "IS_ODD", rb_GSL_IS_ODD, 1);
   rb_define_module_function(module, "is_odd?", rb_GSL_IS_ODD2, 1);
@@ -717,8 +701,6 @@ void Init_gsl_math(VALUE module)
 
   rb_define_module_function(module, "fcmp", rb_gsl_fcmp, -1);
   rb_define_singleton_method(module, "equal?", rb_gsl_equal, -1);
-#ifdef GSL_1_3_LATER
   rb_define_module_function(module, "ldexp", rb_gsl_ldexp, 2);
   rb_define_module_function(module, "frexp", rb_gsl_frexp, 1);
-#endif
 }