rb-gsl 1.16.0.4 → 1.16.0.5

data/ext/{gsl → gsl_native}/include/rb_gsl_linalg.h

@@ -14,7 +14,6 @@
 
 #include <gsl/gsl_linalg.h>
 #include <gsl/gsl_math.h>
-#include "rb_gsl_with_narray.h"
 
 VALUE rb_gsl_linalg_complex_LU_decomp(int argc, VALUE *argv, VALUE obj);
 VALUE rb_gsl_linalg_complex_LU_decomp2(int argc, VALUE *argv, VALUE obj);

data/ext/{gsl → gsl_native}/include/rb_gsl_math.h

@@ -15,10 +15,6 @@
 
 #include "rb_gsl.h"
 
-#ifndef GSL_1_3_LATER
-int gsl_fcmp (const double x1, const double x2, const double epsilon);
-#endif
-
 VALUE rb_gsl_math_complex_eval(gsl_complex (*func)(gsl_complex), VALUE obj);
 
 #endif

data/ext/{gsl → gsl_native}/include/rb_gsl_poly.h

@@ -27,7 +27,7 @@ EXTERN VALUE cgsl_rational;
 typedef gsl_vector gsl_poly;
 typedef gsl_vector_int gsl_poly_int;
 /*
-typedef struct ___gsl_rational 
+typedef struct ___gsl_rational
 {
   VALUE num, den;
   gsl_poly *pnum;
@@ -36,7 +36,7 @@ typedef struct ___gsl_rational
 */
 
 int gsl_poly_conv(const double *a, size_t na, const double *b, size_t nb,
-		  double *c, size_t *nc);
+                  double *c, size_t *nc);
 
 gsl_vector* gsl_poly_deconv_vector(const gsl_vector *c, const gsl_vector *a, gsl_vector **r);
 gsl_vector* gsl_poly_deriv(const gsl_vector *v);
@@ -51,7 +51,7 @@ VALUE rb_gsl_poly_complex_solve2(int argc, VALUE *argv, VALUE obj);
 
 
 int gsl_poly_int_conv(const int *a, size_t na, const int *b, size_t nb,
-		  int *c, size_t *nc);
+                      int *c, size_t *nc);
 
 gsl_vector_int* gsl_poly_int_deconv_vector(const gsl_vector_int *c, const gsl_vector_int *a, gsl_vector_int **r);
 gsl_vector_int* gsl_poly_int_deriv(const gsl_vector_int *v);

data/ext/{gsl → gsl_native}/include/rb_gsl_rational.h

@@ -15,7 +15,7 @@
 
 #include "rb_gsl_poly.h"
 
-typedef struct ___gsl_rational 
+typedef struct ___gsl_rational
 {
   VALUE num, den;
   gsl_poly *pnum;

data/ext/{gsl → gsl_native}/include/rb_gsl_sf.h

@@ -13,6 +13,7 @@
 
 #include <gsl/gsl_sf.h>
 #include <gsl/gsl_complex.h>
+#include <gsl/gsl_sf_mathieu.h>
 #include "rb_gsl.h"
 
 EXTERN VALUE cgsl_sf_result, cgsl_sf_result_e10;
@@ -23,56 +24,56 @@ VALUE rb_gsl_sf_eval1(double (*func)(double), VALUE argv);
 VALUE rb_gsl_sf_eval_int_double(double (*func)(int, double), VALUE jj, VALUE argv);
 VALUE rb_gsl_sf_eval_double_double(double (*func)(double, double), VALUE ff, VALUE argv);
 VALUE rb_gsl_sf_eval1_uint(double (*func)(unsigned int), VALUE argv);
-VALUE rb_gsl_sf_eval_double_m(double (*func)(double, gsl_mode_t), VALUE argv, VALUE m);;
-VALUE rb_gsl_sf_eval_int_double_double(double (*func)(int, double, double), VALUE jj, 
-				       VALUE ff, VALUE argv);
+VALUE rb_gsl_sf_eval_double_m(double (*func)(double, gsl_mode_t), VALUE argv, VALUE m);
+VALUE rb_gsl_sf_eval_int_double_double(double (*func)(int, double, double), VALUE jj,
+                                       VALUE ff, VALUE argv);
 VALUE rb_gsl_sf_eval_int_int_double(double (*func)(int, int, double), VALUE jj,
-				    VALUE jj2, VALUE argv);
-VALUE rb_gsl_sf_eval_double3(double (*func)(double, double, double), 
-					   VALUE ff, VALUE ff2, VALUE argv);
-VALUE rb_gsl_sf_eval_double4(double (*func)(double, double, double, double), 
-			     VALUE ff, VALUE ff2, VALUE ff3, VALUE argv);
+                                    VALUE jj2, VALUE argv);
+VALUE rb_gsl_sf_eval_double3(double (*func)(double, double, double),
+                             VALUE ff, VALUE ff2, VALUE argv);
+VALUE rb_gsl_sf_eval_double4(double (*func)(double, double, double, double),
+                             VALUE ff, VALUE ff2, VALUE ff3, VALUE argv);
 VALUE rb_gsl_sf_eval_double_int(double (*func)(double, int), VALUE argv, VALUE jj);
 VALUE rb_gsl_sf_eval1_int(double (*func)(int), VALUE argv);
 VALUE rb_gsl_sf_eval_e(int (*func)(double, gsl_sf_result*), VALUE x);
-VALUE rb_gsl_sf_eval_e_int_double(int (*func)(int, double, gsl_sf_result*), 
-				  VALUE n, VALUE x);
-VALUE rb_gsl_sf_eval_e_int_int_double(int (*func)(int, int, double, gsl_sf_result*), 
-				      VALUE n1, VALUE n2, VALUE x);
-VALUE rb_gsl_sf_eval_e_double2(int (*func)(double, double, gsl_sf_result*), 
-			       VALUE x1, VALUE x2);
+VALUE rb_gsl_sf_eval_e_int_double(int (*func)(int, double, gsl_sf_result*),
+                                  VALUE n, VALUE x);
+VALUE rb_gsl_sf_eval_e_int_int_double(int (*func)(int, int, double, gsl_sf_result*),
+                                      VALUE n1, VALUE n2, VALUE x);
+VALUE rb_gsl_sf_eval_e_double2(int (*func)(double, double, gsl_sf_result*),
+                               VALUE x1, VALUE x2);
 VALUE rb_gsl_sf_eval_e_uint(int (*func)(unsigned int, gsl_sf_result*), VALUE x);
-VALUE rb_gsl_sf_eval_e_int_uint(int (*func)(int, unsigned int, gsl_sf_result*), 
-				VALUE n, VALUE x);
-VALUE rb_gsl_sf_eval_e_double_uint(int (*func)(double, unsigned int, gsl_sf_result*), 
-				   VALUE y, VALUE x);
-VALUE rb_gsl_sf_eval_e_m(int (*func)(double, gsl_mode_t, gsl_sf_result*), 
-			 VALUE x, VALUE m);
-VALUE rb_gsl_sf_eval_e_double2_m(int (*func)(double, double, gsl_mode_t, gsl_sf_result*), 
-				 VALUE x1, VALUE x2, VALUE m);
-VALUE rb_gsl_sf_eval_e_double3_m(int (*func)(double, double, double, gsl_mode_t, gsl_sf_result*), 
-				 VALUE x1, VALUE x2, VALUE x3, VALUE m);
-VALUE rb_gsl_sf_eval_double2_m(double (*func)(double, double, gsl_mode_t), 
-			       VALUE argv, VALUE x2, VALUE m);
-VALUE rb_gsl_sf_eval_double3_m(double (*func)(double, double, double, gsl_mode_t), 
-			       VALUE argv, VALUE x2, VALUE x3, VALUE m);
+VALUE rb_gsl_sf_eval_e_int_uint(int (*func)(int, unsigned int, gsl_sf_result*),
+                                VALUE n, VALUE x);
+VALUE rb_gsl_sf_eval_e_double_uint(int (*func)(double, unsigned int, gsl_sf_result*),
+                                   VALUE y, VALUE x);
+VALUE rb_gsl_sf_eval_e_m(int (*func)(double, gsl_mode_t, gsl_sf_result*),
+                         VALUE x, VALUE m);
+VALUE rb_gsl_sf_eval_e_double2_m(int (*func)(double, double, gsl_mode_t, gsl_sf_result*),
+                                 VALUE x1, VALUE x2, VALUE m);
+VALUE rb_gsl_sf_eval_e_double3_m(int (*func)(double, double, double, gsl_mode_t, gsl_sf_result*),
+                                 VALUE x1, VALUE x2, VALUE x3, VALUE m);
+VALUE rb_gsl_sf_eval_double2_m(double (*func)(double, double, gsl_mode_t),
+                               VALUE argv, VALUE x2, VALUE m);
+VALUE rb_gsl_sf_eval_double3_m(double (*func)(double, double, double, gsl_mode_t),
+                               VALUE argv, VALUE x2, VALUE x3, VALUE m);
 
-VALUE rb_gsl_sf_eval_e_double4_m(int (*func)(double, double, double, double, gsl_mode_t, gsl_sf_result*), 
-				 VALUE x1, VALUE x2, VALUE x3, VALUE x4, VALUE m);
+VALUE rb_gsl_sf_eval_e_double4_m(int (*func)(double, double, double, double, gsl_mode_t, gsl_sf_result*),
+                                 VALUE x1, VALUE x2, VALUE x3, VALUE x4, VALUE m);
 
 VALUE rb_gsl_sf_eval_e_int(int (*func)(int, gsl_sf_result*), VALUE x);
-VALUE rb_gsl_sf_eval_e_double3(int (*func)(double, double, double, gsl_sf_result*), 
-			      VALUE x1, VALUE x2, VALUE x3);
-VALUE rb_gsl_sf_eval_e_int_double2(int (*func)(int, double, double, gsl_sf_result*), 
-				   VALUE n, VALUE x1, VALUE x2);
-VALUE rb_gsl_sf_eval_e_double2(int (*func)(double, double, gsl_sf_result*), 
-			       VALUE x1, VALUE x2);
+VALUE rb_gsl_sf_eval_e_double3(int (*func)(double, double, double, gsl_sf_result*),
+                               VALUE x1, VALUE x2, VALUE x3);
+VALUE rb_gsl_sf_eval_e_int_double2(int (*func)(int, double, double, gsl_sf_result*),
+                                   VALUE n, VALUE x1, VALUE x2);
+VALUE rb_gsl_sf_eval_e_double2(int (*func)(double, double, gsl_sf_result*),
+                               VALUE x1, VALUE x2);
 
 VALUE eval_sf(double (*func)(double, gsl_mode_t), VALUE argv);
 
 VALUE rb_gsl_sf_eval_double4_m(double (*func)(double, double, double, double,
-					      gsl_mode_t), 
-			       VALUE argv, VALUE x2, VALUE x3, VALUE x4, VALUE m);
+                                              gsl_mode_t),
+                               VALUE argv, VALUE x2, VALUE x3, VALUE x4, VALUE m);
 
 VALUE rb_gsl_sf_eval_complex(double (*f)(double), VALUE obj);
 
@@ -104,11 +105,6 @@ void Init_gsl_sf_synchrotron(VALUE module);
 void Init_gsl_sf_transport(VALUE module);
 void Init_gsl_sf_trigonometric(VALUE module);
 void Init_gsl_sf_zeta(VALUE module);
-
-
-#ifdef GSL_1_9_LATER
-#include <gsl/gsl_sf_mathieu.h>
 void Init_sf_mathieu(VALUE module);
-#endif
 
 #endif

data/ext/{gsl → gsl_native}/include/templates_on.h

@@ -173,7 +173,7 @@
 #error unknown BASE_ directive in source.h
 #endif
 
-#define CONCAT2x(a,b) a ## _ ## b 
+#define CONCAT2x(a,b) a ## _ ## b
 #define CONCAT2(a,b) CONCAT2x(a,b)
 #define CONCAT3x(a,b,c) a ## _ ## b ## _ ## c
 #define CONCAT3(a,b,c) CONCAT3x(a,b,c)

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

@@ -15,10 +15,10 @@
 #include "include/rb_gsl_common.h"
 
 #ifndef CHECK_WORKSPACE
-#define CHECK_WORKSPACE(x) if(CLASS_OF(x)!=cgsl_integration_workspace)\
-      rb_raise(rb_eTypeError,\
-      "wrong argument type %s (Integration::Workspace expected)",\
-      rb_class2name(CLASS_OF(x)));
+#define CHECK_WORKSPACE(x) if(CLASS_OF(x)!=cgsl_integration_workspace) \
+    rb_raise(rb_eTypeError, \
+             "wrong argument type %s (Integration::Workspace expected)", \
+             rb_class2name(CLASS_OF(x)));
 #endif
 
 #define EPSABS_DEFAULT 0.0
@@ -30,26 +30,24 @@ static VALUE cgsl_integration_qaws_table, cgsl_integration_qawo_table;
 
 static VALUE cgsl_integration_workspace;
 
-#ifdef GSL_1_14_LATER
 static VALUE cgsl_integration_glfixed_table;
-#endif
 
 static int get_a_b(int argc, VALUE *argv, int argstart, double *a, double *b);
-static int get_epsabs_epsrel(int argc, VALUE *argv, int argstart, 
-			     double *epsabs, double *epsrel);
+static int get_epsabs_epsrel(int argc, VALUE *argv, int argstart,
+                             double *epsabs, double *epsrel);
 static int get_a_b_epsabs_epsrel(int argc, VALUE *argv, int argstart,
-				  double *a, double *b, double *epsabs,
-				  double *epsrel);
+                                 double *a, double *b, double *epsabs,
+                                 double *epsrel);
 static int get_limit_key_workspace(int argc, VALUE *argv, int argstart,
-				   size_t *limit, int *key, 
-				   gsl_integration_workspace **w);
+                                   size_t *limit, int *key,
+                                   gsl_integration_workspace **w);
 static int get_limit_workspace(int argc, VALUE *argv, int argstart,
-				   size_t *limit, 
-			       gsl_integration_workspace **w);
+                               size_t *limit,
+                               gsl_integration_workspace **w);
 static int get_epsabs_epsrel_limit_workspace(int argc, VALUE *argv, int argstart,
-					     double *epsabs, double *epsrel,
-					     size_t *limit,
-					     gsl_integration_workspace **w);
+                                             double *epsabs, double *epsrel,
+                                             size_t *limit,
+                                             gsl_integration_workspace **w);
 
 static int get_a_b(int argc, VALUE *argv, int argstart, double *a, double *b)
 {
@@ -74,8 +72,8 @@ static int get_a_b(int argc, VALUE *argv, int argstart, double *a, double *b)
   return itmp;
 }
 
-static int get_epsabs_epsrel(int argc, VALUE *argv, int argstart, 
-			     double *epsabs, double *epsrel)
+static int get_epsabs_epsrel(int argc, VALUE *argv, int argstart,
+                             double *epsabs, double *epsrel)
 {
   int itmp;
   VALUE aa, bb;
@@ -94,13 +92,13 @@ static int get_epsabs_epsrel(int argc, VALUE *argv, int argstart,
     *epsabs = NUM2DBL(argv[argstart]);
     *epsrel = NUM2DBL(argv[argstart+1]);
     itmp = 2;
-  } 
-  return  argstart + itmp;
+  }
+  return argstart + itmp;
 }
 
 static int get_a_b_epsabs_epsrel(int argc, VALUE *argv, int argstart,
-				  double *a, double *b, double *epsabs,
-				  double *epsrel)
+                                 double *a, double *b, double *epsabs,
+                                 double *epsrel)
 {
   int itmp;
   *epsabs = EPSABS_DEFAULT;
@@ -111,8 +109,8 @@ static int get_a_b_epsabs_epsrel(int argc, VALUE *argv, int argstart,
 }
 
 static int get_limit_key_workspace(int argc, VALUE *argv, int argstart,
-				   size_t *limit, int *key, 
-				   gsl_integration_workspace **w)
+                                   size_t *limit, int *key,
+                                   gsl_integration_workspace **w)
 {
   int flag = 0;
   switch (argc-argstart) {
@@ -163,8 +161,8 @@ static int get_limit_key_workspace(int argc, VALUE *argv, int argstart,
 }
 
 static int get_limit_workspace(int argc, VALUE *argv, int argstart,
-				   size_t *limit, 
-				   gsl_integration_workspace **w)
+                               size_t *limit,
+                               gsl_integration_workspace **w)
 {
   int flag = 0;
 
@@ -207,9 +205,9 @@ static int get_limit_workspace(int argc, VALUE *argv, int argstart,
 }
 
 static int get_epsabs_epsrel_limit_workspace(int argc, VALUE *argv, int argstart,
-					     double *epsabs, double *epsrel,
-					     size_t *limit,
-					     gsl_integration_workspace **w)
+                                             double *epsabs, double *epsrel,
+                                             size_t *limit,
+                                             gsl_integration_workspace **w)
 {
   int flag = 0, itmp;
   itmp = argstart;
@@ -269,9 +267,8 @@ static VALUE rb_gsl_integration_qng(int argc, VALUE *argv, VALUE obj)
   // local variable 'itmp' declared and set, but never used
   //int itmp;
 
-  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);
   switch (TYPE(obj)) {
   case T_MODULE:  case T_CLASS:  case T_OBJECT:
     CHECK_FUNCTION(argv[0]);
@@ -283,12 +280,12 @@ static VALUE rb_gsl_integration_qng(int argc, VALUE *argv, VALUE obj)
     Data_Get_Struct(obj, gsl_function, F);
     break;
   }
-  status = gsl_integration_qng(F, a, b, epsabs, epsrel, 
-			       &result, &abserr, &neval);
-  
+  status = gsl_integration_qng(F, a, b, epsabs, epsrel,
+                               &result, &abserr, &neval);
+
   return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr),
-		     INT2FIX(neval), INT2FIX(status));
-}			    
+                     INT2FIX(neval), INT2FIX(status));
+}
 
 static VALUE rb_gsl_integration_qag(int argc, VALUE *argv, VALUE obj)
 {
@@ -298,9 +295,8 @@ static VALUE rb_gsl_integration_qag(int argc, VALUE *argv, VALUE obj)
   gsl_function *F = NULL;
   gsl_integration_workspace *w = NULL;
   int key = KEY_DEFAULT, status, intervals, itmp, flag = 0;
-  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);
   switch (TYPE(obj)) {
   case T_MODULE:  case T_CLASS:  case T_OBJECT:
     CHECK_FUNCTION(argv[0]);
@@ -325,26 +321,26 @@ static VALUE rb_gsl_integration_qag(int argc, VALUE *argv, VALUE obj)
   default:
     if (argc == 2) {
       if (FIXNUM_P(argv[1])) {
-	key = FIX2INT(argv[1]);
-	w = gsl_integration_workspace_alloc(limit);
-	flag = 1;
+        key = FIX2INT(argv[1]);
+        w = gsl_integration_workspace_alloc(limit);
+        flag = 1;
       } else if (rb_obj_is_kind_of(argv[1], cgsl_integration_workspace)) {
-	Data_Get_Struct(argv[1], gsl_integration_workspace, w);
-	flag = 0;
+        Data_Get_Struct(argv[1], gsl_integration_workspace, w);
+        flag = 0;
       } else {
-	rb_raise(rb_eTypeError, "Key or Workspace expected");
+        rb_raise(rb_eTypeError, "Key or Workspace expected");
       }
       itmp = get_a_b(argc, argv, 0, &a, &b);
     } else if (argc == 3) {
       if (FIXNUM_P(argv[2])) {
-	key = FIX2INT(argv[2]);
-	w = gsl_integration_workspace_alloc(limit);
-	flag = 1;
+        key = FIX2INT(argv[2]);
+        w = gsl_integration_workspace_alloc(limit);
+        flag = 1;
       } else if (rb_obj_is_kind_of(argv[2], cgsl_integration_workspace)) {
-	Data_Get_Struct(argv[2], gsl_integration_workspace, w);
-	flag = 0;
+        Data_Get_Struct(argv[2], gsl_integration_workspace, w);
+        flag = 0;
       } else {
-	rb_raise(rb_eTypeError, "Key or Workspace expected");
+        rb_raise(rb_eTypeError, "Key or Workspace expected");
       }
       itmp = get_a_b(argc, argv, 0, &a, &b);
     } else {
@@ -354,14 +350,13 @@ static VALUE rb_gsl_integration_qag(int argc, VALUE *argv, VALUE obj)
     Data_Get_Struct(obj, gsl_function, F);
     break;
   }
-  status = gsl_integration_qag(F, a, b, epsabs, epsrel, limit, key, w, 
-			       &result, &abserr);
+  status = gsl_integration_qag(F, a, b, epsabs, epsrel, limit, key, w,
+                               &result, &abserr);
   intervals = w->size;
   if (flag == 1) gsl_integration_workspace_free(w);
-
-  return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr), 
-		     INT2FIX(intervals), INT2FIX(status));
-}			    
+  return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr),
+                     INT2FIX(intervals), INT2FIX(status));
+}
 
 static VALUE rb_gsl_integration_qags(int argc, VALUE *argv, VALUE obj)
 {
@@ -383,16 +378,15 @@ static VALUE rb_gsl_integration_qags(int argc, VALUE *argv, VALUE obj)
     break;
   }
   flag = get_epsabs_epsrel_limit_workspace(argc, argv, itmp, &epsabs, &epsrel,
-					   &limit, &w);
- 
-  status = gsl_integration_qags(F, a, b, epsabs, epsrel, limit, w, 
-				&result, &abserr);
+                                           &limit, &w);
+
+  status = gsl_integration_qags(F, a, b, epsabs, epsrel, limit, w,
+                                &result, &abserr);
   intervals = w->size;
   if (flag == 1) gsl_integration_workspace_free(w);
-
-  return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr), 
-      INT2FIX(intervals), INT2FIX(status));
-}			    
+  return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr),
+                     INT2FIX(intervals), INT2FIX(status));
+}
 
 static VALUE rb_gsl_integration_qagp(int argc, VALUE *argv, VALUE obj)
 {
@@ -423,17 +417,16 @@ static VALUE rb_gsl_integration_qagp(int argc, VALUE *argv, VALUE obj)
   }
   itmp += 1;
   flag = get_epsabs_epsrel_limit_workspace(argc, argv, itmp, &epsabs, &epsrel,
-					   &limit, &w);
+                                           &limit, &w);
 
-  status = gsl_integration_qagp(F, v->data, v->size, epsabs, epsrel, limit, w, 
-				&result, &abserr);
+  status = gsl_integration_qagp(F, v->data, v->size, epsabs, epsrel, limit, w,
+                                &result, &abserr);
   intervals = w->size;
   if (flag == 1) gsl_integration_workspace_free(w);
   if (flag2 == 1) gsl_vector_free(v);
-
-  return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr), 
-		     INT2FIX(intervals), INT2FIX(status));
-}			    
+  return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr),
+                     INT2FIX(intervals), INT2FIX(status));
+}
 
 /* (-infty --- +infty) */
 static VALUE rb_gsl_integration_qagi(int argc, VALUE *argv, VALUE obj)
@@ -456,15 +449,14 @@ static VALUE rb_gsl_integration_qagi(int argc, VALUE *argv, VALUE obj)
     break;
   }
   flag = get_epsabs_epsrel_limit_workspace(argc, argv, itmp, &epsabs, &epsrel,
-					   &limit, &w);
-  status = gsl_integration_qagi(F, epsabs, epsrel, limit, w, 
-				&result, &abserr);
+                                           &limit, &w);
+  status = gsl_integration_qagi(F, epsabs, epsrel, limit, w,
+                                &result, &abserr);
   intervals = w->size;
   if (flag == 1) gsl_integration_workspace_free(w);
-
-  return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr), 
-		    INT2FIX(intervals), INT2FIX(status));
-}			    
+  return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr),
+                     INT2FIX(intervals), INT2FIX(status));
+}
 
 /* (a --- +infty) */
 static VALUE rb_gsl_integration_qagiu(int argc, VALUE *argv, VALUE obj)
@@ -490,15 +482,14 @@ static VALUE rb_gsl_integration_qagiu(int argc, VALUE *argv, VALUE obj)
   a = NUM2DBL(argv[itmp]);
   itmp += 1;
   flag = get_epsabs_epsrel_limit_workspace(argc, argv, itmp, &epsabs, &epsrel,
-					   &limit, &w);
-  status = gsl_integration_qagiu(F, a, epsabs, epsrel, limit, w, 
-				&result, &abserr);
+                                           &limit, &w);
+  status = gsl_integration_qagiu(F, a, epsabs, epsrel, limit, w,
+                                 &result, &abserr);
   intervals = w->size;
   if (flag == 1) gsl_integration_workspace_free(w);
-
-  return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr), 
-		     INT2FIX(intervals), INT2FIX(status));
-}			    
+  return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr),
+                     INT2FIX(intervals), INT2FIX(status));
+}
 
 /* (-infty --- b) */
 static VALUE rb_gsl_integration_qagil(int argc, VALUE *argv, VALUE obj)
@@ -523,17 +514,16 @@ static VALUE rb_gsl_integration_qagil(int argc, VALUE *argv, VALUE obj)
   Need_Float(argv[itmp]);
   b = NUM2DBL(argv[itmp]);
   flag = get_epsabs_epsrel_limit_workspace(argc, argv, itmp+1, &epsabs, &epsrel,
-					   &limit, &w);
+                                           &limit, &w);
   Data_Get_Struct(obj, gsl_function, F);
 
-  status = gsl_integration_qagil(F, b, epsabs, epsrel, limit, w, 
-				&result, &abserr);
+  status = gsl_integration_qagil(F, b, epsabs, epsrel, limit, w,
+                                 &result, &abserr);
   intervals = w->size;
   if (flag == 1) gsl_integration_workspace_free(w);
-
-  return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr), 
-		     INT2FIX(intervals), INT2FIX(status));
-}			    
+  return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr),
+                     INT2FIX(intervals), INT2FIX(status));
+}
 
 static VALUE rb_gsl_integration_qawc(int argc, VALUE *argv, VALUE obj)
 {
@@ -559,14 +549,13 @@ static VALUE rb_gsl_integration_qawc(int argc, VALUE *argv, VALUE obj)
   Need_Float(argv[itmp]);
   c = NUM2DBL(argv[itmp]);
   flag = get_epsabs_epsrel_limit_workspace(argc, argv, itmp+1, &epsabs, &epsrel,
-					   &limit, &w);
+                                           &limit, &w);
   status = gsl_integration_qawc(F, a, b, c, epsabs, epsrel, limit, w, &result, &abserr);
   intervals = w->size;
   if (flag == 1) gsl_integration_workspace_free(w);
-
   return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr), INT2FIX(intervals),
-		     INT2FIX(status));
-}			    
+                     INT2FIX(status));
+}
 
 VALUE rb_gsl_integration_qaws_table_alloc(int argc, VALUE *argv, VALUE klass)
 {
@@ -587,7 +576,7 @@ VALUE rb_gsl_integration_qaws_table_alloc(int argc, VALUE *argv, VALUE klass)
     nu = argv[3];
   }
   t = gsl_integration_qaws_table_alloc(NUM2DBL(alpha), NUM2DBL(beta),
-				       FIX2INT(mu), FIX2INT(nu));
+                                       FIX2INT(mu), FIX2INT(nu));
   return Data_Wrap_Struct(klass, 0, gsl_integration_qaws_table_free, t);
 }
 
@@ -614,7 +603,6 @@ static VALUE rb_gsl_integration_qaws_table_set(int argc, VALUE *argv, VALUE obj)
   } else {
     rb_raise(rb_eTypeError, "wrong argument type %s", rb_class2name(CLASS_OF(argv[0])));
   }
-
   gsl_integration_qaws_table_set(t, alpha, beta, mu, nu);
   return obj;
 }
@@ -637,8 +625,8 @@ static VALUE rb_gsl_ary_to_integration_qaws_table(VALUE ary)
 {
   gsl_integration_qaws_table *t = NULL;
   t = make_qaws_table(ary);
-  return Data_Wrap_Struct(cgsl_integration_qaws_table, 
-			  0, gsl_integration_qaws_table_free, t);
+  return Data_Wrap_Struct(cgsl_integration_qaws_table,
+                          0, gsl_integration_qaws_table_free, t);
 }
 
 static gsl_integration_qaws_table* make_qaws_table(VALUE ary)
@@ -682,33 +670,30 @@ static VALUE rb_gsl_integration_qaws(int argc, VALUE *argv, VALUE obj)
   } else {
     flagt = 0;
     if (!rb_obj_is_kind_of(argv[itmp], cgsl_integration_qaws_table))
-	rb_raise(rb_eTypeError, "Integration::QAWS_Table expected");
-
+      rb_raise(rb_eTypeError, "Integration::QAWS_Table expected");
     Data_Get_Struct(argv[itmp], gsl_integration_qaws_table, t);
   }
   flag = get_epsabs_epsrel_limit_workspace(argc, argv, itmp+1, &epsabs, &epsrel,
-					   &limit, &w);
+                                           &limit, &w);
   status = gsl_integration_qaws(F, a, b, t, epsabs, epsrel, limit, w, &result, &abserr);
   intervals = w->size;
   if (flag == 1) gsl_integration_workspace_free(w);
   if (flagt == 1) gsl_integration_qaws_table_free(t);
-
   return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr), INT2FIX(intervals),
-		     INT2FIX(status));
-}			    
+                     INT2FIX(status));
+}
 
 static gsl_integration_qawo_table* make_qawo_table(VALUE ary);
 
 static VALUE rb_gsl_integration_qawo_table_alloc(int argc, VALUE *argv,
-						 VALUE klass)
+                                                 VALUE klass)
 {
   gsl_integration_qawo_table *t = NULL;
   double omega, L;
   enum gsl_integration_qawo_enum sine;
   size_t n;
-  if (argc != 1 && argc != 4) 
+  if (argc != 1 && argc != 4)
     rb_raise(rb_eArgError, "wrong nubmer of arguments (%d for 1 or 4)", argc);
-
   if (TYPE(argv[0]) == T_ARRAY) {
     omega = NUM2DBL(rb_ary_entry(argv[0], 0));
     L = NUM2DBL(rb_ary_entry(argv[0], 1));
@@ -720,9 +705,8 @@ static VALUE rb_gsl_integration_qawo_table_alloc(int argc, VALUE *argv,
     sine = FIX2INT(argv[2]);
     n = FIX2INT(argv[3]);
   }
-
   t = gsl_integration_qawo_table_alloc(omega, L, sine, n);
-				       
+
   return Data_Wrap_Struct(klass, 0, gsl_integration_qawo_table_free, t);
 }
 
@@ -743,8 +727,8 @@ static VALUE rb_gsl_ary_to_integration_qawo_table(VALUE ary)
 {
   gsl_integration_qawo_table *t = NULL;
   t = make_qawo_table(ary);
-  return Data_Wrap_Struct(cgsl_integration_qawo_table, 
-			  0, gsl_integration_qawo_table_free, t);
+  return Data_Wrap_Struct(cgsl_integration_qawo_table,
+                          0, gsl_integration_qawo_table_free, t);
 }
 
 static gsl_integration_qawo_table* make_qawo_table(VALUE ary)
@@ -806,7 +790,7 @@ static VALUE rb_gsl_integration_qawo(int argc, VALUE *argv, VALUE obj)
   int status, intervals, itmp, flag = 0, flagt = 0;
   switch (TYPE(obj)) {
   case T_MODULE:  case T_CLASS:  case T_OBJECT:
-  if (argc < 2) rb_raise(rb_eArgError, "too few arguments");
+    if (argc < 2) rb_raise(rb_eArgError, "too few arguments");
     CHECK_FUNCTION(argv[0]);
     Data_Get_Struct(argv[0], gsl_function, F);
     itmp = 1;
@@ -821,18 +805,17 @@ static VALUE rb_gsl_integration_qawo(int argc, VALUE *argv, VALUE obj)
   a = NUM2DBL(argv[itmp]);
   flagt = get_qawo_table(argv[argc-1], &t);
   flag = get_epsabs_epsrel_limit_workspace(argc-1, argv, itmp+1, &epsabs, &epsrel,
-					   &limit, &w);
+                                           &limit, &w);
   status = gsl_integration_qawo(F, a, epsabs, epsrel, limit, w, t, &result, &abserr);
   intervals = w->size;
   if (flag == 1) gsl_integration_workspace_free(w);
   if (flagt == 1) gsl_integration_qawo_table_free(t);
-
   return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr), INT2FIX(intervals),
-		     INT2FIX(status));
-}			    
+                     INT2FIX(status));
+}
 
 static int get_qawo_table(VALUE tt,
-			  gsl_integration_qawo_table **t)
+                          gsl_integration_qawo_table **t)
 {
   int flagt;
 
@@ -879,7 +862,7 @@ static VALUE rb_gsl_integration_qawf(int argc, VALUE *argv, VALUE obj)
     itmp += 1;
   }
   vtmp = argv + itmp;
-  flagt = get_qawo_table(argv[argc-1], &t);    
+  flagt = get_qawo_table(argv[argc-1], &t);
 
   switch (argc - 1 - itmp) {
   case 0:
@@ -920,10 +903,9 @@ static VALUE rb_gsl_integration_qawf(int argc, VALUE *argv, VALUE obj)
     gsl_integration_workspace_free(cw);
   }
   if (flagt == 1) gsl_integration_qawo_table_free(t);
-
-  return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr), 
-		     INT2FIX(intervals), INT2FIX(status));
-}			    
+  return rb_ary_new3(4, rb_float_new(result), rb_float_new(abserr),
+                     INT2FIX(intervals), INT2FIX(status));
+}
 
 
 static void rb_gsl_integration_define_symbols(VALUE module)
@@ -939,14 +921,14 @@ static void rb_gsl_integration_define_symbols(VALUE module)
 }
 
 static VALUE rb_gsl_integration_workspace_alloc(int argc, VALUE *argv,
-						VALUE klass)
+                                                VALUE klass)
 {
   size_t limit;
   if (argc == 1) limit = FIX2INT(argv[0]);
   else limit = LIMIT_DEFAULT;
-  return Data_Wrap_Struct(klass, 0, 
-			  gsl_integration_workspace_free, 
-			  gsl_integration_workspace_alloc(limit));
+  return Data_Wrap_Struct(klass, 0,
+                          gsl_integration_workspace_free,
+                          gsl_integration_workspace_alloc(limit));
 }
 
 static VALUE rb_gsl_integration_workspace_limit(VALUE obj)
@@ -989,7 +971,7 @@ static VALUE rb_gsl_integration_workspace_to_a(VALUE obj)
   gsl_integration_workspace *w = NULL;
   Data_Get_Struct(obj, gsl_integration_workspace, w);
   return rb_ary_new3(5, INT2FIX(w->limit), INT2FIX(w->size), INT2FIX(w->nrmax),
-		     INT2FIX(w->i), INT2FIX(w->maximum_level));
+                     INT2FIX(w->i), INT2FIX(w->maximum_level));
 }
 
 static VALUE rb_gsl_integration_workspace_alist(VALUE obj)
@@ -1029,7 +1011,6 @@ static VALUE rb_gsl_integration_workspace_elist(VALUE obj)
   return Data_Wrap_Struct(cgsl_vector_view_ro, 0, free, v);
 }
 
-#ifdef GSL_1_14_LATER
 static VALUE rb_gsl_integration_glfixed_table_alloc(VALUE klass, VALUE n)
 {
   gsl_integration_glfixed_table *t;
@@ -1045,7 +1026,7 @@ static VALUE rb_gsl_integration_glfixed(VALUE obj, VALUE aa, VALUE bb, VALUE tt)
   double res;
   if (!rb_obj_is_kind_of(tt, cgsl_integration_glfixed_table)) {
     rb_raise(rb_eTypeError, "Wrong arugment type (%s for GSL::Integration::Glfixed_table)",
-	     rb_class2name(CLASS_OF(tt)));
+             rb_class2name(CLASS_OF(tt)));
   }
   Data_Get_Struct(tt, gsl_integration_glfixed_table, t);
   a = NUM2DBL(aa);
@@ -1054,7 +1035,6 @@ static VALUE rb_gsl_integration_glfixed(VALUE obj, VALUE aa, VALUE bb, VALUE tt)
   res = gsl_integration_glfixed(f, a, b, t);
   return rb_float_new(res);
 }
-#endif
 
 void Init_gsl_integration(VALUE module)
 {
@@ -1080,69 +1060,69 @@ void Init_gsl_integration(VALUE module)
   rb_define_alias(cgsl_function, "qagil", "integration_qagil");
   rb_define_alias(cgsl_function, "qawc", "integration_qawc");
 
-  cgsl_integration_qaws_table = rb_define_class_under(mgsl_integ, "QAWS_Table", 
-						      cGSL_Object);
+  cgsl_integration_qaws_table = rb_define_class_under(mgsl_integ, "QAWS_Table",
+                                                      cGSL_Object);
   rb_define_singleton_method(cgsl_integration_qaws_table, "alloc",
-			     rb_gsl_integration_qaws_table_alloc, -1);
+                             rb_gsl_integration_qaws_table_alloc, -1);
   /*  rb_define_singleton_method(cgsl_integration_qaws_table, "new",
       rb_gsl_integration_qaws_table_alloc, -1);*/
-  rb_define_method(cgsl_integration_qaws_table, "to_a", 
-		   rb_gsl_integration_qaws_table_to_a, 0);
-  rb_define_method(cgsl_integration_qaws_table, "set", 
-		   rb_gsl_integration_qaws_table_set, -1);
-  rb_define_method(rb_cArray, "to_gsl_integration_qaws_table", 
-		   rb_gsl_ary_to_integration_qaws_table, 0);
+  rb_define_method(cgsl_integration_qaws_table, "to_a",
+                   rb_gsl_integration_qaws_table_to_a, 0);
+  rb_define_method(cgsl_integration_qaws_table, "set",
+                   rb_gsl_integration_qaws_table_set, -1);
+  rb_define_method(rb_cArray, "to_gsl_integration_qaws_table",
+                   rb_gsl_ary_to_integration_qaws_table, 0);
   rb_define_alias(rb_cArray, "to_qaws_table", "to_gsl_integration_qaws_table");
   rb_define_method(cgsl_function, "integration_qaws", rb_gsl_integration_qaws, -1);
   rb_define_alias(cgsl_function, "qaws", "integration_qaws");
 
-  cgsl_integration_qawo_table = rb_define_class_under(mgsl_integ, "QAWO_Table", 
-						      cGSL_Object);
+  cgsl_integration_qawo_table = rb_define_class_under(mgsl_integ, "QAWO_Table",
+                                                      cGSL_Object);
   rb_define_singleton_method(cgsl_integration_qawo_table, "alloc",
-			     rb_gsl_integration_qawo_table_alloc, -1);
+                             rb_gsl_integration_qawo_table_alloc, -1);
   /*  rb_define_singleton_method(cgsl_integration_qawo_table, "new",
       rb_gsl_integration_qawo_table_alloc, -1);*/
-  rb_define_method(cgsl_integration_qawo_table, "to_a", 
-		   rb_gsl_integration_qawo_table_to_a, 0);
-  rb_define_method(rb_cArray, "to_gsl_integration_qawo_table", 
-		   rb_gsl_ary_to_integration_qawo_table, 0);
-  rb_define_method(cgsl_integration_qawo_table, "set", 
-		   rb_gsl_integration_qawo_table_set, -1);
-  rb_define_method(cgsl_integration_qawo_table, "set_length", 
-		   rb_gsl_integration_qawo_table_set_length, 1);
+  rb_define_method(cgsl_integration_qawo_table, "to_a",
+                   rb_gsl_integration_qawo_table_to_a, 0);
+  rb_define_method(rb_cArray, "to_gsl_integration_qawo_table",
+                   rb_gsl_ary_to_integration_qawo_table, 0);
+  rb_define_method(cgsl_integration_qawo_table, "set",
+                   rb_gsl_integration_qawo_table_set, -1);
+  rb_define_method(cgsl_integration_qawo_table, "set_length",
+                   rb_gsl_integration_qawo_table_set_length, 1);
   rb_define_method(cgsl_function, "integration_qawo", rb_gsl_integration_qawo, -1);
   rb_define_method(cgsl_function, "integration_qawf", rb_gsl_integration_qawf, -1);
   rb_define_alias(cgsl_function, "qawo", "integration_qawo");
   rb_define_alias(cgsl_function, "qawf", "integration_qawf");
 
-  cgsl_integration_workspace = rb_define_class_under(mgsl_integ, 
-						     "Workspace", cGSL_Object);
+  cgsl_integration_workspace = rb_define_class_under(mgsl_integ,
+                                                     "Workspace", cGSL_Object);
 
   /*  rb_define_singleton_method(cgsl_integration_workspace, "new",
       rb_gsl_integration_workspace_alloc, -1);*/
   rb_define_singleton_method(cgsl_integration_workspace, "alloc",
-			     rb_gsl_integration_workspace_alloc, -1);
-
-  rb_define_method(cgsl_integration_workspace, "limit", 
-		   rb_gsl_integration_workspace_limit, 0);
-  rb_define_method(cgsl_integration_workspace, "size", 
-		   rb_gsl_integration_workspace_size, 0);
-  rb_define_method(cgsl_integration_workspace, "nrmax", 
-		   rb_gsl_integration_workspace_nrmax, 0);
-  rb_define_method(cgsl_integration_workspace, "i", 
-		   rb_gsl_integration_workspace_i, 0);
-  rb_define_method(cgsl_integration_workspace, "maximum_level", 
-		   rb_gsl_integration_workspace_maximum_level, 0);
-  rb_define_method(cgsl_integration_workspace, "to_a", 
-		   rb_gsl_integration_workspace_to_a, 0);
-  rb_define_method(cgsl_integration_workspace, "alist", 
-		   rb_gsl_integration_workspace_alist, 0);
-  rb_define_method(cgsl_integration_workspace, "blist", 
-		   rb_gsl_integration_workspace_blist, 0);
-  rb_define_method(cgsl_integration_workspace, "rlist", 
-		   rb_gsl_integration_workspace_rlist, 0);
-  rb_define_method(cgsl_integration_workspace, "elist", 
-		   rb_gsl_integration_workspace_elist, 0);
+                             rb_gsl_integration_workspace_alloc, -1);
+
+  rb_define_method(cgsl_integration_workspace, "limit",
+                   rb_gsl_integration_workspace_limit, 0);
+  rb_define_method(cgsl_integration_workspace, "size",
+                   rb_gsl_integration_workspace_size, 0);
+  rb_define_method(cgsl_integration_workspace, "nrmax",
+                   rb_gsl_integration_workspace_nrmax, 0);
+  rb_define_method(cgsl_integration_workspace, "i",
+                   rb_gsl_integration_workspace_i, 0);
+  rb_define_method(cgsl_integration_workspace, "maximum_level",
+                   rb_gsl_integration_workspace_maximum_level, 0);
+  rb_define_method(cgsl_integration_workspace, "to_a",
+                   rb_gsl_integration_workspace_to_a, 0);
+  rb_define_method(cgsl_integration_workspace, "alist",
+                   rb_gsl_integration_workspace_alist, 0);
+  rb_define_method(cgsl_integration_workspace, "blist",
+                   rb_gsl_integration_workspace_blist, 0);
+  rb_define_method(cgsl_integration_workspace, "rlist",
+                   rb_gsl_integration_workspace_rlist, 0);
+  rb_define_method(cgsl_integration_workspace, "elist",
+                   rb_gsl_integration_workspace_elist, 0);
 
   /*****/
   rb_define_module_function(mgsl_integ, "qng", rb_gsl_integration_qng, -1);
@@ -1157,13 +1137,10 @@ void Init_gsl_integration(VALUE module)
   rb_define_module_function(mgsl_integ, "qawo", rb_gsl_integration_qawo, -1);
   rb_define_module_function(mgsl_integ, "qawf", rb_gsl_integration_qawf, -1);
 
-#ifdef GSL_1_14_LATER
   cgsl_integration_glfixed_table = rb_define_class_under(mgsl_integ, "Glfixed_table", cGSL_Object);
   rb_define_singleton_method(cgsl_integration_glfixed_table, "alloc",
-			     rb_gsl_integration_glfixed_table_alloc, 1);
+                             rb_gsl_integration_glfixed_table_alloc, 1);
   rb_define_method(cgsl_function, "glfixed", rb_gsl_integration_glfixed, 3);
-#endif
-
 }
 
 #undef EPSABS_DEFAULT