gsl 1.15.3 → 1.16.0.6

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

@@ -8,10 +8,10 @@
   This library is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY.
 */
-#include "rb_gsl_config.h"
-#include "rb_gsl_fit.h"
-#include "rb_gsl_function.h"
-#include "rb_gsl_common.h"
+
+#include "include/rb_gsl_fit.h"
+#include "include/rb_gsl_function.h"
+#include "include/rb_gsl_common.h"
 
 #ifdef HAVE_NDLINEAR_GSL_MULTIFIT_NDLINEAR_H
 #include <ndlinear/gsl_multifit_ndlinear.h>
@@ -19,23 +19,23 @@ void Init_ndlinear(VALUE module);
 #endif
 
 #ifndef CHECK_WORKSPACE
-#define CHECK_WORKSPACE(x) if(CLASS_OF(x)!=cgsl_multifit_workspace)\
-      rb_raise(rb_eTypeError,\
-      "wrong argument type %s (GSL::MultiFit::Workspace expected)",\
-      rb_class2name(CLASS_OF(x)));
+#define CHECK_WORKSPACE(x) if(CLASS_OF(x)!=cgsl_multifit_workspace) \
+    rb_raise(rb_eTypeError, \
+             "wrong argument type %s (GSL::MultiFit::Workspace expected)", \
+             rb_class2name(CLASS_OF(x)));
 #endif
 
 #ifndef CHECK_MULTIFIT_FUNCTION_FDF
-#define CHECK_MULTIFIT_FUNCTION_FDF(x) if(CLASS_OF(x)!=cgsl_multifit_function_fdf)\
-      rb_raise(rb_eTypeError,\
-      "wrong argument type %s (GSL::MultiFit::Workspace expected)",\
-      rb_class2name(CLASS_OF(x)));
+#define CHECK_MULTIFIT_FUNCTION_FDF(x) if(CLASS_OF(x)!=cgsl_multifit_function_fdf) \
+    rb_raise(rb_eTypeError, \
+             "wrong argument type %s (GSL::MultiFit::Workspace expected)", \
+             rb_class2name(CLASS_OF(x)));
 #endif
 
 static VALUE cgsl_multifit_workspace;
 static VALUE cgsl_multifit_function_fdf;
 
-enum MultiFit_Solver_Type{
+enum MultiFit_Solver_Type {
   GSL_MULTIFIT_FDFSOLVER_LMSDER,
   GSL_MULTIFIT_FDFSOLVER_LMDER,
 };
@@ -56,7 +56,7 @@ static VALUE rb_gsl_multifit_linear(int argc, VALUE *argv, VALUE obj)
   double chisq;
   int status, flag = 0;
   VALUE vc, vcov;
-  if (argc != 2 && argc != 3) 
+  if (argc != 2 && argc != 3)
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or 3)", argc);
   Data_Get_Matrix(argv[0], x);
   Data_Get_Vector(argv[1], y);
@@ -84,7 +84,7 @@ static VALUE rb_gsl_multifit_wlinear(int argc, VALUE *argv, VALUE obj)
   double chisq;
   int status, flag = 0;
   VALUE vc, vcov;
-  if (argc != 3 && argc != 4) 
+  if (argc != 3 && argc != 4)
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 3 or 4)", argc);
   Data_Get_Matrix(argv[0], x);
   Data_Get_Vector(argv[1], w);
@@ -139,7 +139,7 @@ static void calc_X_legendre(gsl_matrix *X, gsl_vector *v, size_t order)
 }
 
 static VALUE rb_gsl_multifit_XXXfit(int argc, VALUE *argv, VALUE obj,
-				    void (*fn)(gsl_matrix*, gsl_vector*,size_t))
+                                    void (*fn)(gsl_matrix*, gsl_vector*,size_t))
 {
   gsl_multifit_linear_workspace *space = NULL;
   gsl_matrix *X = NULL, *cov = NULL;
@@ -149,7 +149,7 @@ static VALUE rb_gsl_multifit_XXXfit(int argc, VALUE *argv, VALUE obj,
   double chisq;
   int status, flag = 0, flagw = 0;
   VALUE vc, verr;
-  if (argc != 3 && argc != 4 && argc != 5) 
+  if (argc != 3 && argc != 4 && argc != 5)
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 3 or 4)", argc);
   x = &xx.vector;
   w = &ww.vector;
@@ -181,9 +181,8 @@ static VALUE rb_gsl_multifit_XXXfit(int argc, VALUE *argv, VALUE obj,
   err = gsl_vector_alloc(order + 1);
   vc = Data_Wrap_Struct(cgsl_poly, 0, gsl_vector_free, c);
   verr = Data_Wrap_Struct(cgsl_poly, 0, gsl_vector_free, err);
-  for (i = 0; i < err->size; i++) 
+  for (i = 0; i < err->size; i++)
     gsl_vector_set(err, i, sqrt(chisq/((double)x->size-err->size)*gsl_matrix_get(cov, i, i)));
-  
   gsl_matrix_free(X);
   gsl_matrix_free(cov);
   return rb_ary_new3(4, vc, verr, rb_float_new(chisq), INT2FIX(status));
@@ -213,31 +212,31 @@ static VALUE rb_gsl_multifit_fdfsolver_new(int argc, VALUE *argv, VALUE klass)
     case T_STRING:
       strcpy(name, STR2CSTR(argv[0]));
       if (str_tail_grep(name, "lmsder") == 0) {
-	T = gsl_multifit_fdfsolver_lmsder;
+        T = gsl_multifit_fdfsolver_lmsder;
       } else if (str_tail_grep(name, "lmder") == 0) {
-	T = gsl_multifit_fdfsolver_lmder;
+        T = gsl_multifit_fdfsolver_lmder;
       } else {
-	rb_raise(rb_eTypeError, "unknown solver type %s (lmsder of lmder)",
-		 name);
+        rb_raise(rb_eTypeError, "unknown solver type %s (lmsder of lmder)",
+                 name);
       }
       break;
     case T_FIXNUM:
       switch (FIX2INT(argv[0])) {
       case GSL_MULTIFIT_FDFSOLVER_LMSDER:
-	T = gsl_multifit_fdfsolver_lmsder;
-	break;
+        T = gsl_multifit_fdfsolver_lmsder;
+        break;
       case GSL_MULTIFIT_FDFSOLVER_LMDER:
-	T = gsl_multifit_fdfsolver_lmder;
-	break;
+        T = gsl_multifit_fdfsolver_lmder;
+        break;
       default:
-	rb_raise(rb_eTypeError, 
-		 "unknown solver type (GSL::MultiFit::FdfSolver::LMSDER or LMDER expected)");
-	break;
+        rb_raise(rb_eTypeError,
+                 "unknown solver type (GSL::MultiFit::FdfSolver::LMSDER or LMDER expected)");
+        break;
       }
       break;
     default:
       rb_raise(rb_eTypeError, "wrong argument type %s (Fixnum or String)",
-	       rb_class2name(CLASS_OF(argv[0])));
+               rb_class2name(CLASS_OF(argv[0])));
       break;
     }
     CHECK_FIXNUM(argv[1]); CHECK_FIXNUM(argv[2]);
@@ -301,8 +300,8 @@ static VALUE rb_gsl_multifit_fdfsolver_print_state(VALUE obj, VALUE i)
   CHECK_FIXNUM(i);
   Data_Get_Struct(obj, gsl_multifit_fdfsolver, solver);
   printf("iter: %d x = %15.8f %15.8f %15.8f |f(x)| = %g\n",
-	 (int) FIX2INT(i), gsl_vector_get(solver->x, 0), gsl_vector_get(solver->x, 1),
-	 gsl_vector_get(solver->x, 2), gsl_blas_dnrm2(solver->f));
+         (int) FIX2INT(i), gsl_vector_get(solver->x, 0), gsl_vector_get(solver->x, 1),
+         gsl_vector_get(solver->x, 2), gsl_blas_dnrm2(solver->f));
   return Qtrue;
 }
 
@@ -449,15 +448,15 @@ static VALUE rb_gsl_multifit_gradient(int argc, VALUE *argv, VALUE obj)
   switch (argc) {
   case 2:
     Data_Get_Matrix(argv[0], J);
-    Data_Get_Vector(argv[1], f);  
+    Data_Get_Vector(argv[1], f);
     g = gsl_vector_alloc(f->size);
     /*status =*/ gsl_multifit_gradient(J, f, g);
     return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, g);
-    break;  
+    break;
   case 3:
     Data_Get_Matrix(argv[0], J);
-    Data_Get_Vector(argv[1], f);  
-    Data_Get_Vector(argv[2], g);  
+    Data_Get_Vector(argv[1], f);
+    Data_Get_Vector(argv[2], g);
     return INT2FIX(gsl_multifit_gradient(J, f, g));
     break;
   default:
@@ -496,15 +495,15 @@ static VALUE rb_gsl_multifit_covar(int argc, VALUE *argv, VALUE obj)
 
 static void rb_gsl_multifit_define_const(VALUE klass)
 {
-  rb_define_const(klass, "LMSDER", 
-		  INT2FIX(GSL_MULTIFIT_FDFSOLVER_LMSDER));
-  rb_define_const(klass, "LMDER", 
-		  INT2FIX(GSL_MULTIFIT_FDFSOLVER_LMDER));
+  rb_define_const(klass, "LMSDER",
+                  INT2FIX(GSL_MULTIFIT_FDFSOLVER_LMSDER));
+  rb_define_const(klass, "LMDER",
+                  INT2FIX(GSL_MULTIFIT_FDFSOLVER_LMDER));
 
-  rb_define_const(klass, "Lmsder", 
-		  INT2FIX(GSL_MULTIFIT_FDFSOLVER_LMSDER));
-  rb_define_const(klass, "Lmder", 
-		  INT2FIX(GSL_MULTIFIT_FDFSOLVER_LMDER));
+  rb_define_const(klass, "Lmsder",
+                  INT2FIX(GSL_MULTIFIT_FDFSOLVER_LMSDER));
+  rb_define_const(klass, "Lmder",
+                  INT2FIX(GSL_MULTIFIT_FDFSOLVER_LMDER));
 }
 
 static void gsl_multifit_function_fdf_free(gsl_multifit_function_fdf *f);
@@ -520,11 +519,11 @@ static void gsl_multifit_function_fdf_mark(gsl_multifit_function_fdf *F)
 }
 
 static int gsl_multifit_function_fdf_f(const gsl_vector *x, void *params,
-				       gsl_vector *f);
+                                       gsl_vector *f);
 static int gsl_multifit_function_fdf_df(const gsl_vector *x, void *params,
-					gsl_matrix *J);
+                                        gsl_matrix *J);
 static int gsl_multifit_function_fdf_fdf(const gsl_vector *x, void *params,
-					 gsl_vector *f, gsl_matrix *J);
+                                         gsl_vector *f, gsl_matrix *J);
 
 static VALUE rb_gsl_multifit_function_fdf_set_procs(int argc, VALUE *argv, VALUE obj);
 
@@ -551,7 +550,7 @@ static VALUE rb_gsl_multifit_function_fdf_new(int argc, VALUE *argv, VALUE klass
     break;
   }
   return obj;
-}			    
+}
 
 static VALUE rb_gsl_multifit_function_fdf_set_procs(int argc, VALUE *argv, VALUE obj)
 {
@@ -568,8 +567,8 @@ static VALUE rb_gsl_multifit_function_fdf_set_procs(int argc, VALUE *argv, VALUE
   rb_ary_store(ary, 0, argv[0]);
   rb_ary_store(ary, 1, argv[1]);
   switch (argc) {
-	case 2:
-		break;
+  case 2:
+    break;
   case 3:
     if (TYPE(argv[2]) == T_FIXNUM) {
       func->p = FIX2INT(argv[2]);
@@ -621,7 +620,7 @@ static VALUE rb_gsl_multifit_function_fdf_set_data(int argc, VALUE *argv, VALUE
 }
 
 static int gsl_multifit_function_fdf_f(const gsl_vector *x, void *params,
-				       gsl_vector *f)
+                                       gsl_vector *f)
 {
   VALUE vt_y_sigma, vt, vy, vsigma, vf, vx, proc, ary;
   ary = (VALUE) params;
@@ -643,13 +642,13 @@ static int gsl_multifit_function_fdf_f(const gsl_vector *x, void *params,
     break;
   default:
     rb_raise(rb_eArgError, "bad argument");
-    break;    
+    break;
   }
   return GSL_SUCCESS;
 }
 
 static int gsl_multifit_function_fdf_df(const gsl_vector *x, void *params,
-					gsl_matrix *J)
+                                        gsl_matrix *J)
 {
   VALUE vt_y_sigma, vt, vy, vsigma, vJ, vx, proc, ary;
   ary = (VALUE) params;
@@ -671,13 +670,13 @@ static int gsl_multifit_function_fdf_df(const gsl_vector *x, void *params,
     break;
   default:
     rb_raise(rb_eArgError, "bad argument");
-    break;    
+    break;
   }
   return GSL_SUCCESS;
 }
 
 static int gsl_multifit_function_fdf_fdf(const gsl_vector *x, void *params,
-					 gsl_vector *f, gsl_matrix *J)
+                                         gsl_vector *f, gsl_matrix *J)
 {
   VALUE vt_y_sigma, vt, vy, vsigma, vf, vJ, vx, proc_f, proc_df, proc_fdf;
   VALUE ary;
@@ -696,7 +695,7 @@ static int gsl_multifit_function_fdf_fdf(const gsl_vector *x, void *params,
     if (NIL_P(proc_fdf)) {
       rb_funcall(proc_f, RBGSL_ID_call, 4, vx, vt, vy, vf);
       rb_funcall(proc_df, RBGSL_ID_call, 4, vx, vt, vy, vJ);
-    } else 
+    } else
       rb_funcall(proc_fdf, RBGSL_ID_call, 5, vx, vt, vy, vf, vJ);
     break;
   case 3:
@@ -706,12 +705,12 @@ static int gsl_multifit_function_fdf_fdf(const gsl_vector *x, void *params,
     if (NIL_P(proc_fdf)) {
       rb_funcall(proc_f, RBGSL_ID_call, 5, vx, vt, vy, vsigma, vf);
       rb_funcall(proc_df, RBGSL_ID_call, 5, vx, vt, vy, vsigma, vJ);
-    } else 
+    } else
       rb_funcall(proc_fdf, RBGSL_ID_call, 6, vx, vt, vy, vsigma, vf, vJ);
     break;
   default:
     rb_raise(rb_eArgError, "bad argument");
-    break;    
+    break;
   }
   return GSL_SUCCESS;
 }
@@ -750,7 +749,7 @@ struct fitting_xydata {
   gsl_vector *x, *y, *w;
 };
 
-/* Gaussian fit 
+/* Gaussian fit
    y = y0 + A exp(-(x-x0/sigma)^2)
        v[0] = y0
        v[1] = A
@@ -807,14 +806,14 @@ static int Gaussian_df(const gsl_vector *v, void *data, gsl_matrix *J)
 }
 
 static int Gaussian_fdf(const gsl_vector *v, void *data,
-			gsl_vector *f, gsl_matrix *J)
+                        gsl_vector *f, gsl_matrix *J)
 {
   Gaussian_f(v, data, f);
   Gaussian_df(v, data, J);
   return GSL_SUCCESS;
 }
 
-/* 2 Gaussian fit 
+/* 2 Gaussian fit
    y = y0 + A1 exp(-(x-x01/sigma1)^2) + A2 exp(-(x-x02/sigma2)^2)
        v[0] = y0
        v[1] = A1
@@ -885,14 +884,14 @@ static int Gaussian_2peaks_df(const gsl_vector *v, void *data, gsl_matrix *J)
 }
 
 static int Gaussian_2peaks_fdf(const gsl_vector *v, void *data,
-			gsl_vector *f, gsl_matrix *J)
+                               gsl_vector *f, gsl_matrix *J)
 {
   Gaussian_2peaks_f(v, data, f);
   Gaussian_2peaks_df(v, data, J);
   return GSL_SUCCESS;
 }
 
-/* Exponential fit 
+/* Exponential fit
    y = y0 + A exp(-bx)
        v[0] = y0
        v[1] = A
@@ -938,14 +937,14 @@ static int Exponential_df(const gsl_vector *v, void *data, gsl_matrix *J)
     else wi = 1.0;
     yy = exp(-xi*b);
     gsl_matrix_set(J, i, 0, 1.0*wi);
-    gsl_matrix_set(J, i, 1, yy*wi); 
+    gsl_matrix_set(J, i, 1, yy*wi);
     gsl_matrix_set(J, i, 2, -A*yy*xi*wi);
   }
   return GSL_SUCCESS;
 }
 
 static int Exponential_fdf(const gsl_vector *v, void *data,
-			gsl_vector *f, gsl_matrix *J)
+                           gsl_vector *f, gsl_matrix *J)
 {
   Exponential_f(v, data, f);
   Exponential_df(v, data, J);
@@ -953,7 +952,7 @@ static int Exponential_fdf(const gsl_vector *v, void *data,
 }
 
 
-/* Double Exponential fit 
+/* Double Exponential fit
    y = y0 + A1 exp(-b1 x) + A2 exp(-b2 x)
        v[0] = y0
        v[1] = A1
@@ -1006,23 +1005,23 @@ static int DblExponential_df(const gsl_vector *v, void *data, gsl_matrix *J)
     yy1 = exp(-xi*b1);
     yy2 = exp(-xi*b2);
     gsl_matrix_set(J, i, 0, 1.0*wi);
-    gsl_matrix_set(J, i, 1, yy1*wi); 
+    gsl_matrix_set(J, i, 1, yy1*wi);
     gsl_matrix_set(J, i, 2, -A1*yy1*xi*wi);
-    gsl_matrix_set(J, i, 3, yy2*wi); 
+    gsl_matrix_set(J, i, 3, yy2*wi);
     gsl_matrix_set(J, i, 4, -A2*yy2*xi*wi);
   }
   return GSL_SUCCESS;
 }
 
 static int DblExponential_fdf(const gsl_vector *v, void *data,
-			gsl_vector *f, gsl_matrix *J)
+                              gsl_vector *f, gsl_matrix *J)
 {
   DblExponential_f(v, data, f);
   DblExponential_df(v, data, J);
   return GSL_SUCCESS;
 }
 
-/* Lorentzian fit 
+/* Lorentzian fit
    y = y0 + A/((x-x0)^2 + B)
        v[0] = y0
        v[1] = A
@@ -1071,7 +1070,7 @@ static int Lorentzian_df(const gsl_vector *v, void *data, gsl_matrix *J)
     else wi = 1.0;
     yy = gsl_pow_2(xi-x0)+B;
     gsl_matrix_set(J, i, 0, 1.0*wi);
-    gsl_matrix_set(J, i, 1, 1.0/yy*wi); 
+    gsl_matrix_set(J, i, 1, 1.0/yy*wi);
     gsl_matrix_set(J, i, 2, 2.0*A*(xi-x0)/yy/yy*wi);
     gsl_matrix_set(J, i, 3, -A/yy/yy*wi);
   }
@@ -1079,7 +1078,7 @@ static int Lorentzian_df(const gsl_vector *v, void *data, gsl_matrix *J)
 }
 
 static int Lorentzian_fdf(const gsl_vector *v, void *data,
-			gsl_vector *f, gsl_matrix *J)
+                          gsl_vector *f, gsl_matrix *J)
 {
   Lorentzian_f(v, data, f);
   Lorentzian_df(v, data, J);
@@ -1136,7 +1135,7 @@ static int Sin_df(const gsl_vector *v, void *data, gsl_matrix *J)
     ys = sin(fc*xi + phi);
     yc = cos(fc*xi + phi);
     gsl_matrix_set(J, i, 0, 1.0*wi);
-    gsl_matrix_set(J, i, 1, ys*wi); 
+    gsl_matrix_set(J, i, 1, ys*wi);
     gsl_matrix_set(J, i, 2, A*yc*xi*wi);
     gsl_matrix_set(J, i, 3, A*yc*wi);
   }
@@ -1144,7 +1143,7 @@ static int Sin_df(const gsl_vector *v, void *data, gsl_matrix *J)
 }
 
 static int Sin_fdf(const gsl_vector *v, void *data,
-			gsl_vector *f, gsl_matrix *J)
+                   gsl_vector *f, gsl_matrix *J)
 {
   Sin_f(v, data, f);
   Sin_df(v, data, J);
@@ -1202,7 +1201,7 @@ static int Hill_df(const gsl_vector *v, void *data, gsl_matrix *J)
     a = pow(xhalf/xi, r);
     yy = (1.0 + a);
     gsl_matrix_set(J, i, 0, (1.0 - 1.0/yy)*wi);
-    gsl_matrix_set(J, i, 1, 1.0/yy*wi); 
+    gsl_matrix_set(J, i, 1, 1.0/yy*wi);
     gsl_matrix_set(J, i, 2, -(m-y0)*r/xhalf*a/yy/yy*wi);
     gsl_matrix_set(J, i, 3, -(m-y0)/yy/yy*a*log(xhalf/xi)*wi);
   }
@@ -1210,7 +1209,7 @@ static int Hill_df(const gsl_vector *v, void *data, gsl_matrix *J)
 }
 
 static int Hill_fdf(const gsl_vector *v, void *data,
-			gsl_vector *f, gsl_matrix *J)
+                    gsl_vector *f, gsl_matrix *J)
 {
   Hill_f(v, data, f);
   Hill_df(v, data, J);
@@ -1267,7 +1266,7 @@ static int Sigmoid_df(const gsl_vector *v, void *data, gsl_matrix *J)
     a = exp((x0 - xi)/r);
     yy = 1.0 + a;
     gsl_matrix_set(J, i, 0, wi);
-    gsl_matrix_set(J, i, 1, 1.0/yy*wi); 
+    gsl_matrix_set(J, i, 1, 1.0/yy*wi);
     gsl_matrix_set(J, i, 2, -m*a/r/yy/yy*wi);
     gsl_matrix_set(J, i, 3, m*a*(x0-xi)/r/r/yy/yy*wi);
   }
@@ -1275,7 +1274,7 @@ static int Sigmoid_df(const gsl_vector *v, void *data, gsl_matrix *J)
 }
 
 static int Sigmoid_fdf(const gsl_vector *v, void *data,
-			gsl_vector *f, gsl_matrix *J)
+                       gsl_vector *f, gsl_matrix *J)
 {
   Sigmoid_f(v, data, f);
   Sigmoid_df(v, data, J);
@@ -1329,15 +1328,15 @@ static int Power_df(const gsl_vector *v, void *data, gsl_matrix *J)
     else wi = 1.0;
     a = pow(xi, r);
     gsl_matrix_set(J, i, 0, wi);
-    gsl_matrix_set(J, i, 1, a*wi); 
+    gsl_matrix_set(J, i, 1, a*wi);
     gsl_matrix_set(J, i, 2, A*a*log(xi)*wi);
-    
+
   }
   return GSL_SUCCESS;
 }
 
 static int Power_fdf(const gsl_vector *v, void *data,
-			gsl_vector *f, gsl_matrix *J)
+                     gsl_vector *f, gsl_matrix *J)
 {
   Power_f(v, data, f);
   Power_df(v, data, J);
@@ -1395,7 +1394,7 @@ static int Lognormal_df(const gsl_vector *v, void *data, gsl_matrix *J)
     a = log(xi/x0)/width;
     b = exp(-a*a);
     gsl_matrix_set(J, i, 0, wi);
-    gsl_matrix_set(J, i, 1, b*wi); 
+    gsl_matrix_set(J, i, 1, b*wi);
     gsl_matrix_set(J, i, 2, 2.0*A*b*a*a*a/width/x0*wi);
     gsl_matrix_set(J, i, 3, 2.0*A*b*a*a*a*a/width*wi);
   }
@@ -1403,14 +1402,14 @@ static int Lognormal_df(const gsl_vector *v, void *data, gsl_matrix *J)
 }
 
 static int Lognormal_fdf(const gsl_vector *v, void *data,
-			gsl_vector *f, gsl_matrix *J)
+                         gsl_vector *f, gsl_matrix *J)
 {
   Lognormal_f(v, data, f);
   Lognormal_df(v, data, J);
   return GSL_SUCCESS;
 }
 
-/* Rayleigh fit 
+/* Rayleigh fit
    y = A exp(-x*x/2/var)
        v[0] = A
        v[1] = var = sigma^2
@@ -1460,7 +1459,7 @@ static int Rayleigh_df(const gsl_vector *v, void *data, gsl_matrix *J)
 }
 
 static int Rayleigh_fdf(const gsl_vector *v, void *data,
-			gsl_vector *f, gsl_matrix *J)
+                        gsl_vector *f, gsl_matrix *J)
 {
   Rayleigh_f(v, data, f);
   Rayleigh_df(v, data, J);
@@ -1507,10 +1506,10 @@ static void set_fittype(gsl_multifit_function_fdf *f, const char *fittype, size_
       *v = gsl_vector_alloc(*p);
       gsl_vector_set(*v, 0, 0);   /* y0 = 0 */
       gsl_vector_set(*v, 1, 1);   /* A = 1 */
-      gsl_vector_set(*v, 2, 1);   
+      gsl_vector_set(*v, 2, 1);
       *flag = 1;
     }
- } else if (str_head_grep(fittype, "rayleigh") == 0) {
+  } else if (str_head_grep(fittype, "rayleigh") == 0) {
     f->f = Rayleigh_f;
     f->df = Rayleigh_df;
     f->fdf = Rayleigh_fdf;
@@ -1530,9 +1529,9 @@ static void set_fittype(gsl_multifit_function_fdf *f, const char *fittype, size_
       *v = gsl_vector_alloc(*p);
       gsl_vector_set(*v, 0, 0);   /* y0 = 0 */
       gsl_vector_set(*v, 1, 1);   /* A = 1 */
-      gsl_vector_set(*v, 2, 1);   
+      gsl_vector_set(*v, 2, 1);
       gsl_vector_set(*v, 3, 1);   /* A = 1 */
-      gsl_vector_set(*v, 4, 1);   
+      gsl_vector_set(*v, 4, 1);
       *flag = 1;
     }
   } else if (str_head_grep(fittype, "lor") == 0) {
@@ -1542,10 +1541,10 @@ static void set_fittype(gsl_multifit_function_fdf *f, const char *fittype, size_
     *p = 4;
     if (*v == NULL) {
       *v = gsl_vector_alloc(*p);
-      gsl_vector_set(*v, 0, 0); 
+      gsl_vector_set(*v, 0, 0);
       gsl_vector_set(*v, 1, 1);
-      gsl_vector_set(*v, 2, 0);  
-      gsl_vector_set(*v, 3, 1);  
+      gsl_vector_set(*v, 2, 0);
+      gsl_vector_set(*v, 3, 1);
       *flag = 1;
     }
   } else if (str_head_grep(fittype, "sin") == 0) {
@@ -1555,10 +1554,10 @@ static void set_fittype(gsl_multifit_function_fdf *f, const char *fittype, size_
     *p = 4;
     if (*v == NULL) {
       *v = gsl_vector_alloc(*p);
-      gsl_vector_set(*v, 0, 0); 
+      gsl_vector_set(*v, 0, 0);
       gsl_vector_set(*v, 1, 1);
-      gsl_vector_set(*v, 2, 1);  
-      gsl_vector_set(*v, 3, 0);  
+      gsl_vector_set(*v, 2, 1);
+      gsl_vector_set(*v, 3, 0);
       *flag = 1;
     }
   } else if (str_head_grep(fittype, "hill") == 0) {
@@ -1568,10 +1567,10 @@ static void set_fittype(gsl_multifit_function_fdf *f, const char *fittype, size_
     *p = 4;
     if (*v == NULL) {
       *v = gsl_vector_alloc(*p);
-      gsl_vector_set(*v, 0, 0); 
+      gsl_vector_set(*v, 0, 0);
       gsl_vector_set(*v, 1, 1);
-      gsl_vector_set(*v, 2, 1);  
-      gsl_vector_set(*v, 3, 1);  
+      gsl_vector_set(*v, 2, 1);
+      gsl_vector_set(*v, 3, 1);
       *flag = 1;
     }
   } else if (str_head_grep(fittype, "sigmoid") == 0 || str_head_grep(fittype, "fermi") == 0) {
@@ -1581,10 +1580,10 @@ static void set_fittype(gsl_multifit_function_fdf *f, const char *fittype, size_
     *p = 4;
     if (*v == NULL) {
       *v = gsl_vector_alloc(*p);
-      gsl_vector_set(*v, 0, 0); 
+      gsl_vector_set(*v, 0, 0);
       gsl_vector_set(*v, 1, 1);
-      gsl_vector_set(*v, 2, 0);  
-      gsl_vector_set(*v, 3, 1);  
+      gsl_vector_set(*v, 2, 0);
+      gsl_vector_set(*v, 3, 1);
       *flag = 1;
     }
   } else if (str_head_grep(fittype, "power") == 0) {
@@ -1594,9 +1593,9 @@ static void set_fittype(gsl_multifit_function_fdf *f, const char *fittype, size_
     *p = 3;
     if (*v == NULL) {
       *v = gsl_vector_alloc(*p);
-      gsl_vector_set(*v, 0, 0); 
+      gsl_vector_set(*v, 0, 0);
       gsl_vector_set(*v, 1, 1);
-      gsl_vector_set(*v, 2, -1);  
+      gsl_vector_set(*v, 2, -1);
       *flag = 1;
     }
   } else if (str_head_grep(fittype, "lognormal") == 0) {
@@ -1606,16 +1605,15 @@ static void set_fittype(gsl_multifit_function_fdf *f, const char *fittype, size_
     *p = 4;
     if (*v == NULL) {
       *v = gsl_vector_alloc(*p);
-      gsl_vector_set(*v, 0, 0); 
+      gsl_vector_set(*v, 0, 0);
       gsl_vector_set(*v, 1, 1);
-      gsl_vector_set(*v, 2, 1);  
-      gsl_vector_set(*v, 3, 1);  
+      gsl_vector_set(*v, 2, 1);
+      gsl_vector_set(*v, 3, 1);
       *flag = 1;
     }
   } else {
     rb_raise(rb_eRuntimeError, "Unknown fit type (gaussian expected)");
   }
-
 }
 
 /* Singleton method */
@@ -1708,12 +1706,11 @@ static VALUE rb_gsl_multifit_fit(int argc, VALUE *argv, VALUE klass)
   if (flag == 1) gsl_vector_free(v);
   gsl_multifit_fdfsolver_free(solver);
   return rb_ary_new3(4,
-		     Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vout),
-		     Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, verr),
-		     rb_float_new(chi2), INT2FIX(dof));
+                     Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vout),
+                     Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, verr),
+                     rb_float_new(chi2), INT2FIX(dof));
 }
 
-#ifdef GSL_1_8_LATER
 static VALUE rb_gsl_multifit_linear_est(VALUE module, VALUE xx, VALUE cc, VALUE ccov)
 {
   gsl_vector *x, *c;
@@ -1726,8 +1723,7 @@ static VALUE rb_gsl_multifit_linear_est(VALUE module, VALUE xx, VALUE cc, VALUE
   gsl_multifit_linear_est(x, c, cov, &y, &y_err);
   return rb_ary_new3(2, rb_float_new(y), rb_float_new(y_err));
 }
-#endif
-#ifdef GSL_1_11_LATER
+
 static VALUE rb_gsl_multifit_linear_residuals(int argc, VALUE argv[], VALUE module)
 {
   gsl_vector *y, *c, *r;
@@ -1755,8 +1751,6 @@ static VALUE rb_gsl_multifit_linear_residuals(int argc, VALUE argv[], VALUE modu
   return ret;
 }
 
-#endif
-
 void Init_gsl_multifit(VALUE module)
 {
   VALUE mgsl_multifit;
@@ -1765,34 +1759,34 @@ void Init_gsl_multifit(VALUE module)
 
   mgsl_multifit = rb_define_module_under(module, "MultiFit");
 
-  cgsl_multifit_workspace = rb_define_class_under(mgsl_multifit, "Workspace", 
-						  cGSL_Object);
-  rb_define_singleton_method(cgsl_multifit_workspace, "new", 
-			     rb_gsl_multifit_workspace_new, 2);
-  rb_define_singleton_method(cgsl_multifit_workspace, "alloc", 
-			     rb_gsl_multifit_workspace_new, 2);
-  rb_define_singleton_method(mgsl_multifit, "alloc", 
-			     rb_gsl_multifit_workspace_new, 2);			     
+  cgsl_multifit_workspace = rb_define_class_under(mgsl_multifit, "Workspace",
+                                                  cGSL_Object);
+  rb_define_singleton_method(cgsl_multifit_workspace, "new",
+                             rb_gsl_multifit_workspace_new, 2);
+  rb_define_singleton_method(cgsl_multifit_workspace, "alloc",
+                             rb_gsl_multifit_workspace_new, 2);
+  rb_define_singleton_method(mgsl_multifit, "alloc",
+                             rb_gsl_multifit_workspace_new, 2);
   rb_define_module_function(mgsl_multifit, "linear", rb_gsl_multifit_linear, -1);
   rb_define_module_function(mgsl_multifit, "wlinear", rb_gsl_multifit_wlinear, -1);
 
   cgsl_multifit_solver = rb_define_class_under(mgsl_multifit, "Solver", cGSL_Object);
-  cgsl_multifit_fdfsolver = rb_define_class_under(mgsl_multifit, "FdfSolver", 
-						  cgsl_multifit_solver);
+  cgsl_multifit_fdfsolver = rb_define_class_under(mgsl_multifit, "FdfSolver",
+                                                  cgsl_multifit_solver);
   cgsl_multifit_function_fdf = rb_define_class_under(mgsl_multifit, "Function_fdf",
-						     cGSL_Object);
+                                                     cGSL_Object);
 
   /*****/
 
-  rb_define_singleton_method(cgsl_multifit_fdfsolver, "new", 
-			     rb_gsl_multifit_fdfsolver_new, -1);
-  rb_define_singleton_method(cgsl_multifit_fdfsolver, "alloc", 
-			     rb_gsl_multifit_fdfsolver_new, -1);
+  rb_define_singleton_method(cgsl_multifit_fdfsolver, "new",
+                             rb_gsl_multifit_fdfsolver_new, -1);
+  rb_define_singleton_method(cgsl_multifit_fdfsolver, "alloc",
+                             rb_gsl_multifit_fdfsolver_new, -1);
 
-  rb_define_singleton_method(cgsl_multifit_function_fdf, "new", 
-			     rb_gsl_multifit_function_fdf_new, -1);
-  rb_define_singleton_method(cgsl_multifit_function_fdf, "alloc", 
-			     rb_gsl_multifit_function_fdf_new, -1);
+  rb_define_singleton_method(cgsl_multifit_function_fdf, "new",
+                             rb_gsl_multifit_function_fdf_new, -1);
+  rb_define_singleton_method(cgsl_multifit_function_fdf, "alloc",
+                             rb_gsl_multifit_function_fdf_new, -1);
 
   /*****/
 
@@ -1827,35 +1821,32 @@ void Init_gsl_multifit(VALUE module)
 
   rb_gsl_multifit_define_const(cgsl_multifit_fdfsolver);
 
-  rb_define_method(cgsl_multifit_function_fdf, "set_procs", 
-		   rb_gsl_multifit_function_fdf_set_procs, -1);
-  rb_define_method(cgsl_multifit_function_fdf, "set_data", 
-		   rb_gsl_multifit_function_fdf_set_data, -1);
-  rb_define_method(cgsl_multifit_function_fdf, "params", 
-		   rb_gsl_multifit_function_fdf_params, 0);
+  rb_define_method(cgsl_multifit_function_fdf, "set_procs",
+                   rb_gsl_multifit_function_fdf_set_procs, -1);
+  rb_define_method(cgsl_multifit_function_fdf, "set_data",
+                   rb_gsl_multifit_function_fdf_set_data, -1);
+  rb_define_method(cgsl_multifit_function_fdf, "params",
+                   rb_gsl_multifit_function_fdf_params, 0);
   rb_define_alias(cgsl_multifit_function_fdf, "param", "params");
 
-  rb_define_method(cgsl_multifit_function_fdf, "n", 
-		   rb_gsl_multifit_function_fdf_n, 0);
-  rb_define_method(cgsl_multifit_function_fdf, "set_n", 
-		   rb_gsl_multifit_function_fdf_set_n, 1);
+  rb_define_method(cgsl_multifit_function_fdf, "n",
+                   rb_gsl_multifit_function_fdf_n, 0);
+  rb_define_method(cgsl_multifit_function_fdf, "set_n",
+                   rb_gsl_multifit_function_fdf_set_n, 1);
   rb_define_alias(cgsl_multifit_function_fdf, "n=", "set_n");
-  rb_define_method(cgsl_multifit_function_fdf, "p", 
-		   rb_gsl_multifit_function_fdf_p, 0);
+  rb_define_method(cgsl_multifit_function_fdf, "p",
+                   rb_gsl_multifit_function_fdf_p, 0);
   rb_define_alias(cgsl_multifit_function_fdf, "np", "p");
 
   /*****/
   rb_define_singleton_method(cgsl_multifit_fdfsolver, "fit", rb_gsl_multifit_fit, -1);
 
   /***/
-#ifdef GSL_1_8_LATER
   rb_define_module_function(mgsl_multifit, "linear_est", rb_gsl_multifit_linear_est, 3);
   rb_define_module_function(module, "multifit_linear_est", rb_gsl_multifit_linear_est, 3);
-#endif
-#ifdef GSL_1_11_LATER
+
   rb_define_module_function(mgsl_multifit, "linear_residuals", rb_gsl_multifit_linear_residuals, -1);
   rb_define_module_function(module, "multifit_linear_residuals", rb_gsl_multifit_linear_residuals, -1);
-#endif
 
 #ifdef HAVE_NDLINEAR_GSL_MULTIFIT_NDLINEAR_H
   Init_ndlinear(mgsl_multifit);