gsl 1.15.3 → 1.16.0.6

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

@@ -32,8 +32,8 @@ void pp(const gsl_matrix *m)
 {
   int r, c;
 
-  for(r=0; r<m->size1; r++) {
-    for(c=0; c<m->size2; c++) {
+  for(r = 0; r < (int) m->size1; r++) {
+    for(c = 0; c < (int) m->size2; c++) {
       printf(" %.2f", gsl_matrix_get(m, r, c));
     }
     printf("\n");
@@ -45,15 +45,15 @@ void pp(const gsl_matrix *m)
 double difcost(const gsl_matrix *a, const gsl_matrix *b)
 {
   int i, j;
-  double dif=0, d;
+  double dif = 0, d;
 
-  for (i=0; i < a->size1; i++)
+  for (i = 0; i < (int) a->size1; i++)
   {
-    for (j=0; j < a->size2; j++)
+    for (j = 0; j < (int) a->size2; j++)
     {
       d = gsl_matrix_get(a, i, j) - gsl_matrix_get(b, i, j);
       dif += d*d;
-	//      dif += pow(gsl_matrix_get(a, i, j) - gsl_matrix_get(b, i, j), 2);
+      //      dif += pow(gsl_matrix_get(a, i, j) - gsl_matrix_get(b, i, j), 2);
     }
   }
   return dif;
@@ -66,9 +66,9 @@ static void initmatrix(gsl_matrix *m, double min, double max)
 
   srand(time(NULL));
 
-  for(i=0; i < m->size1; i++)
+  for(i = 0; i < (int) m->size1; i++)
   {
-    for(j=0; j < m->size2; j++)
+    for(j = 0; j < (int) m->size2; j++)
     {
       val = min + (int) (max * (rand() / (RAND_MAX + min)));
       gsl_matrix_set(m, i, j, val);
@@ -79,10 +79,10 @@ static void initmatrix(gsl_matrix *m, double min, double max)
 static double update(gsl_matrix *v, gsl_matrix *w, gsl_matrix *h)
 {
   double dist = 0;
-  gsl_matrix *wt=NULL, *ht=NULL, *wh=NULL;
-  gsl_matrix *w_h=NULL, *wt_w=NULL;
+  gsl_matrix *wt = NULL, *ht = NULL, *wh = NULL;
+  gsl_matrix *w_h = NULL, *wt_w = NULL;
   gsl_matrix *wt_v = NULL;
-  gsl_matrix *v_ht=NULL, *wt_w_h=NULL, *w_h_ht=NULL;
+  gsl_matrix *v_ht = NULL, *wt_w_h = NULL, *w_h_ht = NULL;
 
   wt = gsl_matrix_alloc(w->size2, w->size1);
   gsl_matrix_transpose_memcpy(wt, w);

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

@@ -28,7 +28,7 @@ static VALUE nmf_wrap(VALUE obj, VALUE matrix, VALUE cols)
   unsigned int c;
   VALUE arr;
 
-  if ( ! FIXNUM_P(cols) || (c=NUM2INT(cols)) <= 0 ) {
+  if ( !FIXNUM_P(cols) || (c = NUM2INT(cols)) <= 0 ) {
     rb_raise(rb_eArgError, "Number of columns should be a positive integer.");
   }
   arr = rb_ary_new2(2);

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

@@ -9,10 +9,10 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl.h"
-#include "rb_gsl_array.h"
-#include "rb_gsl_function.h"
-#include "rb_gsl_histogram.h"
+#include "include/rb_gsl.h"
+#include "include/rb_gsl_array.h"
+#include "include/rb_gsl_function.h"
+#include "include/rb_gsl_histogram.h"
 #include <gsl/gsl_ntuple.h>
 
 static VALUE cgsl_ntuple;
@@ -191,11 +191,11 @@ static VALUE rb_gsl_ntuple_select_fn_set_f(int argc, VALUE *argv, VALUE obj)
     CHECK_PROC(argv[0]);
     rb_ary_store(ary, 0, argv[0]);
     ary2 = rb_ary_new2(argc-1);
-    for (i = 1; i < argc; i++) rb_ary_store(ary2, i-1, argv[i]);
+    for (i = 1; (int) i < argc; i++) rb_ary_store(ary2, i-1, 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;
 }
 
@@ -236,7 +236,7 @@ static VALUE rb_gsl_ntuple_select_fn_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; (int) i < argc; i++) rb_ary_store(ary2, i, argv[i]);
     rb_ary_store(ary, 1, ary2);
   }
   return obj;
@@ -310,11 +310,11 @@ static VALUE rb_gsl_ntuple_value_fn_set_f(int argc, VALUE *argv, VALUE obj)
     CHECK_PROC(argv[0]);
     rb_ary_store(ary, 0, argv[0]);
     ary2 = rb_ary_new2(argc-1);
-    for (i = 1; i < argc; i++) rb_ary_store(ary2, i-1, argv[i]);
+    for (i = 1; (int) i < argc; i++) rb_ary_store(ary2, i-1, 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;
 }
 
@@ -353,7 +353,7 @@ static VALUE rb_gsl_ntuple_value_fn_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; (int) i < argc; i++) rb_ary_store(ary2, i, argv[i]);
     rb_ary_store(ary, 1, ary2);
   }
   return obj;
@@ -372,7 +372,7 @@ static VALUE rb_gsl_ntuple_value_fn_new(int argc, VALUE *argv, VALUE klass)
 
 /* singleton method */
 static VALUE rb_gsl_ntuple_project(VALUE obj, VALUE hh, VALUE nn,
-				   VALUE vvfn, VALUE vsfn)
+                                   VALUE vvfn, VALUE vsfn)
 {
   gsl_histogram *h = NULL;
   gsl_ntuple *n = NULL;
@@ -386,10 +386,10 @@ static VALUE rb_gsl_ntuple_project(VALUE obj, VALUE hh, VALUE nn,
   if (!rb_obj_is_kind_of(nn, cgsl_ntuple))
     rb_raise(rb_eTypeError, "argument 2: Ntuple expected");
   Data_Get_Struct(nn, gsl_ntuple, n);
-  if (!rb_obj_is_kind_of(vvfn, cgsl_ntuple_value_fn)) 
+  if (!rb_obj_is_kind_of(vvfn, cgsl_ntuple_value_fn))
     rb_raise(rb_eTypeError, "argument 3: Ntuple::ValueFn expected");
   Data_Get_Struct(vvfn, gsl_ntuple_value_fn, vfn);
-  if (!rb_obj_is_kind_of(vsfn, cgsl_ntuple_select_fn)) 
+  if (!rb_obj_is_kind_of(vsfn, cgsl_ntuple_select_fn))
     rb_raise(rb_eTypeError, "argument 4: Ntuple::SelectFn expected");
   Data_Get_Struct(vsfn, gsl_ntuple_select_fn, sfn);
 
@@ -412,10 +412,10 @@ static VALUE rb_gsl_ntuple_project2(VALUE obj, VALUE hh, VALUE vvfn, VALUE vsfn)
   CHECK_HISTOGRAM(hh);
   Data_Get_Struct(obj, gsl_ntuple, n);
   Data_Get_Struct(hh, gsl_histogram, h);
-  if (!rb_obj_is_kind_of(vvfn, cgsl_ntuple_value_fn)) 
+  if (!rb_obj_is_kind_of(vvfn, cgsl_ntuple_value_fn))
     rb_raise(rb_eTypeError, "argument 2: Ntuple::ValueFn expected");
   Data_Get_Struct(vvfn, gsl_ntuple_value_fn, vfn);
-  if (!rb_obj_is_kind_of(vsfn, cgsl_ntuple_select_fn)) 
+  if (!rb_obj_is_kind_of(vsfn, cgsl_ntuple_select_fn))
     rb_raise(rb_eTypeError, "argument 3: Ntuple::SelectFn expected");
   Data_Get_Struct(vsfn, gsl_ntuple_select_fn, sfn);
   size = n->size/sizeof(double);
@@ -447,22 +447,22 @@ void Init_gsl_ntuple(VALUE module)
   rb_define_alias(cgsl_ntuple, "ntuple_data", "data");
 
   rb_define_singleton_method(cgsl_ntuple_select_fn, "alloc",
-			     rb_gsl_ntuple_select_fn_new, -1);
+                             rb_gsl_ntuple_select_fn_new, -1);
   rb_define_method(cgsl_ntuple_select_fn, "set",
-		   rb_gsl_ntuple_select_fn_set_f, -1);
+                   rb_gsl_ntuple_select_fn_set_f, -1);
   rb_define_method(cgsl_ntuple_select_fn, "set_params",
-		   rb_gsl_ntuple_select_fn_set_params, -1);
+                   rb_gsl_ntuple_select_fn_set_params, -1);
   rb_define_method(cgsl_ntuple_select_fn, "params",
-		   rb_gsl_ntuple_select_fn_params, 0);
+                   rb_gsl_ntuple_select_fn_params, 0);
 
   rb_define_singleton_method(cgsl_ntuple_value_fn, "alloc",
-			     rb_gsl_ntuple_value_fn_new, -1);
+                             rb_gsl_ntuple_value_fn_new, -1);
   rb_define_method(cgsl_ntuple_value_fn, "set",
-		   rb_gsl_ntuple_value_fn_set_f, -1);
+                   rb_gsl_ntuple_value_fn_set_f, -1);
   rb_define_method(cgsl_ntuple_value_fn, "set_params",
-		   rb_gsl_ntuple_value_fn_set_params, -1);
+                   rb_gsl_ntuple_value_fn_set_params, -1);
   rb_define_method(cgsl_ntuple_value_fn, "params",
-		   rb_gsl_ntuple_value_fn_params, 0);
+                   rb_gsl_ntuple_value_fn_params, 0);
 
   rb_define_singleton_method(cgsl_ntuple, "project", rb_gsl_ntuple_project, 4);
   rb_define_method(cgsl_ntuple, "project", rb_gsl_ntuple_project2, 3);

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

@@ -8,44 +8,44 @@
   This library is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY.
 */
-#include "rb_gsl_config.h"
-#include "rb_gsl_odeiv.h"
-#include "rb_gsl_array.h"
-#include "rb_gsl_function.h"
+
+#include "include/rb_gsl_odeiv.h"
+#include "include/rb_gsl_array.h"
+#include "include/rb_gsl_function.h"
 
 #ifndef CHECK_SYSTEM
-#define CHECK_SYSTEM(x) if(CLASS_OF(x)!=cgsl_odeiv_system)\
-      rb_raise(rb_eTypeError,\
-      "wrong argument type %s (GSL::Odeiv::System expected)",\
-      rb_class2name(CLASS_OF(x)));
+#define CHECK_SYSTEM(x) if(CLASS_OF(x)!=cgsl_odeiv_system) \
+    rb_raise(rb_eTypeError, \
+             "wrong argument type %s (GSL::Odeiv::System expected)", \
+             rb_class2name(CLASS_OF(x)));
 #endif
 
 #ifndef CHECK_STEP
-#define CHECK_STEP(x) if(CLASS_OF(x)!=cgsl_odeiv_step)\
-      rb_raise(rb_eTypeError,\
-      "wrong argument type %s (GSL::Odeiv::Step expected)",\
-      rb_class2name(CLASS_OF(x)));
+#define CHECK_STEP(x) if(CLASS_OF(x)!=cgsl_odeiv_step) \
+    rb_raise(rb_eTypeError, \
+             "wrong argument type %s (GSL::Odeiv::Step expected)", \
+             rb_class2name(CLASS_OF(x)));
 #endif
 
 #ifndef CHECK_CONTROL
-#define CHECK_CONTROL(x) if(CLASS_OF(x)!=cgsl_odeiv_control)\
-      rb_raise(rb_eTypeError,\
-      "wrong argument type %s (GSL::Odeiv::Control expected)",\
-      rb_class2name(CLASS_OF(x)));
+#define CHECK_CONTROL(x) if(CLASS_OF(x)!=cgsl_odeiv_control) \
+    rb_raise(rb_eTypeError, \
+             "wrong argument type %s (GSL::Odeiv::Control expected)", \
+             rb_class2name(CLASS_OF(x)));
 #endif
 
 #ifndef CHECK_EVOLVE
-#define CHECK_EVOLVE(x) if(CLASS_OF(x)!=cgsl_odeiv_evolve)\
-      rb_raise(rb_eTypeError,\
-      "wrong argument type %s (GSL::Odeiv::Evolve expected)",\
-      rb_class2name(CLASS_OF(x)));
+#define CHECK_EVOLVE(x) if(CLASS_OF(x)!=cgsl_odeiv_evolve) \
+    rb_raise(rb_eTypeError, \
+             "wrong argument type %s (GSL::Odeiv::Evolve expected)", \
+             rb_class2name(CLASS_OF(x)));
 #endif
 
 #ifndef CHECK_SOLVER
-#define CHECK_SOLVER(x) if(CLASS_OF(x)!=cgsl_odeiv_solver)\
-      rb_raise(rb_eTypeError,\
-      "wrong argument type %s (GSL::Odeiv::Solver expected)",\
-      rb_class2name(CLASS_OF(x)));
+#define CHECK_SOLVER(x) if(CLASS_OF(x)!=cgsl_odeiv_solver) \
+    rb_raise(rb_eTypeError, \
+             "wrong argument type %s (GSL::Odeiv::Solver expected)", \
+             rb_class2name(CLASS_OF(x)));
 #endif
 
 static VALUE cgsl_odeiv_system;
@@ -101,10 +101,9 @@ static int calc_func(double t, const double y[], double dydt[], void *data)
   vy = Data_Wrap_Struct(cgsl_vector_view_ro, 0, NULL, &ytmp);
   vdydt = Data_Wrap_Struct(cgsl_vector_view, 0, NULL, &dydttmp);
 
-  if (NIL_P(params)) /*result =*/ rb_funcall((VALUE) proc, RBGSL_ID_call, 3, rb_float_new(t), 
-					 vy, vdydt);
+  if (NIL_P(params)) /*result =*/ rb_funcall((VALUE) proc, RBGSL_ID_call, 3, rb_float_new(t),
+                                             vy, vdydt);
   else /*result =*/ rb_funcall((VALUE) proc, RBGSL_ID_call, 4, rb_float_new(t), vy, vdydt, params);
- 
   return GSL_SUCCESS;
 }
 
@@ -118,11 +117,10 @@ static int calc_jac(double t, const double y[], double *dfdy, double dfdt[], voi
   gsl_vector_view ytmp, dfdttmp;
   gsl_matrix_view mv;
   size_t dim;
-  
+
   ary = (VALUE) data;
   proc = rb_ary_entry(ary, 1);
   if (NIL_P(proc)) rb_raise(rb_eRuntimeError, "df function not given");
-
   dim = FIX2INT(rb_ary_entry(ary, 2));
   params = rb_ary_entry(ary, 3);
 
@@ -137,9 +135,9 @@ static int calc_jac(double t, const double y[], double *dfdy, double dfdt[], voi
   vmjac = Data_Wrap_Struct(cgsl_matrix_view, 0, NULL, &mv);
   vdfdt = Data_Wrap_Struct(cgsl_vector_view, 0, NULL, &dfdttmp);
   if (NIL_P(params)) /*result =*/ rb_funcall((VALUE) proc, RBGSL_ID_call, 4, rb_float_new(t),
-					 vy, vmjac, vdfdt);
-  else /*result =*/ rb_funcall((VALUE) proc, RBGSL_ID_call, 5, rb_float_new(t), 
-			   vy, vmjac, vdfdt, params);
+                                             vy, vmjac, vdfdt);
+  else /*result =*/ rb_funcall((VALUE) proc, RBGSL_ID_call, 5, rb_float_new(t),
+                               vy, vmjac, vdfdt, params);
   return GSL_SUCCESS;
 }
 
@@ -195,7 +193,6 @@ static void set_sys(int argc, VALUE *argv, gsl_odeiv_system *sys)
     sys->function = &calc_func;
     sys->jacobian = &calc_jac;
   }
-
   if (sys->params == NULL) {
     ary = rb_ary_new2(4);
     /*    (VALUE) sys->params = ary;*/
@@ -213,7 +210,7 @@ static void set_sys(int argc, VALUE *argv, gsl_odeiv_system *sys)
   } else {
     vjac = Qnil;
   }
-  if ((dim =argv[itmp++]) == Qnil) dim = argv[itmp++];
+  if ((dim = argv[itmp++]) == Qnil) dim = argv[itmp++];
   switch (argc - itmp) {
   case 0:
     vparams = Qnil;
@@ -223,14 +220,14 @@ static void set_sys(int argc, VALUE *argv, gsl_odeiv_system *sys)
     break;
   default:
     vparams = rb_ary_new2(argc-itmp);
-    for (i = itmp, j = 0; i < argc; i++, j++) rb_ary_store(vparams, j, argv[i]);
+    for (i = itmp, j = 0; (int) i < argc; i++, j++) rb_ary_store(vparams, j, argv[i]);
   }
   dimension = FIX2INT(dim);
   sys->dimension = dimension;
-  rb_ary_store(ary, 0, argv[0]); 
+  rb_ary_store(ary, 0, argv[0]);
   rb_ary_store(ary, 1, vjac);
-  rb_ary_store(ary, 2, dim);  
-  rb_ary_store(ary, 3, vparams); 
+  rb_ary_store(ary, 2, dim);
+  rb_ary_store(ary, 3, vparams);
 }
 
 static VALUE rb_gsl_odeiv_system_set_params(int argc, VALUE *argv, VALUE obj);
@@ -251,10 +248,10 @@ static VALUE rb_gsl_odeiv_system_set_params(int argc, VALUE *argv, VALUE obj)
     break;
   default:
     vparams = rb_ary_new2(argc);
-    for (i = 0; i < argc; i++) rb_ary_store(vparams, i, argv[i]);
+    for (i = 0; (int) i < argc; i++) rb_ary_store(vparams, i, argv[i]);
   }
   //  rb_ary_delete_at(ary, 3);
-  rb_ary_store(ary, 3, vparams); 
+  rb_ary_store(ary, 3, vparams);
   return obj;
 }
 
@@ -341,9 +338,7 @@ static const gsl_odeiv_step_type* rb_gsl_odeiv_step_type_get(VALUE tt)
     case GSL_ODEIV_STEP_BSIMP: T = gsl_odeiv_step_bsimp; break;
     case GSL_ODEIV_STEP_GEAR1: T = gsl_odeiv_step_gear1; break;
     case GSL_ODEIV_STEP_GEAR2: T = gsl_odeiv_step_gear2; break;
-#ifdef GSL_1_6_LATER
     case GSL_ODEIV_STEP_RK2SIMP: T = gsl_odeiv_step_rk2simp; break;
-#endif
     default:
       rb_raise(rb_eArgError, "wrong argument type (Fixnum expected)");
       break;
@@ -361,16 +356,14 @@ static const gsl_odeiv_step_type* rb_gsl_odeiv_step_type_get(VALUE tt)
     else if (str_tail_grep(name, "bsimp") == 0) T = gsl_odeiv_step_bsimp;
     else if (str_tail_grep(name, "gear1") == 0) T = gsl_odeiv_step_gear1;
     else if (str_tail_grep(name, "gear2") == 0) T = gsl_odeiv_step_gear2;
-#ifdef GSL_1_6_LATER
     else if (str_tail_grep(name, "rk2simp") == 0) T = gsl_odeiv_step_rk2simp;
-#endif
     else {
       rb_raise(rb_eArgError, "wrong argument type %s", name);
     }
     break;
   default:
     rb_raise(rb_eArgError, "wrong argument type %s (String or Fixnum expected)",
-	     rb_class2name(CLASS_OF(tt)));
+             rb_class2name(CLASS_OF(tt)));
     break;
   }
   return T;
@@ -420,7 +413,7 @@ static VALUE rb_gsl_odeiv_step_apply(int argc, VALUE *argv, VALUE obj)
       Data_Get_Struct(argv[5], gsl_vector, vtmp2);
       if (vtmp2) dydt_out = vtmp2->data;
     }
-    /* no break */
+  /* no break */
   case 6:
     if (VECTOR_P(argv[4])) {
       Data_Get_Struct(argv[4], gsl_vector, vtmp1);
@@ -440,8 +433,8 @@ static VALUE rb_gsl_odeiv_step_apply(int argc, VALUE *argv, VALUE obj)
   Data_Get_Struct(argv[2], gsl_vector, y);
   Data_Get_Struct(argv[3], gsl_vector, yerr);
   Data_Get_Struct(argv[argc-1], gsl_odeiv_system, sys);
-  return INT2FIX(gsl_odeiv_step_apply(s, t, h, y->data, yerr->data, 
-				      dydt_in, dydt_out, sys));
+  return INT2FIX(gsl_odeiv_step_apply(s, t, h, y->data, yerr->data,
+                                      dydt_in, dydt_out, sys));
 }
 
 static VALUE rb_gsl_odeiv_step_info(VALUE obj)
@@ -450,37 +443,33 @@ static VALUE rb_gsl_odeiv_step_info(VALUE obj)
   char buf[256];
   Data_Get_Struct(obj, gsl_odeiv_step, s);
   sprintf(buf, "Class:      %s\n", rb_class2name(CLASS_OF(obj)));
-#ifdef RUBY_1_9_LATER
   sprintf(buf, "%sSuperClass: %s\n", buf, rb_class2name(RCLASS_SUPER(CLASS_OF(obj))));
-#else
-  sprintf(buf, "%sSuperClass: %s\n", buf, rb_class2name(RCLASS(CLASS_OF(obj))->super));
-#endif
   sprintf(buf, "%sType:       %s\n", buf, gsl_odeiv_step_name(s));
   sprintf(buf, "%sDimension:  %d\n", buf, (int) s->dimension);
   return rb_str_new2(buf);
 }
 
-static gsl_odeiv_control* make_control_standard(VALUE epsabs, 
-					       VALUE epsrel,
-						VALUE ay, VALUE adydt);
+static gsl_odeiv_control* make_control_standard(VALUE epsabs,
+                                                VALUE epsrel,
+                                                VALUE ay, VALUE adydt);
 static gsl_odeiv_control* make_control_y(VALUE epsabs, VALUE epsrel);
-static VALUE rb_gsl_odeiv_control_standard_new(VALUE klass, VALUE epsabs, 
-					       VALUE epsrel,
-					       VALUE ay, VALUE adydt)
+static VALUE rb_gsl_odeiv_control_standard_new(VALUE klass, VALUE epsabs,
+                                               VALUE epsrel,
+                                               VALUE ay, VALUE adydt)
 {
   gsl_odeiv_control *c = NULL;
-  c = make_control_standard(epsabs, epsrel, ay, adydt); 
+  c = make_control_standard(epsabs, epsrel, ay, adydt);
   return Data_Wrap_Struct(klass, 0, gsl_odeiv_control_free, c);
 }
 
-static gsl_odeiv_control* make_control_standard(VALUE epsabs, 
-					       VALUE epsrel,
-					       VALUE ay, VALUE adydt)
+static gsl_odeiv_control* make_control_standard(VALUE epsabs,
+                                                VALUE epsrel,
+                                                VALUE ay, VALUE adydt)
 {
   Need_Float(epsabs); Need_Float(epsrel);
   Need_Float(ay);   Need_Float(adydt);
-  return gsl_odeiv_control_standard_new(NUM2DBL(epsabs), NUM2DBL(epsrel), 
-					NUM2DBL(ay), NUM2DBL(adydt));
+  return gsl_odeiv_control_standard_new(NUM2DBL(epsabs), NUM2DBL(epsrel),
+                                        NUM2DBL(ay), NUM2DBL(adydt));
 }
 
 static gsl_odeiv_control* make_control_y(VALUE epsabs, VALUE epsrel)
@@ -489,16 +478,16 @@ static gsl_odeiv_control* make_control_y(VALUE epsabs, VALUE epsrel)
   return gsl_odeiv_control_y_new(NUM2DBL(epsabs), NUM2DBL(epsrel));
 }
 
-static VALUE rb_gsl_odeiv_control_y_new(VALUE klass, VALUE epsabs, 
-					VALUE epsrel)
+static VALUE rb_gsl_odeiv_control_y_new(VALUE klass, VALUE epsabs,
+                                        VALUE epsrel)
 {
   gsl_odeiv_control *c = NULL;
   c = make_control_y(epsabs, epsrel);
   return Data_Wrap_Struct(klass, 0, gsl_odeiv_control_free, c);
 }
 
-static VALUE rb_gsl_odeiv_control_yp_new(VALUE klass, VALUE epsabs, 
-					 VALUE epsrel)
+static VALUE rb_gsl_odeiv_control_yp_new(VALUE klass, VALUE epsabs,
+                                         VALUE epsrel)
 {
   gsl_odeiv_control *c = NULL;
   Need_Float(epsabs); Need_Float(epsrel);
@@ -506,11 +495,10 @@ static VALUE rb_gsl_odeiv_control_yp_new(VALUE klass, VALUE epsabs,
   return Data_Wrap_Struct(klass, 0, gsl_odeiv_control_free, c);
 }
 
-#ifdef GSL_1_2_LATER
-static VALUE rb_gsl_odeiv_control_scaled_new(VALUE klass, VALUE epsabs, 
-					     VALUE epsrel,
-					     VALUE ay, VALUE adydt,
-					     VALUE sc, VALUE dd)
+static VALUE rb_gsl_odeiv_control_scaled_new(VALUE klass, VALUE epsabs,
+                                             VALUE epsrel,
+                                             VALUE ay, VALUE adydt,
+                                             VALUE sc, VALUE dd)
 {
   gsl_odeiv_control *c = NULL;
   gsl_vector *v = NULL;
@@ -519,23 +507,22 @@ static VALUE rb_gsl_odeiv_control_scaled_new(VALUE klass, VALUE epsabs,
   CHECK_FIXNUM(dd);
   CHECK_VECTOR(sc);
   Data_Get_Struct(sc, gsl_vector, v);
-  c = gsl_odeiv_control_scaled_new(NUM2DBL(epsabs), NUM2DBL(epsrel), 
-				   NUM2DBL(ay), NUM2DBL(adydt), v->data,
-				   FIX2INT(dd));
+  c = gsl_odeiv_control_scaled_new(NUM2DBL(epsabs), NUM2DBL(epsrel),
+                                   NUM2DBL(ay), NUM2DBL(adydt), v->data,
+                                   FIX2INT(dd));
   return Data_Wrap_Struct(klass, 0, gsl_odeiv_control_free, c);
 }
-#endif
 
-static VALUE rb_gsl_odeiv_control_init(VALUE obj, VALUE epsabs, 
-				       VALUE epsrel,
-				       VALUE ay, VALUE adydt)
+static VALUE rb_gsl_odeiv_control_init(VALUE obj, VALUE epsabs,
+                                       VALUE epsrel,
+                                       VALUE ay, VALUE adydt)
 {
   gsl_odeiv_control *c = NULL;
   Need_Float(epsabs); Need_Float(epsrel);
   Need_Float(ay);   Need_Float(adydt);
   Data_Get_Struct(obj, gsl_odeiv_control, c);
-  gsl_odeiv_control_init(c, NUM2DBL(epsabs), NUM2DBL(epsrel), 
-			 NUM2DBL(ay), NUM2DBL(adydt));
+  gsl_odeiv_control_init(c, NUM2DBL(epsabs), NUM2DBL(epsrel),
+                         NUM2DBL(ay), NUM2DBL(adydt));
   return obj;
 }
 
@@ -547,7 +534,7 @@ static VALUE rb_gsl_odeiv_control_name(VALUE obj)
 }
 
 static VALUE rb_gsl_odeiv_control_hadjust(VALUE obj, VALUE ss, VALUE yy0,
-					  VALUE yyerr, VALUE ddydt, VALUE hh)
+                                          VALUE yyerr, VALUE ddydt, VALUE hh)
 {
   gsl_odeiv_control *c = NULL;
   gsl_odeiv_step *s = NULL;
@@ -563,13 +550,13 @@ static VALUE rb_gsl_odeiv_control_hadjust(VALUE obj, VALUE ss, VALUE yy0,
   Data_Get_Struct(yyerr, gsl_vector, yerr);
   Data_Get_Struct(ddydt, gsl_vector, dydt);
   h = NUM2DBL(hh);
-  status = gsl_odeiv_control_hadjust(c, s, y0->data, yerr->data, 
-				     dydt->data, &h);
+  status = gsl_odeiv_control_hadjust(c, s, y0->data, yerr->data,
+                                     dydt->data, &h);
   return rb_ary_new3(2, rb_float_new(h), INT2FIX(status));
 }
 
 static gsl_odeiv_evolve* make_evolve(VALUE dim);
-static VALUE rb_gsl_odeiv_evolve_new(VALUE klass, VALUE dim) 
+static VALUE rb_gsl_odeiv_evolve_new(VALUE klass, VALUE dim)
 {
   gsl_odeiv_evolve *e = NULL;
   e = make_evolve(dim);
@@ -643,7 +630,7 @@ static VALUE rb_gsl_odeiv_evolve_yerr(VALUE obj)
 }
 
 static VALUE rb_gsl_odeiv_evolve_apply(VALUE obj, VALUE cc, VALUE ss, VALUE sss,
-				       VALUE tt, VALUE tt1, VALUE hh, VALUE yy)
+                                       VALUE tt, VALUE tt1, VALUE hh, VALUE yy)
 {
   gsl_odeiv_evolve *e = NULL;
   gsl_odeiv_control *c = NULL;
@@ -658,7 +645,7 @@ static VALUE rb_gsl_odeiv_evolve_apply(VALUE obj, VALUE cc, VALUE ss, VALUE sss,
   if (NIL_P(cc)) {
     c = NULL;
   } else {
-    CHECK_CONTROL(cc); 
+    CHECK_CONTROL(cc);
     Data_Get_Struct(cc, gsl_odeiv_control, c);
   }
   Data_Get_Struct(ss, gsl_odeiv_step, s);
@@ -792,8 +779,8 @@ static VALUE rb_gsl_odeiv_solver_set_sys(VALUE obj, VALUE ss)
   return obj;
 }
 
-static VALUE rb_gsl_odeiv_solver_apply(VALUE obj, VALUE tt, VALUE tt1, VALUE hh, 
-				       VALUE yy)
+static VALUE rb_gsl_odeiv_solver_apply(VALUE obj, VALUE tt, VALUE tt1, VALUE hh,
+                                       VALUE yy)
 {
   gsl_odeiv_solver *gos = NULL;
   gsl_vector *y = NULL;
@@ -807,8 +794,8 @@ static VALUE rb_gsl_odeiv_solver_apply(VALUE obj, VALUE tt, VALUE tt1, VALUE hh,
       if (TYPE(hh) != T_FLOAT) rb_raise(rb_eTypeError, "argument 2 Float expected");*/
   t = NUM2DBL(tt);
   h = NUM2DBL(hh);
-  status = gsl_odeiv_evolve_apply(gos->e, gos->c, gos->s, 
-				  gos->sys, &t, NUM2DBL(tt1), &h, y->data);
+  status = gsl_odeiv_evolve_apply(gos->e, gos->c, gos->s,
+                                  gos->sys, &t, NUM2DBL(tt1), &h, y->data);
   /*  RFLOAT(tt)->value = t;
       RFLOAT(hh)->value = h;
       return INT2FIX(status);*/
@@ -840,8 +827,8 @@ static VALUE rb_gsl_odeiv_solver_set_params(int argc, VALUE *argv, VALUE obj)
 {
   gsl_odeiv_solver *gos = NULL;
   Data_Get_Struct(obj, gsl_odeiv_solver, gos);
-  rb_gsl_odeiv_system_set_params(argc, argv, 
-				 Data_Wrap_Struct(cgsl_odeiv_system, 0, NULL, gos->sys));
+  rb_gsl_odeiv_system_set_params(argc, argv,
+                                 Data_Wrap_Struct(cgsl_odeiv_system, 0, NULL, gos->sys));
   return obj;
 }
 
@@ -861,8 +848,8 @@ void Init_gsl_odeiv(VALUE module)
   rb_define_const(mgsl_odeiv, "HADJ_DEC", INT2FIX(GSL_ODEIV_HADJ_DEC));
   rb_define_const(mgsl_odeiv, "HADJ_INC", INT2FIX(GSL_ODEIV_HADJ_INC));
   rb_define_const(mgsl_odeiv, "HADJ_NIL", INT2FIX(GSL_ODEIV_HADJ_NIL));
-  cgsl_odeiv_step = rb_define_class_under(mgsl_odeiv, "Step", 
-					    cGSL_Object);
+  cgsl_odeiv_step = rb_define_class_under(mgsl_odeiv, "Step",
+                                          cGSL_Object);
   rb_define_singleton_method(cgsl_odeiv_step, "alloc", rb_gsl_odeiv_step_new, -1);
 
   /*****/
@@ -889,23 +876,21 @@ void Init_gsl_odeiv(VALUE module)
 
   /****/
 
-  cgsl_odeiv_control = rb_define_class_under(mgsl_odeiv, "Control", 
-					    cGSL_Object);
+  cgsl_odeiv_control = rb_define_class_under(mgsl_odeiv, "Control",
+                                             cGSL_Object);
   rb_define_singleton_method(cgsl_odeiv_control, "alloc", rb_gsl_odeiv_control_standard_new, 4);
   rb_define_singleton_method(cgsl_odeiv_control, "standard_alloc", rb_gsl_odeiv_control_standard_new, 4);
- rb_define_singleton_method(cgsl_odeiv_control, "y_new", rb_gsl_odeiv_control_y_new, 2);
- rb_define_singleton_method(cgsl_odeiv_control, "yp_new", rb_gsl_odeiv_control_yp_new, 2);
-#ifdef GSL_1_2_LATER
- rb_define_singleton_method(cgsl_odeiv_control, "scaled_alloc", rb_gsl_odeiv_control_scaled_new, 5);
-#endif
+  rb_define_singleton_method(cgsl_odeiv_control, "y_new", rb_gsl_odeiv_control_y_new, 2);
+  rb_define_singleton_method(cgsl_odeiv_control, "yp_new", rb_gsl_odeiv_control_yp_new, 2);
+  rb_define_singleton_method(cgsl_odeiv_control, "scaled_alloc", rb_gsl_odeiv_control_scaled_new, 5);
 
   rb_define_method(cgsl_odeiv_control, "init", rb_gsl_odeiv_control_init, 4);
   rb_define_method(cgsl_odeiv_control, "name", rb_gsl_odeiv_control_name, 0);
   rb_define_method(cgsl_odeiv_control, "hadjust", rb_gsl_odeiv_control_hadjust, 5);
 
- /****/
-  cgsl_odeiv_evolve = rb_define_class_under(mgsl_odeiv, "Evolve", 
-					     cGSL_Object);
+  /****/
+  cgsl_odeiv_evolve = rb_define_class_under(mgsl_odeiv, "Evolve",
+                                            cGSL_Object);
   rb_define_singleton_method(cgsl_odeiv_evolve, "alloc", rb_gsl_odeiv_evolve_new, 1);
 
   rb_define_method(cgsl_odeiv_evolve, "reset", rb_gsl_odeiv_evolve_reset, 0);
@@ -918,19 +903,19 @@ void Init_gsl_odeiv(VALUE module)
   rb_define_method(cgsl_odeiv_evolve, "yerr", rb_gsl_odeiv_evolve_yerr, 0);
   /*****/
 
-  cgsl_odeiv_system = rb_define_class_under(mgsl_odeiv, "System", 
-					    cGSL_Object);
+  cgsl_odeiv_system = rb_define_class_under(mgsl_odeiv, "System",
+                                            cGSL_Object);
   rb_define_singleton_method(cgsl_odeiv_system, "alloc", rb_gsl_odeiv_system_new, -1);
   rb_define_method(cgsl_odeiv_system, "set", rb_gsl_odeiv_system_set, -1);
-  rb_define_method(cgsl_odeiv_system, "set_params", 
-			     rb_gsl_odeiv_system_set_params, -1);
-  rb_define_method(cgsl_odeiv_system, "params", 
-			     rb_gsl_odeiv_system_params, 0);
-  rb_define_method(cgsl_odeiv_system, "function", 
-			     rb_gsl_odeiv_system_function, 0);
+  rb_define_method(cgsl_odeiv_system, "set_params",
+                   rb_gsl_odeiv_system_set_params, -1);
+  rb_define_method(cgsl_odeiv_system, "params",
+                   rb_gsl_odeiv_system_params, 0);
+  rb_define_method(cgsl_odeiv_system, "function",
+                   rb_gsl_odeiv_system_function, 0);
   rb_define_alias(cgsl_odeiv_system, "func", "function");
-  rb_define_method(cgsl_odeiv_system, "jacobian", 
-			     rb_gsl_odeiv_system_jacobian, 0);
+  rb_define_method(cgsl_odeiv_system, "jacobian",
+                   rb_gsl_odeiv_system_jacobian, 0);
   rb_define_alias(cgsl_odeiv_system, "jac", "jacobian");
   rb_define_method(cgsl_odeiv_system, "dimension", rb_gsl_odeiv_system_dimension, 0);
   rb_define_alias(cgsl_odeiv_system, "dim", "dimension");