gsl 1.15.3 → 1.16.0.6

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

@@ -9,60 +9,54 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl.h"
-#include "rb_gsl_function.h"
+#include "include/rb_gsl.h"
+#include "include/rb_gsl_function.h"
 #include <gsl/gsl_min.h>
 
-double rb_gsl_function_f(double x, void *p); 
+double rb_gsl_function_f(double x, void *p);
 
 enum {
   GSL_MIN_FMINIMIZER_GOLDENSECTION,
   GSL_MIN_FMINIMIZER_BRENT,
-#ifdef GSL_1_13_LATER
   GSL_MIN_FMINIMIZER_QUAD_GOLDEN,
-#endif
 };
 static const gsl_min_fminimizer_type* rb_gsl_min_fminimizer_type_get(VALUE t);
 
-static const gsl_min_fminimizer_type* rb_gsl_min_fminimizer_type_get(VALUE t) 
+static const gsl_min_fminimizer_type* rb_gsl_min_fminimizer_type_get(VALUE t)
 {
   char name[32];
   switch (TYPE(t)) {
   case T_STRING:
     strcpy(name, STR2CSTR(t));
-    if (str_tail_grep(name, "goldensection") == 0) 
+    if (str_tail_grep(name, "goldensection") == 0)
       return gsl_min_fminimizer_goldensection;
-    else if (str_tail_grep(name, "brent") == 0) 
+    else if (str_tail_grep(name, "brent") == 0)
       return gsl_min_fminimizer_brent;
-#ifdef GSL_1_13_LATER
-    else if (str_tail_grep(name, "quad_golden") == 0) 
+    else if (str_tail_grep(name, "quad_golden") == 0)
       return gsl_min_fminimizer_quad_golden;
-#endif
-    else 
+    else
       rb_raise(rb_eTypeError, "unknown type %s (goldensection, brent or quad_golden expected)",
-	       name);
+               name);
     break;
   case T_FIXNUM:
     switch (FIX2INT(t)) {
-    case GSL_MIN_FMINIMIZER_GOLDENSECTION: 
-      return gsl_min_fminimizer_goldensection; 
+    case GSL_MIN_FMINIMIZER_GOLDENSECTION:
+      return gsl_min_fminimizer_goldensection;
       break;
-    case GSL_MIN_FMINIMIZER_BRENT: 
-      return gsl_min_fminimizer_brent; 
+    case GSL_MIN_FMINIMIZER_BRENT:
+      return gsl_min_fminimizer_brent;
       break;
-#ifdef GSL_1_13_LATER
-    case GSL_MIN_FMINIMIZER_QUAD_GOLDEN: 
-      return gsl_min_fminimizer_quad_golden; 
+    case GSL_MIN_FMINIMIZER_QUAD_GOLDEN:
+      return gsl_min_fminimizer_quad_golden;
       break;
-#endif
-    default: 
-      rb_raise(rb_eTypeError, "unknown type (GOLDENSECION or BRENT or QUAD_GOLDEN expected)"); 
+    default:
+      rb_raise(rb_eTypeError, "unknown type (GOLDENSECION or BRENT or QUAD_GOLDEN expected)");
       break;
     }
     break;
   default:
     rb_raise(rb_eTypeError, "wrong argument type %s (String of Fixnum)",
-	     rb_class2name(CLASS_OF(t)));
+             rb_class2name(CLASS_OF(t)));
     break;
   }
 }
@@ -83,35 +77,35 @@ static VALUE rb_gsl_min_fminimizer_name(VALUE obj)
   return rb_str_new2(gsl_min_fminimizer_name(gmf));
 }
 
-static VALUE rb_gsl_min_fminimizer_set(VALUE obj, VALUE ff, VALUE xmin, 
-				       VALUE xl, VALUE xu)
+static VALUE rb_gsl_min_fminimizer_set(VALUE obj, VALUE ff, VALUE xmin,
+                                       VALUE xl, VALUE xu)
 {
   gsl_min_fminimizer *gmf = NULL;
   gsl_function *f = NULL;
-  Need_Float(xmin); Need_Float(xl); Need_Float(xu); 
+  Need_Float(xmin); Need_Float(xl); Need_Float(xu);
   CHECK_FUNCTION(ff);
   Data_Get_Struct(obj, gsl_min_fminimizer, gmf);
   Data_Get_Struct(ff, gsl_function, f);
-  return INT2FIX(gsl_min_fminimizer_set(gmf, f, NUM2DBL(xmin), 
-					NUM2DBL(xl), NUM2DBL(xu)));
+  return INT2FIX(gsl_min_fminimizer_set(gmf, f, NUM2DBL(xmin),
+                                        NUM2DBL(xl), NUM2DBL(xu)));
 }
 
-static VALUE rb_gsl_min_fminimizer_set_with_values(VALUE obj, VALUE ff, 
-						   VALUE xmin, VALUE fmin,
-						   VALUE xl, VALUE fl, 
-						   VALUE xu, VALUE fu)
+static VALUE rb_gsl_min_fminimizer_set_with_values(VALUE obj, VALUE ff,
+                                                   VALUE xmin, VALUE fmin,
+                                                   VALUE xl, VALUE fl,
+                                                   VALUE xu, VALUE fu)
 {
   gsl_min_fminimizer *gmf = NULL;
   gsl_function *f = NULL;
-  Need_Float(xmin); Need_Float(xl); Need_Float(xu); 
-  Need_Float(fl); Need_Float(fu); 
+  Need_Float(xmin); Need_Float(xl); Need_Float(xu);
+  Need_Float(fl); Need_Float(fu);
   CHECK_FUNCTION(ff);
   Data_Get_Struct(obj, gsl_min_fminimizer, gmf);
   Data_Get_Struct(ff, gsl_function, f);
-  return INT2FIX(gsl_min_fminimizer_set_with_values(gmf, f, NUM2DBL(xmin), 
-						    NUM2DBL(fmin),
-						    NUM2DBL(xl), NUM2DBL(fl),
-						    NUM2DBL(xu), NUM2DBL(fu)));
+  return INT2FIX(gsl_min_fminimizer_set_with_values(gmf, f, NUM2DBL(xmin),
+                                                    NUM2DBL(fmin),
+                                                    NUM2DBL(xl), NUM2DBL(fl),
+                                                    NUM2DBL(xu), NUM2DBL(fu)));
 }
 
 static VALUE rb_gsl_min_fminimizer_iterate(VALUE obj)
@@ -135,29 +129,6 @@ static VALUE rb_gsl_min_fminimizer_x_upper(VALUE obj)
   return rb_float_new(gsl_min_fminimizer_x_upper(gmf));
 }
 
-#ifndef GSL_1_2_LATER
-static double gsl_min_fminimizer_x_minimum(const gsl_min_fminimizer * s)
-{  
-  /*  return s->x_minimum;*/
-  return s->minimum;
-}
-
-static double gsl_min_fminimizer_f_minimum(const gsl_min_fminimizer * s)
-{  
-  return s->f_minimum;
-}
-
-static double gsl_min_fminimizer_f_lower(const gsl_min_fminimizer * s)
-{ 
-  return s->f_lower;
-}
-
-static double gsl_min_fminimizer_f_upper(const gsl_min_fminimizer * s)
-{ 
-  return s->f_upper;
-}
-#endif
-
 static VALUE rb_gsl_min_fminimizer_x_minimum(VALUE obj)
 {
   gsl_min_fminimizer *gmf = NULL;
@@ -198,12 +169,12 @@ static VALUE rb_gsl_min_fminimizer_test_interval(VALUE obj, VALUE ea, VALUE er)
 }
 
 static VALUE rb_gsl_fminimizer_test_interval(VALUE obj, VALUE xl, VALUE xu,
-					     VALUE ea, VALUE er)
+                                             VALUE ea, VALUE er)
 {
   Need_Float(xl); Need_Float(xu);
   Need_Float(ea); Need_Float(er);
   return INT2FIX(gsl_min_test_interval(NUM2DBL(xl), NUM2DBL(xu),
-				       NUM2DBL(ea), NUM2DBL(er)));
+                                       NUM2DBL(ea), NUM2DBL(er)));
 }
 
 void Init_gsl_min(VALUE module)
@@ -211,21 +182,19 @@ void Init_gsl_min(VALUE module)
   VALUE mgsl_min, cgsl_fminimizer;
 
   mgsl_min = rb_define_module_under(module, "Min");
-  
+
   cgsl_fminimizer = rb_define_class_under(mgsl_min, "FMinimizer", cGSL_Object);
 
-  rb_define_const(cgsl_fminimizer, "GOLDENSECTION", 
-		  INT2FIX(GSL_MIN_FMINIMIZER_GOLDENSECTION));
-  rb_define_const(cgsl_fminimizer, "Goldensection", 
-		  INT2FIX(GSL_MIN_FMINIMIZER_GOLDENSECTION));
+  rb_define_const(cgsl_fminimizer, "GOLDENSECTION",
+                  INT2FIX(GSL_MIN_FMINIMIZER_GOLDENSECTION));
+  rb_define_const(cgsl_fminimizer, "Goldensection",
+                  INT2FIX(GSL_MIN_FMINIMIZER_GOLDENSECTION));
   rb_define_const(cgsl_fminimizer, "BRENT",
-		  INT2FIX(GSL_MIN_FMINIMIZER_BRENT));
+                  INT2FIX(GSL_MIN_FMINIMIZER_BRENT));
   rb_define_const(cgsl_fminimizer, "Brent",
-		  INT2FIX(GSL_MIN_FMINIMIZER_BRENT));
-#ifdef GSL_1_13_LATER
+                  INT2FIX(GSL_MIN_FMINIMIZER_BRENT));
   rb_define_const(cgsl_fminimizer, "QUAD_GOLDEN",
-		  INT2FIX(GSL_MIN_FMINIMIZER_QUAD_GOLDEN));
-#endif
+                  INT2FIX(GSL_MIN_FMINIMIZER_QUAD_GOLDEN));
 
   rb_define_singleton_method(cgsl_fminimizer, "new", rb_gsl_min_fminimizer_new, 1);
   rb_define_singleton_method(cgsl_fminimizer, "alloc", rb_gsl_min_fminimizer_new, 1);
@@ -239,8 +208,8 @@ void Init_gsl_min(VALUE module)
   rb_define_method(cgsl_fminimizer, "x_upper", rb_gsl_min_fminimizer_x_upper, 0);
   rb_define_method(cgsl_fminimizer, "test_interval", rb_gsl_min_fminimizer_test_interval, 2);
 
-  rb_define_singleton_method(mgsl_min, "test_interval", 
-			     rb_gsl_fminimizer_test_interval, 4);
+  rb_define_singleton_method(mgsl_min, "test_interval",
+                             rb_gsl_fminimizer_test_interval, 4);
 
   rb_define_method(cgsl_fminimizer, "x_minimum", rb_gsl_min_fminimizer_x_minimum, 0);
   rb_define_method(cgsl_fminimizer, "f_minimum", rb_gsl_min_fminimizer_f_minimum, 0);

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

@@ -9,14 +9,14 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl.h"
-#include "rb_gsl_rng.h"
+#include "include/rb_gsl.h"
+#include "include/rb_gsl_rng.h"
 #include <gsl/gsl_monte_plain.h>
 #include <gsl/gsl_monte_miser.h>
 #include <gsl/gsl_monte_vegas.h>
 
 #ifndef CHECK_MONTE_FUNCTION
-#define CHECK_MONTE_FUNCTION(x) if(!rb_obj_is_kind_of(x,cgsl_monte_function))\
+#define CHECK_MONTE_FUNCTION(x) if(!rb_obj_is_kind_of(x,cgsl_monte_function)) \
     rb_raise(rb_eTypeError, "wrong type (Function expected)");
 #endif
 
@@ -24,9 +24,7 @@ static VALUE cgsl_monte_plain;
 static VALUE cgsl_monte_miser;
 static VALUE cgsl_monte_vegas;
 static VALUE cgsl_monte_function;
-#ifdef GSL_1_13_LATER
 static VALUE cgsl_monte_miser_params, cgsl_monte_vegas_params;
-#endif
 EXTERN VALUE cgsl_vector;
 
 enum {
@@ -72,11 +70,11 @@ static VALUE rb_gsl_monte_function_set_f(int argc, VALUE *argv, VALUE obj)
     rb_ary_store(ary, 0, argv[0]);
     F->dim = FIX2INT(argv[1]);
     ary2 = rb_ary_new2(argc-2);
-    for (i = 2; i < argc; i++) rb_ary_store(ary2, i-2, argv[i]);
+    for (i = 2; i < (size_t) argc; i++) rb_ary_store(ary2, i-2, argv[i]);
     rb_ary_store(ary, 1, ary2);
     break;
   }
-  if (rb_block_given_p()) rb_ary_store(ary, 0, RB_GSL_MAKE_PROC);
+  if (rb_block_given_p()) rb_ary_store(ary, 0, rb_block_proc());
   return obj;
 }
 
@@ -102,7 +100,7 @@ static VALUE rb_gsl_monte_function_new(int argc, VALUE *argv, VALUE klass)
   obj = Data_Wrap_Struct(klass, gsl_monte_function_mark, gsl_monte_function_free, f);
   rb_gsl_monte_function_set_f(argc, argv, obj);
   return obj;
-}			    
+}
 
 static double rb_gsl_monte_function_f(double *x, size_t dim, void *p)
 {
@@ -164,7 +162,7 @@ static VALUE rb_gsl_monte_function_set_params(int argc, VALUE *argv, VALUE obj)
     rb_ary_store(ary, 1, argv[0]);
   } else {
     ary2 = rb_ary_new2(argc);
-    for (i = 0; i < argc; i++) rb_ary_store(ary2, i, argv[i]);
+    for (i = 0; i < (size_t) argc; i++) rb_ary_store(ary2, i, argv[i]);
     rb_ary_store(ary, 1, ary2);
   }
   return obj;
@@ -237,16 +235,16 @@ static VALUE rb_gsl_monte_integrate(int argc, VALUE *argv, VALUE obj)
   int itmp = 0, flagr = 0, type;
   double result, abserr;
 
-  if (argc < 4) 
+  if (argc < 4)
     rb_raise(rb_eArgError, "wrong number of arguments (%d for >= 4)", argc);
   switch (TYPE(obj)) {
   case T_MODULE:
   case T_CLASS:
   case T_OBJECT:
     if (!rb_obj_is_kind_of(argv[0], cgsl_monte_function))
-      rb_raise(rb_eTypeError, 
-	       "wrong type argument %s (GSL::Monte::Function expected)", 
-	       rb_class2name(CLASS_OF(argv[0])));
+      rb_raise(rb_eTypeError,
+               "wrong type argument %s (GSL::Monte::Function expected)",
+               rb_class2name(CLASS_OF(argv[0])));
     Data_Get_Struct(argv[0], gsl_monte_function, F);
     itmp = 1;
     break;
@@ -267,14 +265,12 @@ static VALUE rb_gsl_monte_integrate(int argc, VALUE *argv, VALUE obj)
     dim = F->dim;
     calls = FIX2INT(argv[itmp+2]);
   }
-
   if (rb_obj_is_kind_of(argv[argc-2], cgsl_rng)) {
     Data_Get_Struct(argv[argc-2], gsl_rng, r);
   } else {
     r = gsl_rng_alloc(gsl_rng_default);
     flagr = 1;
   }
-
   type = get_monte_type(argv[argc-1]);
 
   switch (type) {
@@ -285,8 +281,8 @@ static VALUE rb_gsl_monte_integrate(int argc, VALUE *argv, VALUE obj)
       gsl_monte_plain_init(plain);
     } else {
       if (!rb_obj_is_kind_of(argv[argc-1], cgsl_monte_plain))
-	rb_raise(rb_eTypeError, "wrong argument type %s (Monte::Plain expected)",
-		 rb_class2name(CLASS_OF(argv[argc-1])));
+        rb_raise(rb_eTypeError, "wrong argument type %s (Monte::Plain expected)",
+                 rb_class2name(CLASS_OF(argv[argc-1])));
       Data_Get_Struct(argv[argc-1], gsl_monte_plain_state, plain);
     }
     gsl_monte_plain_integrate(F, xl->data, xu->data, dim, calls, r, plain, &result, &abserr);
@@ -299,8 +295,8 @@ static VALUE rb_gsl_monte_integrate(int argc, VALUE *argv, VALUE obj)
       gsl_monte_miser_init(miser);
     } else {
       if (!rb_obj_is_kind_of(argv[argc-1], cgsl_monte_miser))
-	rb_raise(rb_eTypeError, "wrong argument type %s (Monte::Miser expected)",
-		 rb_class2name(CLASS_OF(argv[argc-1])));
+        rb_raise(rb_eTypeError, "wrong argument type %s (Monte::Miser expected)",
+                 rb_class2name(CLASS_OF(argv[argc-1])));
       Data_Get_Struct(argv[argc-1], gsl_monte_miser_state, miser);
     }
     gsl_monte_miser_integrate(F, xl->data, xu->data, dim, calls, r, miser, &result, &abserr);
@@ -312,10 +308,9 @@ static VALUE rb_gsl_monte_integrate(int argc, VALUE *argv, VALUE obj)
       vegas = gsl_monte_vegas_alloc(dim);
       gsl_monte_vegas_init(vegas);
     } else {      if (!rb_obj_is_kind_of(argv[argc-1], cgsl_monte_vegas))
-	rb_raise(rb_eTypeError, "wrong argument type %s (Monte::Vegas expected)",
-		 rb_class2name(CLASS_OF(argv[argc-1])));
-      Data_Get_Struct(argv[argc-1], gsl_monte_vegas_state, vegas);
-    }
+                    rb_raise(rb_eTypeError, "wrong argument type %s (Monte::Vegas expected)",
+                             rb_class2name(CLASS_OF(argv[argc-1])));
+                  Data_Get_Struct(argv[argc-1], gsl_monte_vegas_state, vegas); }
     gsl_monte_vegas_integrate(F, xl->data, xu->data, dim, calls, r, vegas, &result, &abserr);
     if (type > 100) gsl_monte_vegas_free(vegas);
     break;
@@ -334,7 +329,7 @@ static VALUE rb_gsl_monte_plain_integrate(int argc, VALUE *argv, VALUE obj)
   int flagr = 0;
   double result, abserr;
 
-  if (argc < 4) 
+  if (argc < 4)
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 4, 5 or 6)", argc);
   CHECK_MONTE_FUNCTION(argv[0]);
   CHECK_VECTOR(argv[1]);  CHECK_VECTOR(argv[2]);
@@ -349,15 +344,14 @@ static VALUE rb_gsl_monte_plain_integrate(int argc, VALUE *argv, VALUE obj)
     dim = F->dim;
     calls = FIX2INT(argv[3]);
   }
-
   if (rb_obj_is_kind_of(argv[argc-1], cgsl_rng)) {
     Data_Get_Struct(argv[argc-1], gsl_rng, r);
   } else {
     r = gsl_rng_alloc(gsl_rng_default);
     flagr = 1;
   }
-  gsl_monte_plain_integrate(F, xl->data, xu->data, dim, calls, r, plain, 
-			    &result, &abserr);
+  gsl_monte_plain_integrate(F, xl->data, xu->data, dim, calls, r, plain,
+                            &result, &abserr);
   if (flagr == 1) gsl_rng_free(r);
   return rb_ary_new3(2, rb_float_new(result), rb_float_new(abserr));
 }
@@ -387,15 +381,14 @@ static VALUE rb_gsl_monte_miser_integrate(int argc, VALUE *argv, VALUE obj)
     dim = F->dim;
     calls = FIX2INT(argv[3]);
   }
-
   if (rb_obj_is_kind_of(argv[argc-1], cgsl_rng)) {
     Data_Get_Struct(argv[argc-1], gsl_rng, r);
   } else {
     r = gsl_rng_alloc(gsl_rng_default);
     flagr = 1;
   }
-  gsl_monte_miser_integrate(F, xl->data, xu->data, dim, calls, r, miser, 
-			    &result, &abserr);
+  gsl_monte_miser_integrate(F, xl->data, xu->data, dim, calls, r, miser,
+                            &result, &abserr);
   if (flagr == 1) gsl_rng_free(r);
   return rb_ary_new3(2, rb_float_new(result), rb_float_new(abserr));
 }
@@ -410,7 +403,7 @@ static VALUE rb_gsl_monte_vegas_integrate(int argc, VALUE *argv, VALUE obj)
   int flagr = 0;
   double result, abserr;
 
-  if (argc < 4) 
+  if (argc < 4)
     rb_raise(rb_eArgError, "wrong number of arguments (%d for >= 4)", argc);
   CHECK_MONTE_FUNCTION(argv[0]);
   CHECK_VECTOR(argv[1]);  CHECK_VECTOR(argv[2]);
@@ -425,15 +418,14 @@ static VALUE rb_gsl_monte_vegas_integrate(int argc, VALUE *argv, VALUE obj)
     dim = F->dim;
     calls = FIX2INT(argv[3]);
   }
-
   if (rb_obj_is_kind_of(argv[argc-1], cgsl_rng)) {
     Data_Get_Struct(argv[argc-1], gsl_rng, r);
   } else {
     r = gsl_rng_alloc(gsl_rng_default);
     flagr = 1;
   }
-  gsl_monte_vegas_integrate(F, xl->data, xu->data, dim, calls, r, vegas, 
-			    &result, &abserr);
+  gsl_monte_vegas_integrate(F, xl->data, xu->data, dim, calls, r, vegas,
+                            &result, &abserr);
   if (flagr == 1) gsl_rng_free(r);
   return rb_ary_new3(2, rb_float_new(result), rb_float_new(abserr));
 }
@@ -447,7 +439,6 @@ static int get_monte_type(VALUE vt)
   else {
     /* do next */
   }
-
   switch(TYPE(vt)) {
   case T_STRING:
     strcpy(name, STR2CSTR(vt));
@@ -555,8 +546,8 @@ static VALUE rb_gsl_monte_miser_state(VALUE obj)
   gsl_monte_miser_state *s = NULL;
   Data_Get_Struct(obj, gsl_monte_miser_state, s);
   return rb_ary_new3(5, rb_float_new(s->estimate_frac), INT2FIX(s->min_calls),
-		     INT2FIX(s->min_calls_per_bisection), rb_float_new(s->alpha),
-		     rb_float_new(s->dither));
+                     INT2FIX(s->min_calls_per_bisection), rb_float_new(s->alpha),
+                     rb_float_new(s->dither));
 }
 
 static VALUE rb_gsl_monte_vegas_result(VALUE obj)
@@ -655,20 +646,19 @@ static VALUE rb_gsl_monte_vegas_state(VALUE obj)
 {
   gsl_monte_vegas_state *s = NULL;
   Data_Get_Struct(obj, gsl_monte_vegas_state, s);
-  return rb_ary_new3(8, rb_float_new(s->result), rb_float_new(s->sigma), 
-		     rb_float_new(s->chisq), rb_float_new(s->alpha), 
-		     INT2FIX(s->iterations), INT2FIX(s->stage), 
-		     INT2FIX(s->mode), INT2FIX(s->verbose));
+  return rb_ary_new3(8, rb_float_new(s->result), rb_float_new(s->sigma),
+                     rb_float_new(s->chisq), rb_float_new(s->alpha),
+                     INT2FIX(s->iterations), INT2FIX(s->stage),
+                     INT2FIX(s->mode), INT2FIX(s->verbose));
 }
 
-#ifdef GSL_1_13_LATER
 static VALUE rb_gsl_monte_miser_params_get(VALUE obj)
 {
   gsl_monte_miser_state *s = NULL;
   gsl_monte_miser_params *p = NULL;
   Data_Get_Struct(obj, gsl_monte_miser_state, s);
   p = (gsl_monte_miser_params *) malloc(sizeof(gsl_monte_miser_params));
-  gsl_monte_miser_params_get(s, p);  
+  gsl_monte_miser_params_get(s, p);
   return Data_Wrap_Struct(cgsl_monte_miser_params, 0, free, p);
 }
 static VALUE rb_gsl_monte_miser_params_set(VALUE obj, VALUE params)
@@ -677,7 +667,7 @@ static VALUE rb_gsl_monte_miser_params_set(VALUE obj, VALUE params)
   gsl_monte_miser_params *p = NULL;
   Data_Get_Struct(obj, gsl_monte_miser_state, s);
   Data_Get_Struct(params, gsl_monte_miser_params, p);
-  gsl_monte_miser_params_set(s, p);  
+  gsl_monte_miser_params_set(s, p);
   return Qtrue;
 }
 static VALUE rb_gsl_monte_miser_params_get_estimate_frac(VALUE obj)
@@ -752,7 +742,7 @@ static VALUE rb_gsl_monte_vegas_params_get(VALUE obj)
   gsl_monte_vegas_params *p = NULL;
   Data_Get_Struct(obj, gsl_monte_vegas_state, s);
   p = (gsl_monte_vegas_params *) malloc(sizeof(gsl_monte_vegas_params));
-  gsl_monte_vegas_params_get(s, p);  
+  gsl_monte_vegas_params_get(s, p);
   return Data_Wrap_Struct(cgsl_monte_vegas_params, 0, free, p);
 }
 static VALUE rb_gsl_monte_vegas_params_set(VALUE obj, VALUE params)
@@ -761,7 +751,7 @@ static VALUE rb_gsl_monte_vegas_params_set(VALUE obj, VALUE params)
   gsl_monte_vegas_params *p = NULL;
   Data_Get_Struct(obj, gsl_monte_vegas_state, s);
   Data_Get_Struct(params, gsl_monte_vegas_params, p);
-  gsl_monte_vegas_params_set(s, p);  
+  gsl_monte_vegas_params_set(s, p);
   return Qtrue;
 }
 static VALUE rb_gsl_monte_vegas_params_get_alpha(VALUE obj)
@@ -841,7 +831,6 @@ static VALUE rb_gsl_monte_vegas_runval(VALUE obj)
   rb_ary_store(ary, 1, rb_float_new(sig));
   return ary;
 }
-#endif
 
 void Init_gsl_monte(VALUE module)
 {
@@ -926,20 +915,19 @@ void Init_gsl_monte(VALUE module)
 
 
   /*****/
-  rb_define_singleton_method(cgsl_monte_plain, "integrate", 
-			     rb_gsl_monte_integrate, -1);
-  rb_define_method(cgsl_monte_plain, "integrate", 
-		   rb_gsl_monte_plain_integrate, -1);
-  rb_define_singleton_method(cgsl_monte_miser, "integrate", 
-			     rb_gsl_monte_integrate, -1);
-  rb_define_method(cgsl_monte_miser, "integrate", 
-		   rb_gsl_monte_miser_integrate, -1);
-  rb_define_singleton_method(cgsl_monte_vegas, "integrate", 
-			     rb_gsl_monte_integrate, -1);
-  rb_define_method(cgsl_monte_vegas, "integrate", 
-		   rb_gsl_monte_vegas_integrate, -1);
-
-#ifdef GSL_1_13_LATER
+  rb_define_singleton_method(cgsl_monte_plain, "integrate",
+                             rb_gsl_monte_integrate, -1);
+  rb_define_method(cgsl_monte_plain, "integrate",
+                   rb_gsl_monte_plain_integrate, -1);
+  rb_define_singleton_method(cgsl_monte_miser, "integrate",
+                             rb_gsl_monte_integrate, -1);
+  rb_define_method(cgsl_monte_miser, "integrate",
+                   rb_gsl_monte_miser_integrate, -1);
+  rb_define_singleton_method(cgsl_monte_vegas, "integrate",
+                             rb_gsl_monte_integrate, -1);
+  rb_define_method(cgsl_monte_vegas, "integrate",
+                   rb_gsl_monte_vegas_integrate, -1);
+
   cgsl_monte_miser_params = rb_define_class_under(cgsl_monte_miser, "Params", cGSL_Object);
   cgsl_monte_vegas_params = rb_define_class_under(cgsl_monte_vegas, "Params", cGSL_Object);
 
@@ -982,10 +970,8 @@ void Init_gsl_monte(VALUE module)
   rb_define_method(cgsl_monte_vegas, "runval", rb_gsl_monte_vegas_runval, 0);
 
   rb_define_const(cgsl_monte_vegas, "MODE_IMPORTANCE", INT2FIX(GSL_VEGAS_MODE_IMPORTANCE));
-  rb_define_const(cgsl_monte_vegas, "MODE_IMPORTANCE_ONLY", INT2FIX(GSL_VEGAS_MODE_IMPORTANCE_ONLY)); 
+  rb_define_const(cgsl_monte_vegas, "MODE_IMPORTANCE_ONLY", INT2FIX(GSL_VEGAS_MODE_IMPORTANCE_ONLY));
   rb_define_const(cgsl_monte_vegas, "MODE_STRATIFIED", INT2FIX(GSL_VEGAS_MODE_STRATIFIED));
-#endif
-
 }
 #ifdef CHECK_MONTE_FUNCTION
 #undef CHECK_MONTE_FUNCTION