rb-gsl 1.16.0.4 → 1.16.0.5

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

@@ -98,16 +98,14 @@ void Init_gsl_native()
   Init_gsl_eigen(mgsl);
 
   Init_gsl_fft(mgsl);
-    Init_gsl_signal(mgsl);
+  Init_gsl_signal(mgsl);
   Init_gsl_function(mgsl);
   Init_gsl_integration(mgsl);
 
   Init_gsl_rng(mgsl);
   Init_gsl_qrng(mgsl);
   Init_gsl_ran(mgsl);
-#ifdef GSL_1_4_LATER
   Init_gsl_cdf(mgsl);
-#endif
   Init_gsl_stats(mgsl);
 
   Init_gsl_histogram(mgsl);
@@ -121,9 +119,7 @@ void Init_gsl_native()
   Init_gsl_interp(mgsl);
   Init_gsl_spline(mgsl);
   Init_gsl_diff(mgsl);
-#ifdef GSL_1_4_9_LATER
   Init_gsl_deriv(mgsl);
-#endif
 
   Init_gsl_cheb(mgsl);
   Init_gsl_sum(mgsl);
@@ -161,32 +157,28 @@ void Init_gsl_native()
 #endif
 
 #ifdef HAVE_OOL_OOL_VERSION_H
-	Init_ool(mgsl);
+  Init_ool(mgsl);
 #endif
 
 #ifdef HAVE_JACOBI_H
-	Init_jacobi(mgsl);
+  Init_jacobi(mgsl);
 #endif
 
 #ifdef HAVE_GSL_GSL_CQP_H
-	Init_cqp(mgsl);
+  Init_cqp(mgsl);
 #endif
 
-	Init_fresnel(mgsl);
-	
-#ifdef GSL_1_9_LATER
-	Init_bspline(mgsl);
-#endif
+  Init_fresnel(mgsl);
+
+  Init_bspline(mgsl);
 
 #ifdef HAVE_ALF_ALF_H
-	Init_alf(mgsl);
+  Init_alf(mgsl);
 #endif
 
-	Init_geometry(mgsl);
+  Init_geometry(mgsl);
 
-#ifdef GSL_1_14_LATER
-	Init_multiset(mgsl);
-#endif
+  Init_multiset(mgsl);
 
   rb_gsl_define_methods(mgsl);
 }
@@ -209,10 +201,8 @@ static void rb_gsl_define_const(VALUE module)
   rb_define_const(module, "PREC_DOUBLE", INT2FIX(GSL_PREC_DOUBLE));
   rb_define_const(module, "PREC_SINGLE", INT2FIX(GSL_PREC_SINGLE));
   rb_define_const(module, "PREC_APPROX", INT2FIX(GSL_PREC_APPROX));
-#ifdef GSL_VERSION
   rb_define_const(module, "VERSION", rb_str_new2(GSL_VERSION));
   rb_define_const(module, "GSL_VERSION", rb_str_new2(GSL_VERSION));
-#endif
 
   rb_define_const(module, "DBL_EPSILON", rb_float_new(GSL_DBL_EPSILON));
   rb_define_const(module, "FLT_EPSILON", rb_float_new(GSL_FLT_EPSILON));
@@ -240,11 +230,8 @@ static void rb_gsl_define_const(VALUE module)
   rb_define_const(module, "ROOT6_DBL_MIN", rb_float_new(GSL_ROOT6_DBL_MIN));
   rb_define_const(module, "LOG_DBL_MIN", rb_float_new(GSL_LOG_DBL_MIN));
 
-#ifdef GSL_1_14_LATER
   rb_define_const(module, "MAJOR_VERSION", INT2FIX(GSL_MAJOR_VERSION));
   rb_define_const(module, "MINOR_VERSION", INT2FIX(GSL_MINOR_VERSION));
-#endif
-
 }
 
 static VALUE rb_gsl_have_tensor(VALUE module)

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

@@ -7,7 +7,6 @@
 
 #ifdef HAVE_NARRAY_H
 #include "include/rb_gsl_array.h"
-#include "narray.h"
 #include "include/rb_gsl_with_narray.h"
 
 static VALUE rb_gsl_na_to_gsl_matrix_method(VALUE nna);
@@ -30,7 +29,7 @@ static VALUE rb_gsl_vector_to_narray(VALUE obj, VALUE klass)
     memcpy(NA_PTR_TYPE(nary,double*), v->data, shape[0]*sizeof(double));
   } else {
     int i;
-    for(i=0; i < (int) v->size; i++) {
+    for(i = 0; i < (int) v->size; i++) {
       (NA_PTR_TYPE(nary,double*))[i] = gsl_vector_get(v, i);
     }
   }
@@ -49,7 +48,7 @@ static VALUE rb_gsl_vector_complex_to_narray(VALUE obj, VALUE klass)
     memcpy(NA_PTR_TYPE(nary,double*), v->data, shape[0]*2*sizeof(double));
   } else {
     int i;
-    for(i=0; i < (int) (2*v->size); i++) {
+    for(i = 0; i < (int) (2*v->size); i++) {
       (NA_PTR_TYPE(nary,gsl_complex*))[i] = gsl_vector_complex_get(v, i);
     }
   }
@@ -66,8 +65,7 @@ static VALUE rb_gsl_vector_to_na(VALUE obj)
     na = rb_gsl_vector_complex_to_narray(obj, cNArray);
   else
     rb_raise(rb_eRuntimeError, "unexpected type '%s'",
-        rb_obj_classname(obj));
-
+             rb_obj_classname(obj));
   return na;
 }
 
@@ -141,7 +139,7 @@ static VALUE rb_gsl_vector_to_narray_ref(VALUE obj, VALUE klass)
     na->ptr = (char *) vc->data;
   } else {
     rb_raise(rb_eRuntimeError, "cannot convert %s to NArray reference object",
-        rb_obj_classname(obj));
+             rb_obj_classname(obj));
   }
   nary = Data_Wrap_Struct(klass, 0, rb_gsl_na_view_free, na);
   return nary;
@@ -169,7 +167,7 @@ static VALUE rb_gsl_vector_int_to_narray(VALUE obj, VALUE klass)
     memcpy(NA_PTR_TYPE(nary,int*), v->data, shape[0]*sizeof(int));
   } else {
     int i;
-    for(i=0; i < (int) v->size; i++) {
+    for(i = 0; i < (int) v->size; i++) {
       (NA_PTR_TYPE(nary,int*))[i] = gsl_vector_int_get(v, i);
     }
   }
@@ -229,11 +227,10 @@ static VALUE rb_gsl_na_to_gsl_vector_method(VALUE na)
 
   if(NA_TYPE(na) == NA_SCOMPLEX || NA_TYPE(na) == NA_DCOMPLEX)
     v = Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free,
-        na_to_gv_complex(na));
+                         na_to_gv_complex(na));
   else
     v = Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free,
-        na_to_gv(na));
-
+                         na_to_gv(na));
   return v;
 }
 
@@ -243,11 +240,10 @@ VALUE rb_gsl_na_to_gsl_vector_view_method(VALUE na)
 
   if(NA_TYPE(na) == NA_SCOMPLEX || NA_TYPE(na) == NA_DCOMPLEX)
     v = Data_Wrap_Struct(cgsl_vector_complex_view, 0, gsl_vector_complex_view_free,
-        na_to_gv_complex_view(na));
+                         na_to_gv_complex_view(na));
   else
     v = Data_Wrap_Struct(cgsl_vector_view, 0, gsl_vector_view_free,
-        na_to_gv_view(na));
-
+                         na_to_gv_view(na));
   return v;
 }
 
@@ -282,7 +278,6 @@ gsl_vector_view* na_to_gv_view(VALUE na)
   // Raise exception if na's type is not NA_DFLOAT.
   if(NA_TYPE(na) != NA_DFLOAT)
     rb_raise(rb_eTypeError, "GSL::Vector::View requires NArray be DFLOAT");
-
   v = gsl_vector_view_alloc();
   v->vector.data = NA_PTR_TYPE(na,double*);
   v->vector.size = NA_TOTAL(na);
@@ -310,7 +305,6 @@ gsl_vector_complex_view* na_to_gv_complex_view(VALUE na)
   // Raise exception if na's type is not NA_DCOMPLEX
   if(NA_TYPE(na) != NA_DCOMPLEX)
     rb_raise(rb_eTypeError, "GSL::Vector::Complex::View requires NArray be DCOMPLEX");
-
   v = gsl_vector_complex_view_alloc();
   v->vector.data = NA_PTR_TYPE(na,double*);
   v->vector.size = NA_TOTAL(na);
@@ -357,7 +351,7 @@ static VALUE rb_gsl_matrix_to_narray(VALUE obj, VALUE klass)
   shape[1] = m->size1;
   nary = na_make_object(NA_DFLOAT, 2, shape, klass);
   for (i = 0; (int) i < shape[1]; i++) {
-    memcpy(NA_PTR_TYPE(nary,double*)+(i*shape[0]), m->data+(i*m->tda), 
+    memcpy(NA_PTR_TYPE(nary,double*)+(i*shape[0]), m->data+(i*m->tda),
            shape[0]*sizeof(double));
   }
   return nary;
@@ -384,7 +378,7 @@ static VALUE rb_gsl_matrix_int_to_narray(VALUE obj, VALUE klass)
   shape[1] = m->size1;
   nary = na_make_object(NA_LINT, 2, shape, klass);
   for (i = 0; (int) i < shape[1]; i++) {
-    memcpy(NA_PTR_TYPE(nary,int*)+(i*shape[0]), m->data+(i*m->tda), 
+    memcpy(NA_PTR_TYPE(nary,int*)+(i*shape[0]), m->data+(i*m->tda),
            shape[0]*sizeof(int));
   }
   return nary;
@@ -538,7 +532,7 @@ gsl_matrix_view* na_to_gm_view(VALUE nna)
   m->matrix.data = NA_PTR_TYPE(ary2,double*);
   m->matrix.size1 = na->shape[1];
   m->matrix.size2 = na->shape[0];
-  m->matrix.tda = m->matrix.size2; 
+  m->matrix.tda = m->matrix.size2;
   m->matrix.owner = 0;
   return m;
 }
@@ -570,13 +564,11 @@ gsl_matrix_int_view* na_to_gm_int_view(VALUE nna)
   m->matrix.data = NA_PTR_TYPE(ary2,int*);
   m->matrix.size1 = na->shape[1];
   m->matrix.size2 = na->shape[0];
-  m->matrix.tda = m->matrix.size2; 
+  m->matrix.tda = m->matrix.size2;
   m->matrix.owner = 0;
   return m;
 }
 
-#ifdef HAVE_NARRAY_H
-#include "narray.h"
 #include <gsl/gsl_histogram.h>
 EXTERN VALUE cgsl_histogram;
 static VALUE rb_gsl_narray_histogram(int argc, VALUE *argv, VALUE obj)
@@ -593,7 +585,7 @@ static VALUE rb_gsl_narray_histogram(int argc, VALUE *argv, VALUE obj)
   v.vector.size = stride;
   switch (argc) {
   case 1:
-    if (rb_obj_is_kind_of(argv[0], rb_cRange)) 
+    if (rb_obj_is_kind_of(argv[0], rb_cRange))
       argv[0] = rb_gsl_range2ary(argv[0]);
     switch (TYPE(argv[0])) {
     case T_FIXNUM:
@@ -652,7 +644,6 @@ static VALUE rb_gsl_narray_histogram(int argc, VALUE *argv, VALUE obj)
     gsl_histogram_increment(h, ptr[i*stride]);
   return Data_Wrap_Struct(cgsl_histogram, 0, gsl_histogram_free, h);
 }
-#endif
 
 /*void rb_gsl_with_narray_define_methods()*/
 void Init_gsl_narray(VALUE module)
@@ -765,7 +756,7 @@ void Init_gsl_narray(VALUE module)
   rb_define_method(cNArray, "to_gslm", rb_gsl_na_to_gsl_matrix_method, 0);
   rb_define_alias(cNArray, "to_gm", "to_gslm");
   rb_define_method(cNArray, "to_gslm_view", rb_gsl_na_to_gsl_matrix_view_method, 0);
-  rb_define_alias(cNArray, "to_gm_view", "to_gslm_view");  
+  rb_define_alias(cNArray, "to_gm_view", "to_gslm_view");
 
   /*****/
   // TODO Complex matrix

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

@@ -21,7 +21,6 @@ VALUE cgsl_histogram_bin;
 static VALUE cgsl_histogram_integ;
 
 static VALUE rb_gsl_histogram_alloc_from_file(VALUE klass, VALUE name);
-#ifdef GSL_0_9_4_LATER
 static VALUE rb_gsl_histogram_alloc(int argc, VALUE *argv, VALUE klass)
 {
   gsl_histogram *h = NULL;
@@ -68,8 +67,8 @@ static VALUE rb_gsl_histogram_alloc(int argc, VALUE *argv, VALUE klass)
     case T_FIXNUM:
       CHECK_FIXNUM(argv[0]);
       if (TYPE(argv[1]) != T_ARRAY) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (Array expected)", 
-		 rb_class2name(CLASS_OF(argv[1])));
+        rb_raise(rb_eTypeError, "wrong argument type %s (Array expected)",
+                 rb_class2name(CLASS_OF(argv[1])));
       }
       n = FIX2INT(argv[0]);
       min = NUM2DBL(rb_ary_entry(argv[1], 0));
@@ -133,7 +132,7 @@ static VALUE rb_gsl_histogram_alloc_from_file(VALUE klass, VALUE name)
   h->range[n] = upper;
   fclose(fp);
   return Data_Wrap_Struct(klass, 0, gsl_histogram_free, h);
-  
+
 }
 
 /* initialization + set uniform ranges (equal spacing from min to max) */
@@ -172,8 +171,8 @@ static VALUE rb_gsl_histogram_alloc_uniform(int argc, VALUE *argv, VALUE klass)
 }
 
 /* initialization + set ranges with a given spacing from min to max */
-static VALUE rb_gsl_histogram_alloc_with_min_max_step(VALUE klass, VALUE vmin, 
-					    VALUE vmax, VALUE ss)
+static VALUE rb_gsl_histogram_alloc_with_min_max_step(VALUE klass, VALUE vmin,
+                                                      VALUE vmax, VALUE ss)
 {
   gsl_histogram *h = NULL;
   gsl_vector *v = NULL;
@@ -196,7 +195,6 @@ static VALUE rb_gsl_histogram_alloc_with_min_max_step(VALUE klass, VALUE vmin,
   gsl_vector_free(v);
   return Data_Wrap_Struct(klass, 0, gsl_histogram_free, h);
 }
-#endif
 
 static VALUE rb_gsl_histogram_calloc(VALUE klass, VALUE nn)
 {
@@ -244,7 +242,7 @@ static VALUE rb_gsl_histogram_set_ranges(int argc, VALUE *argv, VALUE obj)
   gsl_vector *v = NULL;
   size_t size;
   Data_Get_Struct(obj, gsl_histogram, h);
-  if (argc != 1 && argc != 2) 
+  if (argc != 1 && argc != 2)
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
   if (TYPE(argv[0]) == T_ARRAY) {
     v = make_cvector_from_rarray(argv[0]);
@@ -336,10 +334,6 @@ static VALUE rb_gsl_histogram_accumulate(int argc, VALUE *argv, VALUE obj)
   gsl_vector_int *vi;
   size_t i;
   double weight = 1;
-#ifdef HAVE_NARRAY_H
-  double *ptr;
-  size_t size, stride;
-#endif
   switch (argc) {
   case 2:
     Need_Float(argv[1]);
@@ -367,8 +361,10 @@ static VALUE rb_gsl_histogram_accumulate(int argc, VALUE *argv, VALUE obj)
       gsl_histogram_accumulate(h, (double)gsl_vector_int_get(vi, i), weight);
 #ifdef HAVE_NARRAY_H
   } else if (NA_IsNArray(argv[0])) {
+    double *ptr;
+    size_t size, stride;
     ptr = get_vector_ptr(argv[0], &stride, &size);
-    for (i = 0; i < size; i++) 
+    for (i = 0; i < size; i++)
       gsl_histogram_accumulate(h, ptr[i], weight);
 #endif
   } else {
@@ -386,7 +382,7 @@ static VALUE rb_gsl_histogram_accumulate2(int argc, VALUE *argv, VALUE obj)
   case 2:
     Need_Float(argv[1]);
     weight = NUM2DBL(argv[1]);
-    /* no break; */
+  /* no break; */
   case 1:
     Need_Float(argv[0]);
     x = NUM2DBL(argv[0]);
@@ -494,17 +490,6 @@ static VALUE rb_gsl_histogram_sigma(VALUE obj)
   return rb_float_new(gsl_histogram_sigma(h));
 }
 
-#ifndef GSL_1_1_LATER
-double gsl_histogram_sum(const gsl_histogram * h)
-{  
-  double sum=0;  
-  size_t i=0, n;  
-  n=h->n;  
-  while(i < n) sum += h->bin[i++];  
-  return sum;
-}
-#endif
-
 static VALUE rb_gsl_histogram_sum(VALUE obj)
 {
   gsl_histogram *h = NULL;
@@ -573,7 +558,7 @@ static VALUE rb_gsl_histogram_equal_bins_p(int argc, VALUE *argv, VALUE obj)
   case T_CLASS:
   case T_OBJECT:
     if (argc != 2) rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
-			    argc);
+                            argc);
     CHECK_HISTOGRAM(argv[0]);
     CHECK_HISTOGRAM(argv[1]);
     Data_Get_Struct(argv[0], gsl_histogram, h1);
@@ -581,7 +566,7 @@ static VALUE rb_gsl_histogram_equal_bins_p(int argc, VALUE *argv, VALUE obj)
     break;
   default:
     if (argc != 1) rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
-			    argc);
+                            argc);
     Data_Get_Struct(obj, gsl_histogram, h1);
     CHECK_HISTOGRAM(argv[0]);
     Data_Get_Struct(argv[0], gsl_histogram, h2);
@@ -598,7 +583,7 @@ static VALUE rb_gsl_histogram_equal_bins_p2(int argc, VALUE *argv, VALUE obj)
   case T_CLASS:
   case T_OBJECT:
     if (argc != 2) rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
-			    argc);
+                            argc);
     CHECK_HISTOGRAM(argv[0]);
     CHECK_HISTOGRAM(argv[1]);
     Data_Get_Struct(argv[0], gsl_histogram, h1);
@@ -606,7 +591,7 @@ static VALUE rb_gsl_histogram_equal_bins_p2(int argc, VALUE *argv, VALUE obj)
     break;
   default:
     if (argc != 1) rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
-			    argc);
+                            argc);
     Data_Get_Struct(obj, gsl_histogram, h1);
     CHECK_HISTOGRAM(argv[0]);
     Data_Get_Struct(argv[0], gsl_histogram, h2);
@@ -884,24 +869,17 @@ static VALUE rb_gsl_histogram_pdf_alloc(VALUE klass, VALUE nn)
 {
   gsl_histogram_pdf *h = NULL;
   gsl_histogram *h0 = NULL;
-#ifdef GSL_0_9_4_LATER
-	if (rb_obj_is_kind_of(nn, cgsl_histogram)) {
-		Data_Get_Struct(nn, gsl_histogram, h0);
-	  h = gsl_histogram_pdf_alloc(h0->n);
-	  gsl_histogram_pdf_init(h, h0);
-	} else {
-	  CHECK_FIXNUM(nn);
+  if (rb_obj_is_kind_of(nn, cgsl_histogram)) {
+    Data_Get_Struct(nn, gsl_histogram, h0);
+    h = gsl_histogram_pdf_alloc(h0->n);
+    gsl_histogram_pdf_init(h, h0);
+  } else {
+    CHECK_FIXNUM(nn);
     h = gsl_histogram_pdf_alloc(FIX2INT(nn));
   }
-#else
-  gsl_histogram *hh = NULL;
-  Data_Get_Struct(nn, gsl_histogram, hh);
-  h = gsl_histogram_pdf_alloc(hh);
-#endif
   return Data_Wrap_Struct(klass, 0, gsl_histogram_pdf_free, h);
 }
 
-#ifdef GSL_0_9_4_LATER
 static VALUE rb_gsl_histogram_pdf_init(VALUE obj, VALUE hh)
 {
   gsl_histogram_pdf *p = NULL;
@@ -912,7 +890,6 @@ static VALUE rb_gsl_histogram_pdf_init(VALUE obj, VALUE hh)
   gsl_histogram_pdf_init(p, h);
   return obj;
 }
-#endif
 
 static VALUE rb_gsl_histogram_pdf_sample(VALUE obj, VALUE r)
 {
@@ -971,7 +948,7 @@ static VALUE rb_gsl_histogram_graph(int argc, VALUE *argv, VALUE obj)
     fprintf(fp, "%e %e\n%e %e\n", v->range[i], v->bin[i], v->range[i+1], v->bin[i]);
   }
   fflush(fp);
- pclose(fp);
+  pclose(fp);
   fp = NULL;
   return Qtrue;
 #else
@@ -996,8 +973,8 @@ static VALUE rb_gsl_histogram_plot(int argc, VALUE *argv, VALUE obj)
   case 1:
     fp = popen("gnuplot -persist", "w");
     if (fp == NULL) rb_raise(rb_eIOError, "GNU graph not found.");
-    if (TYPE(argv[0]) == T_STRING) 
-      fprintf(fp, "plot '-' %s\n", STR2CSTR(argv[0]));    
+    if (TYPE(argv[0]) == T_STRING)
+      fprintf(fp, "plot '-' %s\n", STR2CSTR(argv[0]));
     else
       fprintf(fp, "plot '-' with fsteps\n");
     break;
@@ -1048,7 +1025,7 @@ static VALUE rb_gsl_histogram_fit_exponential(int argc, VALUE *argv, VALUE obj)
   }
   n = binend - binstart + 1;
   dof = n - p;
-  
+
   x = gsl_vector_alloc(n);
   w = gsl_vector_alloc(n);
   lny = gsl_vector_alloc(n);
@@ -1059,15 +1036,15 @@ static VALUE rb_gsl_histogram_fit_exponential(int argc, VALUE *argv, VALUE obj)
     gsl_vector_set(lny, i, log(h->bin[i+binstart]));
     gsl_vector_set(w, i, h->bin[i+binstart]);
   }
-  gsl_fit_wlinear(x->data, 1, w->data, 1, lny->data, 1, n, 
-		  &c0, &c1, &cov00, &cov01, &cov11, &sumsq);
+  gsl_fit_wlinear(x->data, 1, w->data, 1, lny->data, 1, n,
+                  &c0, &c1, &cov00, &cov01, &cov11, &sumsq);
   gsl_vector_free(lny);
   gsl_vector_free(w);
   gsl_vector_free(x);
   c0 = exp(c0);
-  return rb_ary_new3(6, rb_float_new(c0), rb_float_new(c1), 
-		     rb_float_new(c0*sqrt(cov00)), rb_float_new(sqrt(cov11)),
-		     rb_float_new(sumsq), INT2FIX(dof));
+  return rb_ary_new3(6, rb_float_new(c0), rb_float_new(c1),
+                     rb_float_new(c0*sqrt(cov00)), rb_float_new(sqrt(cov11)),
+                     rb_float_new(sumsq), INT2FIX(dof));
 }
 
 static VALUE rb_gsl_histogram_fit_power(int argc, VALUE *argv, VALUE obj)
@@ -1094,7 +1071,7 @@ static VALUE rb_gsl_histogram_fit_power(int argc, VALUE *argv, VALUE obj)
   }
   n = binend - binstart + 1;
   dof = n - p;
-  
+
   lnx = gsl_vector_alloc(n);
   w = gsl_vector_alloc(n);
   lny = gsl_vector_alloc(n);
@@ -1105,15 +1082,15 @@ static VALUE rb_gsl_histogram_fit_power(int argc, VALUE *argv, VALUE obj)
     gsl_vector_set(lny, i, log(h->bin[i+binstart]));
     gsl_vector_set(w, i, h->bin[i+binstart]);
   }
-  gsl_fit_wlinear(lnx->data, 1, w->data, 1, lny->data, 1, n, 
-		  &c0, &c1, &cov00, &cov01, &cov11, &sumsq);
+  gsl_fit_wlinear(lnx->data, 1, w->data, 1, lny->data, 1, n,
+                  &c0, &c1, &cov00, &cov01, &cov11, &sumsq);
   gsl_vector_free(lny);
   gsl_vector_free(w);
   gsl_vector_free(lnx);
   c0 = exp(c0);
-  return rb_ary_new3(6, rb_float_new(c0), rb_float_new(c1), 
-		     rb_float_new(c0*sqrt(cov00)), rb_float_new(sqrt(cov11)),
-		     rb_float_new(sumsq), INT2FIX(dof));
+  return rb_ary_new3(6, rb_float_new(c0), rb_float_new(c1),
+                     rb_float_new(c0*sqrt(cov00)), rb_float_new(sqrt(cov11)),
+                     rb_float_new(sumsq), INT2FIX(dof));
 }
 
 static int Gaussian_f(const gsl_vector *v, void *params, gsl_vector *f);
@@ -1173,8 +1150,8 @@ static int Gaussian_df(const gsl_vector *v, void *params, gsl_matrix *J)
   return GSL_SUCCESS;
 }
 
-static int Gaussian_fdf(const gsl_vector *v, void *params, gsl_vector *f, 
-			gsl_matrix *J)
+static int Gaussian_fdf(const gsl_vector *v, void *params, gsl_vector *f,
+                        gsl_matrix *J)
 {
   Gaussian_f(v, params, f);
   Gaussian_df(v, params, J);
@@ -1253,9 +1230,9 @@ static VALUE rb_gsl_histogram_fit_gaussian(int argc, VALUE *argv, VALUE obj)
   gsl_vector_free(x);
   gsl_matrix_free(covar);
   return rb_ary_new3(8, rb_float_new(sigma), rb_float_new(mean),
-		     rb_float_new(height), rb_float_new(errs),
-		     rb_float_new(errm), rb_float_new(errh),
-		     rb_float_new(chi2), INT2FIX(dof));
+                     rb_float_new(height), rb_float_new(errs),
+                     rb_float_new(errm), rb_float_new(errh),
+                     rb_float_new(chi2), INT2FIX(dof));
 }
 
 static int Rayleigh_f(const gsl_vector *v, void *params, gsl_vector *f);
@@ -1308,8 +1285,8 @@ static int Rayleigh_df(const gsl_vector *v, void *params, gsl_matrix *J)
   return GSL_SUCCESS;
 }
 
-static int Rayleigh_fdf(const gsl_vector *v, void *params, gsl_vector *f, 
-			gsl_matrix *J)
+static int Rayleigh_fdf(const gsl_vector *v, void *params, gsl_vector *f,
+                        gsl_matrix *J)
 {
   Rayleigh_f(v, params, f);
   Rayleigh_df(v, params, J);
@@ -1349,7 +1326,7 @@ static VALUE rb_gsl_histogram_fit_rayleigh(int argc, VALUE *argv, VALUE obj)
   }
   x = gsl_vector_alloc(p);
   gsl_vector_set(x, 0, gsl_pow_2(gsl_histogram_sigma(h)));   /* initial values, var = 1 */
-  gsl_vector_set(x, 1, gsl_histogram_max_val(h));   
+  gsl_vector_set(x, 1, gsl_histogram_max_val(h));
   hh.h = h;
   hh.binstart = binstart;
   hh.binend = binend;
@@ -1385,10 +1362,10 @@ static VALUE rb_gsl_histogram_fit_rayleigh(int argc, VALUE *argv, VALUE obj)
   gsl_multifit_fdfsolver_free(s);
   gsl_vector_free(x);
   gsl_matrix_free(covar);
-  return rb_ary_new3(6, rb_float_new(sigma), 
-		     rb_float_new(height), rb_float_new(errs),
-		     rb_float_new(errh),
-		     rb_float_new(chi2), INT2FIX(dof));
+  return rb_ary_new3(6, rb_float_new(sigma),
+                     rb_float_new(height), rb_float_new(errs),
+                     rb_float_new(errh),
+                     rb_float_new(chi2), INT2FIX(dof));
 }
 
 /*
@@ -1444,8 +1421,8 @@ static int xExponential_df(const gsl_vector *v, void *params, gsl_matrix *J)
   return GSL_SUCCESS;
 }
 
-static int xExponential_fdf(const gsl_vector *v, void *params, gsl_vector *f, 
-			gsl_matrix *J)
+static int xExponential_fdf(const gsl_vector *v, void *params, gsl_vector *f,
+                            gsl_matrix *J)
 {
   xExponential_f(v, params, f);
   xExponential_df(v, params, J);
@@ -1485,7 +1462,7 @@ static VALUE rb_gsl_histogram_fit_xexponential(int argc, VALUE *argv, VALUE obj)
   }
   x = gsl_vector_alloc(p);
   gsl_vector_set(x, 0, gsl_histogram_sigma(h));   /* initial values, var = 1 */
-  gsl_vector_set(x, 1, gsl_histogram_max_val(h));   
+  gsl_vector_set(x, 1, gsl_histogram_max_val(h));
   hh.h = h;
   hh.binstart = binstart;
   hh.binend = binend;
@@ -1521,10 +1498,10 @@ static VALUE rb_gsl_histogram_fit_xexponential(int argc, VALUE *argv, VALUE obj)
   gsl_multifit_fdfsolver_free(s);
   gsl_vector_free(x);
   gsl_matrix_free(covar);
-  return rb_ary_new3(6, rb_float_new(b), 
-		     rb_float_new(height), rb_float_new(errs),
-		     rb_float_new(errh),
-		     rb_float_new(chi2), INT2FIX(dof));
+  return rb_ary_new3(6, rb_float_new(b),
+                     rb_float_new(height), rb_float_new(errs),
+                     rb_float_new(errh),
+                     rb_float_new(chi2), INT2FIX(dof));
 }
 
 static VALUE rb_gsl_histogram_fit(int argc, VALUE *argv, VALUE obj)
@@ -1539,20 +1516,20 @@ static VALUE rb_gsl_histogram_fit(int argc, VALUE *argv, VALUE obj)
     return rb_gsl_histogram_fit_power(argc-1, argv+1, obj);
   } else if (str_head_grep(fittype, "gaus") == 0) {
     return rb_gsl_histogram_fit_gaussian(argc-1, argv+1, obj);
- } else if (str_head_grep(fittype, "rayleigh") == 0) {
+  } else if (str_head_grep(fittype, "rayleigh") == 0) {
     return rb_gsl_histogram_fit_rayleigh(argc-1, argv+1, obj);
   } else if (str_head_grep(fittype, "xexp") == 0) {
     return rb_gsl_histogram_fit_xexponential(argc-1, argv+1, obj);
   } else {
-    rb_raise(rb_eRuntimeError, 
-	     "unknown fitting type %s (exp, power, gaus expected)", fittype);
+    rb_raise(rb_eRuntimeError,
+             "unknown fitting type %s (exp, power, gaus expected)", fittype);
   }
   return Qnil;
 }
 
 /* Integrate histogram: the two histograms must have the same range and bins. */
 void mygsl_histogram_integrate(const gsl_histogram *h, gsl_histogram *hi,
-			       size_t istart, size_t iend)
+                               size_t istart, size_t iend)
 {
   size_t i;
   if (iend >= istart) {
@@ -1580,7 +1557,7 @@ void mygsl_histogram_differentiate(const gsl_histogram *hi, gsl_histogram *h)
 
 /* Create a histogram integrating the given histogram h */
 gsl_histogram* mygsl_histogram_calloc_integrate(const gsl_histogram *h,
-						size_t istart, size_t iend)
+                                                size_t istart, size_t iend)
 {
   gsl_histogram *hi = NULL;
   hi = gsl_histogram_calloc_range(h->n, h->range);
@@ -1616,16 +1593,16 @@ static VALUE rb_gsl_histogram_integrate(int argc, VALUE *argv, VALUE obj)
     case T_FIXNUM:
       itmp = FIX2INT(argv[0]);
       if (itmp == -1) {
-	istart = h->n - 1;
-	iend = 0;
+        istart = h->n - 1;
+        iend = 0;
       } else {
-	istart = 0;
-	iend = h->n - 1;
+        istart = 0;
+        iend = h->n - 1;
       }
       break;
     default:
       rb_raise(rb_eArgError, "wrong argument type %s (Arran or Fixnum expected)",
-	       rb_class2name(CLASS_OF(argv[0])));
+               rb_class2name(CLASS_OF(argv[0])));
       break;
     }
     break;
@@ -1692,27 +1669,27 @@ static VALUE rb_gsl_histogram_rebin(int argc, VALUE *argv, VALUE obj)
 }
 
 static int mygsl_histogram_fread2(FILE * stream, gsl_histogram * h)
-{  
+{
   double min, max;
   int status;
   status = gsl_block_raw_fread(stream, &min, 1, 1);
-  if (status)    return status;  
+  if (status)    return status;
   status = gsl_block_raw_fread(stream, &max, 1, 1);
-  if (status)    return status;  
+  if (status)    return status;
   gsl_histogram_set_ranges_uniform(h, min, max);
-  status = gsl_block_raw_fread (stream, h->bin, h->n, 1);  
-  if (status)    return status;  
+  status = gsl_block_raw_fread (stream, h->bin, h->n, 1);
+  if (status)    return status;
   return status;
 }
 
 static int mygsl_histogram_fwrite2(FILE * stream, const gsl_histogram * h)
-{  
+{
   int status;
   status = gsl_block_raw_fwrite (stream, h->range, 1, 1);
-  if (status)    return status;  
+  if (status)    return status;
   status = gsl_block_raw_fwrite (stream, h->range+h->n, 1, 1);
-  if (status)    return status;  
-  status = gsl_block_raw_fwrite (stream, h->bin, h->n, 1);  
+  if (status)    return status;
+  status = gsl_block_raw_fwrite (stream, h->bin, h->n, 1);
   return status;
 }
 
@@ -1833,33 +1810,31 @@ void Init_gsl_histogram(VALUE module)
   VALUE cgsl_histogram_pdf;
 
   cgsl_histogram = rb_define_class_under(module, "Histogram", cGSL_Object);
-  cgsl_histogram_range = rb_define_class_under(cgsl_histogram, "Range", 
-					       cgsl_vector_view_ro);
-  cgsl_histogram_bin = rb_define_class_under(cgsl_histogram, "Bin", 
-					     cgsl_vector_view);
-  cgsl_histogram_integ = rb_define_class_under(cgsl_histogram, "Integral", 
-					       cgsl_histogram);
-
-#ifdef GSL_0_9_4_LATER
+  cgsl_histogram_range = rb_define_class_under(cgsl_histogram, "Range",
+                                               cgsl_vector_view_ro);
+  cgsl_histogram_bin = rb_define_class_under(cgsl_histogram, "Bin",
+                                             cgsl_vector_view);
+  cgsl_histogram_integ = rb_define_class_under(cgsl_histogram, "Integral",
+                                               cgsl_histogram);
+
   rb_define_singleton_method(cgsl_histogram, "alloc", rb_gsl_histogram_alloc, -1);
   /*  rb_define_singleton_method(cgsl_histogram, "new", rb_gsl_histogram_alloc, -1);*/
   rb_define_singleton_method(cgsl_histogram, "[]", rb_gsl_histogram_alloc, -1);
 
-  rb_define_singleton_method(cgsl_histogram, "alloc_uniform", 
-			     rb_gsl_histogram_alloc_uniform, -1);
-  rb_define_singleton_method(cgsl_histogram, "new_uniform", 
-			     rb_gsl_histogram_alloc_uniform, -1);
+  rb_define_singleton_method(cgsl_histogram, "alloc_uniform",
+                             rb_gsl_histogram_alloc_uniform, -1);
+  rb_define_singleton_method(cgsl_histogram, "new_uniform",
+                             rb_gsl_histogram_alloc_uniform, -1);
 
-  rb_define_singleton_method(cgsl_histogram, "alloc_with_min_max_step", 
-			     rb_gsl_histogram_alloc_with_min_max_step, 3);
-  rb_define_singleton_method(cgsl_histogram, "new_with_min_max_step", 
-			     rb_gsl_histogram_alloc_with_min_max_step, 3);
-#endif
+  rb_define_singleton_method(cgsl_histogram, "alloc_with_min_max_step",
+                             rb_gsl_histogram_alloc_with_min_max_step, 3);
+  rb_define_singleton_method(cgsl_histogram, "new_with_min_max_step",
+                             rb_gsl_histogram_alloc_with_min_max_step, 3);
 
-  rb_define_singleton_method(cgsl_histogram, "calloc", 
-			     rb_gsl_histogram_calloc, 1);
-  rb_define_singleton_method(cgsl_histogram, "calloc_range", 
-			     rb_gsl_histogram_calloc_range, -1);
+  rb_define_singleton_method(cgsl_histogram, "calloc",
+                             rb_gsl_histogram_calloc, 1);
+  rb_define_singleton_method(cgsl_histogram, "calloc_range",
+                             rb_gsl_histogram_calloc_range, -1);
 
   rb_define_method(cgsl_histogram, "bins", rb_gsl_histogram_bins, 0);
   rb_define_alias(cgsl_histogram, "n", "bins");
@@ -1867,8 +1842,8 @@ void Init_gsl_histogram(VALUE module)
   rb_define_method(cgsl_histogram, "set_ranges", rb_gsl_histogram_set_ranges, -1);
   rb_define_method(cgsl_histogram, "range", rb_gsl_histogram_range, 0);
   rb_define_method(cgsl_histogram, "bin", rb_gsl_histogram_bin, 0);
-  rb_define_method(cgsl_histogram, "set_ranges_uniform", 
-		   rb_gsl_histogram_set_ranges_uniform, -1);
+  rb_define_method(cgsl_histogram, "set_ranges_uniform",
+                   rb_gsl_histogram_set_ranges_uniform, -1);
   rb_define_singleton_method(cgsl_histogram, "memcpy", rb_gsl_histogram_memcpy, 2);
   rb_define_method(cgsl_histogram, "clone", rb_gsl_histogram_clone, 0);
   rb_define_alias(cgsl_histogram, "duplicate", "clone");
@@ -1896,20 +1871,20 @@ void Init_gsl_histogram(VALUE module)
   rb_define_method(cgsl_histogram, "sum", rb_gsl_histogram_integral, -1);
   rb_define_alias(cgsl_histogram, "integral", "sum");
 
-  rb_define_method(cgsl_histogram, "equal_bins_p", 
-		   rb_gsl_histogram_equal_bins_p, -1);
+  rb_define_method(cgsl_histogram, "equal_bins_p",
+                   rb_gsl_histogram_equal_bins_p, -1);
   rb_define_alias(cgsl_histogram, "equal_bins", "equal_bins_p");
-  rb_define_singleton_method(cgsl_histogram, "equal_bins_p", 
-			     rb_gsl_histogram_equal_bins_p, -1);
-  rb_define_singleton_method(cgsl_histogram, "equal_bins", 
-			     rb_gsl_histogram_equal_bins_p, -1);
-  rb_define_method(cgsl_histogram, "equal_bins_p?", 
-		   rb_gsl_histogram_equal_bins_p2, -1);
+  rb_define_singleton_method(cgsl_histogram, "equal_bins_p",
+                             rb_gsl_histogram_equal_bins_p, -1);
+  rb_define_singleton_method(cgsl_histogram, "equal_bins",
+                             rb_gsl_histogram_equal_bins_p, -1);
+  rb_define_method(cgsl_histogram, "equal_bins_p?",
+                   rb_gsl_histogram_equal_bins_p2, -1);
   rb_define_alias(cgsl_histogram, "equal_bins?", "equal_bins_p?");
-  rb_define_singleton_method(cgsl_histogram, "equal_bins_p?", 
-			     rb_gsl_histogram_equal_bins_p2, -1);
-  rb_define_singleton_method(cgsl_histogram, "equal_bins?", 
-			     rb_gsl_histogram_equal_bins_p2, -1);
+  rb_define_singleton_method(cgsl_histogram, "equal_bins_p?",
+                             rb_gsl_histogram_equal_bins_p2, -1);
+  rb_define_singleton_method(cgsl_histogram, "equal_bins?",
+                             rb_gsl_histogram_equal_bins_p2, -1);
 
   rb_define_method(cgsl_histogram, "add", rb_gsl_histogram_add, 1);
   rb_define_alias(cgsl_histogram, "+", "add");
@@ -1940,13 +1915,11 @@ void Init_gsl_histogram(VALUE module)
   rb_define_method(cgsl_histogram, "print", rb_gsl_histogram_print, 0);
 
   cgsl_histogram_pdf = rb_define_class_under(cgsl_histogram, "Pdf", cGSL_Object);
-  rb_define_singleton_method(cgsl_histogram_pdf, "alloc", 
-			     rb_gsl_histogram_pdf_alloc, 1);
-  /*  rb_define_singleton_method(cgsl_histogram_pdf, "new", 
+  rb_define_singleton_method(cgsl_histogram_pdf, "alloc",
+                             rb_gsl_histogram_pdf_alloc, 1);
+  /*  rb_define_singleton_method(cgsl_histogram_pdf, "new",
       rb_gsl_histogram_pdf_alloc, 1);*/
-#ifdef GSL_0_9_4_LATER
   rb_define_method(cgsl_histogram_pdf, "init", rb_gsl_histogram_pdf_init, 1);
-#endif
   rb_define_method(cgsl_histogram_pdf, "sample", rb_gsl_histogram_pdf_sample, 1);
 
   rb_define_method(cgsl_histogram_pdf, "range", rb_gsl_histogram_pdf_range, 0);
@@ -1958,23 +1931,23 @@ void Init_gsl_histogram(VALUE module)
 
   rb_define_method(cgsl_histogram, "plot", rb_gsl_histogram_plot, -1);
 
-  rb_define_method(cgsl_histogram, "fit_gaussian", 
-		   rb_gsl_histogram_fit_gaussian, -1);
-  rb_define_method(cgsl_histogram, "fit_exponential", 
-		   rb_gsl_histogram_fit_exponential, -1);
-  rb_define_method(cgsl_histogram, "fit_xexponential", 
-		   rb_gsl_histogram_fit_xexponential, -1);
-  rb_define_method(cgsl_histogram, "fit_power", 
-		   rb_gsl_histogram_fit_power, -1);
-  rb_define_method(cgsl_histogram, "fit_rayleigh", 
-		   rb_gsl_histogram_fit_rayleigh, -1);
-  rb_define_method(cgsl_histogram, "fit", 
-		   rb_gsl_histogram_fit, -1);
+  rb_define_method(cgsl_histogram, "fit_gaussian",
+                   rb_gsl_histogram_fit_gaussian, -1);
+  rb_define_method(cgsl_histogram, "fit_exponential",
+                   rb_gsl_histogram_fit_exponential, -1);
+  rb_define_method(cgsl_histogram, "fit_xexponential",
+                   rb_gsl_histogram_fit_xexponential, -1);
+  rb_define_method(cgsl_histogram, "fit_power",
+                   rb_gsl_histogram_fit_power, -1);
+  rb_define_method(cgsl_histogram, "fit_rayleigh",
+                   rb_gsl_histogram_fit_rayleigh, -1);
+  rb_define_method(cgsl_histogram, "fit",
+                   rb_gsl_histogram_fit, -1);
 
   rb_define_method(cgsl_histogram, "integrate", rb_gsl_histogram_integrate, -1);
   rb_undef_method(cgsl_histogram_integ, "integrate");
-  rb_define_method(cgsl_histogram_integ, "differentiate", 
-		   rb_gsl_histogram_differentiate, 0);
+  rb_define_method(cgsl_histogram_integ, "differentiate",
+                   rb_gsl_histogram_differentiate, 0);
   rb_define_alias(cgsl_histogram_integ, "diff", "differentiate");
 
   rb_define_method(cgsl_histogram, "normalize", rb_gsl_histogram_normalize, 0);