gsl 1.15.3 → 1.16.0.6

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

@@ -9,16 +9,14 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl_config.h"
-#include "rb_gsl_histogram.h"
-#include "rb_gsl_common.h"
-#include "rb_gsl_array.h"
+#include "include/rb_gsl_histogram.h"
+#include "include/rb_gsl_common.h"
+#include "include/rb_gsl_array.h"
 
 VALUE cgsl_histogram2d;
 VALUE cgsl_histogram2d_view;
 static VALUE cgsl_histogram2d_integ;
 
-#ifdef GSL_0_9_4_LATER
 static VALUE rb_gsl_histogram2d_alloc_uniform(int argc, VALUE *argv, VALUE klass);
 static VALUE rb_gsl_histogram2d_alloc(int argc, VALUE *argv, VALUE klass)
 {
@@ -79,7 +77,7 @@ static VALUE rb_gsl_histogram2d_alloc_uniform(int argc, VALUE *argv, VALUE klass
   double xmin, xmax, ymin, ymax;
   switch (argc) {
   case 4:
-    CHECK_FIXNUM(argv[0]);     CHECK_FIXNUM(argv[2]); 
+    CHECK_FIXNUM(argv[0]);     CHECK_FIXNUM(argv[2]);
     Check_Type(argv[1], T_ARRAY); Check_Type(argv[3], T_ARRAY);
     //    if (RARRAY(argv[1])->len != 2 || RARRAY(argv[3])->len != 2)
     if (RARRAY_LEN(argv[1]) != 2 || RARRAY_LEN(argv[3]) != 2)
@@ -93,13 +91,13 @@ static VALUE rb_gsl_histogram2d_alloc_uniform(int argc, VALUE *argv, VALUE klass
     return Data_Wrap_Struct(klass, 0, gsl_histogram2d_free, h);
     break;
   case 6:
-    CHECK_FIXNUM(argv[0]); 
+    CHECK_FIXNUM(argv[0]);
     Need_Float(argv[1]); Need_Float(argv[2]);
     CHECK_FIXNUM(argv[3]);
     Need_Float(argv[4]); Need_Float(argv[5]);
     h = gsl_histogram2d_alloc(FIX2INT(argv[0]), FIX2INT(argv[3]));
     gsl_histogram2d_set_ranges_uniform(h, NUM2DBL(argv[1]), NUM2DBL(argv[2]),
-				       NUM2DBL(argv[4]), NUM2DBL(argv[5]));
+                                       NUM2DBL(argv[4]), NUM2DBL(argv[5]));
     return Data_Wrap_Struct(klass, 0, gsl_histogram2d_free, h);
     break;
   default:
@@ -108,7 +106,6 @@ static VALUE rb_gsl_histogram2d_alloc_uniform(int argc, VALUE *argv, VALUE klass
   }
   return Qnil;  /* never reach here */
 }
-#endif
 
 static VALUE rb_gsl_histogram2d_set_ranges(int argc, VALUE *argv, VALUE obj)
 {
@@ -206,7 +203,7 @@ static VALUE rb_gsl_histogram2d_accumulate(int argc, VALUE *argv, VALUE obj)
     n = (size_t) GSL_MIN_INT((int) vx->size, (int) vy->size);
     for (i = 0; i < n; i++)
       gsl_histogram2d_accumulate(h, gsl_vector_get(vx, i), gsl_vector_get(vy, i),
-				 weight);
+                                 weight);
   } else {
     gsl_histogram2d_accumulate(h, NUM2DBL(argv[0]), NUM2DBL(argv[1]), weight);
   }
@@ -216,14 +213,14 @@ static VALUE rb_gsl_histogram2d_accumulate(int argc, VALUE *argv, VALUE obj)
 static VALUE rb_gsl_histogram2d_accumulate2(int argc, VALUE *argv, VALUE obj)
 {
   gsl_histogram2d *h = NULL;
-  double x, y, weight=1;
+  double x, y, weight = 1;
   switch (argc) {
   case 3:
     Need_Float(argv[2]);
     weight = NUM2DBL(argv[2]);
-    /* no break */
+  /* no break */
   case 2:
-    Need_Float(argv[0]); Need_Float(argv[1]); 
+    Need_Float(argv[0]); Need_Float(argv[1]);
     x = NUM2DBL(argv[0]);    y = NUM2DBL(argv[1]);
     break;
   default:
@@ -255,13 +252,13 @@ static VALUE rb_gsl_histogram2d_get(int argc, VALUE *argv, VALUE obj)
     switch (TYPE(argv[0])) {
     case T_ARRAY:
       return rb_float_new(gsl_histogram2d_get(h2, FIX2INT(rb_ary_entry(argv[0], 0)),
-					      FIX2INT(rb_ary_entry(argv[0], 1))));
+                                              FIX2INT(rb_ary_entry(argv[0], 1))));
       break;
     case T_FIXNUM:
-      CHECK_FIXNUM(argv[0]); 
+      CHECK_FIXNUM(argv[0]);
       i = (size_t) FIX2INT(argv[0]);
       if (i >= h2->ny)
-	rb_raise(rb_eIndexError, "wrong index");
+        rb_raise(rb_eIndexError, "wrong index");
       h1 = ALLOC(mygsl_histogram2d_view);
       h1->h.n = h2->ny;
       h1->h.range = h2->yrange;
@@ -270,7 +267,7 @@ static VALUE rb_gsl_histogram2d_get(int argc, VALUE *argv, VALUE obj)
       break;
     default:
       rb_raise(rb_eTypeError, "wrong argument type %s (Array or Fixnum expected)",
-	       rb_class2name(CLASS_OF(argv[0])));
+               rb_class2name(CLASS_OF(argv[0])));
       break;
     }
     break;
@@ -346,7 +343,7 @@ static VALUE rb_gsl_histogram2d_find(VALUE obj, VALUE x, VALUE y)
 {
   gsl_histogram2d *h = NULL;
   size_t i, j;
-  Need_Float(x);Need_Float(y);
+  Need_Float(x); Need_Float(y);
   Data_Get_Struct(obj, gsl_histogram2d, h);
   gsl_histogram2d_find(h, NUM2DBL(x), NUM2DBL(y), &i, &j);
   return rb_ary_new3(2, INT2FIX(i), INT2FIX(j));
@@ -384,7 +381,6 @@ static VALUE rb_gsl_histogram2d_min_bin(VALUE obj)
   return rb_ary_new3(2, INT2FIX(i), INT2FIX(j));
 }
 
-#ifdef GSL_1_1_LATER
 static VALUE rb_gsl_histogram2d_xmean(VALUE obj)
 {
   gsl_histogram2d *h = NULL;
@@ -426,7 +422,6 @@ static VALUE rb_gsl_histogram2d_sum(VALUE obj)
   Data_Get_Struct(obj, gsl_histogram2d, h);
   return rb_float_new(gsl_histogram2d_sum(h));
 }
-#endif
 
 /* singleton */
 static VALUE rb_gsl_histogram2d_equal_bins_p(VALUE obj, VALUE hh1, VALUE hh2)
@@ -612,7 +607,6 @@ static VALUE rb_gsl_histogram2d_reset(VALUE obj)
   return obj;
 }
 
-#ifdef GSL_0_9_4_LATER
 static VALUE rb_gsl_histogram2d_pdf_alloc(VALUE klass, VALUE nx, VALUE ny)
 {
   gsl_histogram2d_pdf *h = NULL;
@@ -631,17 +625,6 @@ static VALUE rb_gsl_histogram2d_pdf_init(VALUE obj, VALUE hh)
   gsl_histogram2d_pdf_init(pdf, h);
   return obj;
 }
-#else
-static VALUE rb_gsl_histogram2d_pdf_alloc(VALUE klass, VALUE hhh)
-{
-  gsl_histogram2d_pdf *h = NULL;
-  gsl_histogram2d *hh;
-  Data_Get_Struct(hhh, gsl_histogram2d, hh);
-  h = gsl_histogram2d_pdf_alloc(hh);
-  return Data_Wrap_Struct(klass, 0, gsl_histogram2d_pdf_free, h);
-}
-
-#endif
 
 static VALUE rb_gsl_histogram2d_pdf_sample(VALUE obj, VALUE r1, VALUE r2)
 {
@@ -690,7 +673,7 @@ static VALUE rb_gsl_histogram2d_bin(VALUE obj)
 }
 
 void mygsl_histogram2d_yproject(const gsl_histogram2d *h2, size_t istart,
-				size_t iend, gsl_histogram *h)
+                                size_t iend, gsl_histogram *h)
 {
   size_t i, j;
   double sum;
@@ -705,7 +688,7 @@ void mygsl_histogram2d_yproject(const gsl_histogram2d *h2, size_t istart,
 }
 
 gsl_histogram* mygsl_histogram2d_calloc_yproject(const gsl_histogram2d *h2,
-						 size_t istart, size_t iend)
+                                                 size_t istart, size_t iend)
 {
   gsl_histogram *h;
   h = gsl_histogram_calloc_range(h2->ny, h2->yrange);
@@ -714,7 +697,7 @@ gsl_histogram* mygsl_histogram2d_calloc_yproject(const gsl_histogram2d *h2,
 }
 
 void mygsl_histogram2d_xproject(const gsl_histogram2d *h2, size_t jstart,
-				size_t jend, gsl_histogram *h)
+                                size_t jend, gsl_histogram *h)
 {
   size_t i, j;
   double sum;
@@ -729,7 +712,7 @@ void mygsl_histogram2d_xproject(const gsl_histogram2d *h2, size_t jstart,
 }
 
 gsl_histogram* mygsl_histogram2d_calloc_xproject(const gsl_histogram2d *h2,
-						 size_t jstart, size_t jend)
+                                                 size_t jstart, size_t jend)
 {
   gsl_histogram *h;
   h = gsl_histogram_calloc_range(h2->nx, h2->xrange);
@@ -790,35 +773,35 @@ static VALUE rb_gsl_histogram2d_yproject(int argc, VALUE *argv, VALUE obj)
 }
 
 static int mygsl_histogram2d_fread2(FILE * stream, gsl_histogram2d * h)
-{  
+{
   double xmin, xmax, ymin, ymax;
   int status;
   status = gsl_block_raw_fread(stream, &xmin, 1, 1);
-  if (status)    return status;  
+  if (status)    return status;
   status = gsl_block_raw_fread(stream, &xmax, 1, 1);
-  if (status)    return status;  
+  if (status)    return status;
   status = gsl_block_raw_fread(stream, &ymin, 1, 1);
-  if (status)    return status;  
+  if (status)    return status;
   status = gsl_block_raw_fread(stream, &ymax, 1, 1);
-  if (status)    return status;  
+  if (status)    return status;
   gsl_histogram2d_set_ranges_uniform(h, xmin, xmax, ymin, ymax);
-  status = gsl_block_raw_fread (stream, h->bin, h->nx*h->ny, 1);  
-  if (status)    return status;  
+  status = gsl_block_raw_fread (stream, h->bin, h->nx*h->ny, 1);
+  if (status)    return status;
   return status;
 }
 
 static int mygsl_histogram2d_fwrite2(FILE * stream, const gsl_histogram2d * h)
-{  
+{
   int status;
   status = gsl_block_raw_fwrite (stream, h->xrange, 1, 1);
-  if (status)    return status;  
+  if (status)    return status;
   status = gsl_block_raw_fwrite (stream, h->xrange+h->nx, 1, 1);
-  if (status)    return status;  
+  if (status)    return status;
   status = gsl_block_raw_fwrite (stream, h->yrange, 1, 1);
-  if (status)    return status;  
+  if (status)    return status;
   status = gsl_block_raw_fwrite (stream, h->yrange+h->ny, 1, 1);
-  if (status)    return status;  
-  status = gsl_block_raw_fwrite (stream, h->bin, h->nx*h->ny, 1);  
+  if (status)    return status;
+  status = gsl_block_raw_fwrite (stream, h->bin, h->nx*h->ny, 1);
   return status;
 }
 
@@ -847,7 +830,7 @@ static VALUE rb_gsl_histogram2d_fread2(VALUE obj, VALUE io)
 }
 
 static gsl_histogram2d* mygsl_histogram2d_calloc_integrate(const gsl_histogram2d *h,
-							   int flag)
+                                                           int flag)
 {
   gsl_histogram2d *hi;
   size_t i, j, k;
@@ -857,37 +840,37 @@ static gsl_histogram2d* mygsl_histogram2d_calloc_integrate(const gsl_histogram2d
   if (flag == -1) {
     hi->bin[n-1] = h->bin[n-1];
     i = nx - 1;
-    for (j = ny-2, k = 0; j >= 0; j--, k++) {
+    for (j = ny-2, k = 0;; j--, k++) {
       hi->bin[n-1-k] = gsl_histogram2d_get(hi, i, j+1) + gsl_histogram2d_get(h, i, j);
       if (j == 0) break;
     }
     j = ny - 1;
-    for (i = nx-2; i >= 0; i--) {
+    for (i = nx-2;; i--) {
       hi->bin[i*ny + j] = gsl_histogram2d_get(hi, i+1, j) + gsl_histogram2d_get(h, i, j);
       if (i == 0) break;
     }
-    for (i = nx-2; i >= 0; i--) {
-      for (j = ny-2; j >= 0; j--) {
-	hi->bin[i*ny+j] = ((gsl_histogram2d_get(hi, i+1, j) 
-			    + gsl_histogram2d_get(hi, i, j+1))
-			   - gsl_histogram2d_get(hi, i+1, j+1))
-	  + gsl_histogram2d_get(h, i, j);
-	if (j == 0) break;
+    for (i = nx-2;; i--) {
+      for (j = ny-2;; j--) {
+        hi->bin[i*ny+j] = ((gsl_histogram2d_get(hi, i+1, j)
+                            + gsl_histogram2d_get(hi, i, j+1))
+                           - gsl_histogram2d_get(hi, i+1, j+1))
+                          + gsl_histogram2d_get(h, i, j);
+        if (j == 0) break;
       }
       if (i == 0) break;
     }
   } else {
     hi->bin[0] = h->bin[0];
-    for (j = 1; j < ny; j++) hi->bin[j] = gsl_histogram2d_get(hi, 0, j-1) 
-			       + gsl_histogram2d_get(h, 0, j);
+    for (j = 1; j < ny; j++) hi->bin[j] = gsl_histogram2d_get(hi, 0, j-1)
+                                          + gsl_histogram2d_get(h, 0, j);
     for (i = 1; i < nx; i++) hi->bin[i*ny] = gsl_histogram2d_get(hi, i-1, 0)
-			       + gsl_histogram2d_get(h, i, 0);
+                                             + gsl_histogram2d_get(h, i, 0);
     for (i = 1; i < nx; i++) {
       for (j = 1; j < ny; j++) {
-	hi->bin[i*ny+j] = ((gsl_histogram2d_get(hi, i-1, j) 
-			    + gsl_histogram2d_get(hi, i, j-1))
-			   - gsl_histogram2d_get(hi, i-1, j-1))
-	  + gsl_histogram2d_get(h, i, j);
+        hi->bin[i*ny+j] = ((gsl_histogram2d_get(hi, i-1, j)
+                            + gsl_histogram2d_get(hi, i, j-1))
+                           - gsl_histogram2d_get(hi, i-1, j-1))
+                          + gsl_histogram2d_get(h, i, j);
       }
     }
   }
@@ -941,40 +924,39 @@ void Init_gsl_histogram2d(VALUE module)
 
   cgsl_histogram2d = rb_define_class_under(module, "Histogram2d", cGSL_Object);
   cgsl_histogram2d_view = rb_define_class_under(cgsl_histogram2d, "View",
-						cgsl_histogram);
+                                                cgsl_histogram);
+
+  cgsl_histogram2d_integ = rb_define_class_under(cgsl_histogram2d, "Integral",
+                                                 cgsl_histogram2d);
 
-  cgsl_histogram2d_integ = rb_define_class_under(cgsl_histogram2d, "Integral", 
-					       cgsl_histogram2d);
-#ifdef GSL_0_9_4_LATER
   /*  rb_define_singleton_method(cgsl_histogram2d, "new", rb_gsl_histogram2d_alloc, -1);*/
   rb_define_singleton_method(cgsl_histogram2d, "alloc", rb_gsl_histogram2d_alloc, -1);
-  rb_define_singleton_method(cgsl_histogram2d, "new_uniform", 
-			     rb_gsl_histogram2d_alloc_uniform, -1);
-  rb_define_singleton_method(cgsl_histogram2d, "alloc_uniform", 
-			     rb_gsl_histogram2d_alloc_uniform, -1);
-#endif
-
-  rb_define_singleton_method(cgsl_histogram2d, "equal_bins_p", 
-			     rb_gsl_histogram2d_equal_bins_p, 2);
-  rb_define_singleton_method(cgsl_histogram2d, "equal_bins_p?", 
-			     rb_gsl_histogram2d_equal_bins_p2, 2);
-
-  rb_define_method(cgsl_histogram2d, "set_ranges",  
-		   rb_gsl_histogram2d_set_ranges, -1);
-  rb_define_method(cgsl_histogram2d, "set_ranges_uniform", 
-		   rb_gsl_histogram2d_set_ranges_uniform, -1);
-
-  rb_define_singleton_method(cgsl_histogram2d, "memcpy",  
-			     rb_gsl_histogram2d_memcpy, 2);
+  rb_define_singleton_method(cgsl_histogram2d, "new_uniform",
+                             rb_gsl_histogram2d_alloc_uniform, -1);
+  rb_define_singleton_method(cgsl_histogram2d, "alloc_uniform",
+                             rb_gsl_histogram2d_alloc_uniform, -1);
+
+  rb_define_singleton_method(cgsl_histogram2d, "equal_bins_p",
+                             rb_gsl_histogram2d_equal_bins_p, 2);
+  rb_define_singleton_method(cgsl_histogram2d, "equal_bins_p?",
+                             rb_gsl_histogram2d_equal_bins_p2, 2);
+
+  rb_define_method(cgsl_histogram2d, "set_ranges",
+                   rb_gsl_histogram2d_set_ranges, -1);
+  rb_define_method(cgsl_histogram2d, "set_ranges_uniform",
+                   rb_gsl_histogram2d_set_ranges_uniform, -1);
+
+  rb_define_singleton_method(cgsl_histogram2d, "memcpy",
+                             rb_gsl_histogram2d_memcpy, 2);
   rb_define_method(cgsl_histogram2d, "clone",  rb_gsl_histogram2d_clone, 0);
   rb_define_alias(cgsl_histogram2d, "duplicate", "clone");
-  rb_define_method(cgsl_histogram2d, "increment",  
-		   rb_gsl_histogram2d_accumulate, -1);
+  rb_define_method(cgsl_histogram2d, "increment",
+                   rb_gsl_histogram2d_accumulate, -1);
   rb_define_alias(cgsl_histogram2d, "fill", "increment");
   rb_define_alias(cgsl_histogram2d, "accumulate", "increment");
 
-  rb_define_method(cgsl_histogram2d, "increment2",  
-		   rb_gsl_histogram2d_accumulate2, -1);
+  rb_define_method(cgsl_histogram2d, "increment2",
+                   rb_gsl_histogram2d_accumulate2, -1);
   rb_define_alias(cgsl_histogram2d, "accumulate2", "increment2");
   rb_define_alias(cgsl_histogram2d, "fill2", "increment2");
 
@@ -997,7 +979,6 @@ void Init_gsl_histogram2d(VALUE module)
   rb_define_method(cgsl_histogram2d, "min_val",  rb_gsl_histogram2d_min_val, 0);
   rb_define_method(cgsl_histogram2d, "min_bin",  rb_gsl_histogram2d_min_bin, 0);
 
-#ifdef GSL_1_1_LATER
   rb_define_method(cgsl_histogram2d, "xmean",  rb_gsl_histogram2d_xmean, 0);
   rb_define_method(cgsl_histogram2d, "ymean",  rb_gsl_histogram2d_ymean, 0);
   rb_define_method(cgsl_histogram2d, "xsigma",  rb_gsl_histogram2d_xsigma, 0);
@@ -1005,7 +986,6 @@ void Init_gsl_histogram2d(VALUE module)
   rb_define_method(cgsl_histogram2d, "cov",  rb_gsl_histogram2d_cov, 0);
   rb_define_method(cgsl_histogram2d, "sum",  rb_gsl_histogram2d_sum, 0);
   rb_define_alias(cgsl_histogram2d, "integral", "sum");
-#endif
 
   rb_define_method(cgsl_histogram2d, "add",  rb_gsl_histogram2d_add, 1);
   rb_define_alias(cgsl_histogram2d, "+", "add");
@@ -1029,18 +1009,12 @@ void Init_gsl_histogram2d(VALUE module)
   rb_define_method(cgsl_histogram2d, "fscanf",  rb_gsl_histogram2d_fscanf, 3);
 
   cgsl_histogram2d_pdf = rb_define_class_under(cgsl_histogram2d, "Pdf", cGSL_Object);
-#ifdef GSL_0_9_4_LATER
-  /*  rb_define_singleton_method(cgsl_histogram2d_pdf, "new", 
+
+  /*  rb_define_singleton_method(cgsl_histogram2d_pdf, "new",
       rb_gsl_histogram2d_pdf_alloc, 2);*/
-  rb_define_singleton_method(cgsl_histogram2d_pdf, "alloc", 
-			     rb_gsl_histogram2d_pdf_alloc, 2);
+  rb_define_singleton_method(cgsl_histogram2d_pdf, "alloc",
+                             rb_gsl_histogram2d_pdf_alloc, 2);
   rb_define_method(cgsl_histogram2d_pdf, "init",  rb_gsl_histogram2d_pdf_init, 1);
-#else
-  /*  rb_define_singleton_method(cgsl_histogram2d_pdf, "new", 
-      rb_gsl_histogram2d_pdf_alloc, 1);*/
-  rb_define_singleton_method(cgsl_histogram2d_pdf, "alloc", 
-			     rb_gsl_histogram2d_pdf_alloc, 1);
-#endif
 
   rb_define_method(cgsl_histogram2d_pdf, "sample",  rb_gsl_histogram2d_pdf_sample, 2);
 

data/ext/{histogram3d.c → gsl_native/histogram3d.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_histogram.h"
-#include "rb_gsl_common.h"
-#include "rb_gsl_array.h"
+
+#include "include/rb_gsl_histogram.h"
+#include "include/rb_gsl_common.h"
+#include "include/rb_gsl_array.h"
 
 static VALUE cgsl_histogram3d;
 static VALUE cgsl_histogram3d_view;
@@ -24,27 +24,27 @@ static VALUE rb_gsl_histogram3d_new(int argc, VALUE *argv, VALUE klass)
   size_t nx, ny, nz;
   switch (argc) {
   case 3:
-    if (TYPE(argv[0]) == T_FIXNUM 
-	&& TYPE(argv[1]) == T_FIXNUM && TYPE(argv[2]) == T_FIXNUM) {
-      h = mygsl_histogram3d_alloc(FIX2INT(argv[0]), 
-				  FIX2INT(argv[1]), FIX2INT(argv[2])); 
+    if (TYPE(argv[0]) == T_FIXNUM
+        && TYPE(argv[1]) == T_FIXNUM && TYPE(argv[2]) == T_FIXNUM) {
+      h = mygsl_histogram3d_alloc(FIX2INT(argv[0]),
+                                  FIX2INT(argv[1]), FIX2INT(argv[2]));
     } else if (VECTOR_P(argv[0]) && VECTOR_P(argv[1]) && VECTOR_P(argv[2])) {
       Data_Get_Struct(argv[0], gsl_vector, xrange);
       Data_Get_Struct(argv[1], gsl_vector, yrange);
       Data_Get_Struct(argv[2], gsl_vector, zrange);
       h = mygsl_histogram3d_alloc(xrange->size-1, yrange->size-1, zrange->size-1);
       mygsl_histogram3d_set_ranges(h, xrange->data, xrange->size,
-				   yrange->data, yrange->size,
-				   zrange->data, zrange->size);
-    } else if (TYPE(argv[0]) == T_ARRAY 
-	       && TYPE(argv[1]) == T_ARRAY && TYPE(argv[2]) == T_ARRAY) {
+                                   yrange->data, yrange->size,
+                                   zrange->data, zrange->size);
+    } else if (TYPE(argv[0]) == T_ARRAY
+               && TYPE(argv[1]) == T_ARRAY && TYPE(argv[2]) == T_ARRAY) {
       xrange = make_cvector_from_rarray(argv[0]);
       yrange = make_cvector_from_rarray(argv[1]);
       zrange = make_cvector_from_rarray(argv[2]);
       h = mygsl_histogram3d_alloc(xrange->size-1, yrange->size-1, zrange->size-1);
       mygsl_histogram3d_set_ranges(h, xrange->data, xrange->size,
-				   yrange->data, yrange->size,
-				   zrange->data, zrange->size);
+                                   yrange->data, yrange->size,
+                                   zrange->data, zrange->size);
       gsl_vector_free(zrange);
       gsl_vector_free(yrange);
       gsl_vector_free(xrange);
@@ -54,7 +54,7 @@ static VALUE rb_gsl_histogram3d_new(int argc, VALUE *argv, VALUE klass)
     break;
   case 6:
     CHECK_FIXNUM(argv[0]); CHECK_FIXNUM(argv[2]); CHECK_FIXNUM(argv[4]);
-    Check_Type(argv[1], T_ARRAY); Check_Type(argv[3], T_ARRAY); 
+    Check_Type(argv[1], T_ARRAY); Check_Type(argv[3], T_ARRAY);
     Check_Type(argv[5], T_ARRAY);
     nx = FIX2INT(argv[0]); ny = FIX2INT(argv[2]); nz = FIX2INT(argv[4]);
     xmin = NUM2DBL(rb_ary_entry(argv[1], 0));
@@ -64,7 +64,7 @@ static VALUE rb_gsl_histogram3d_new(int argc, VALUE *argv, VALUE klass)
     zmin = NUM2DBL(rb_ary_entry(argv[5], 0));
     zmax = NUM2DBL(rb_ary_entry(argv[5], 1));
     h = mygsl_histogram3d_calloc_uniform(nx, ny, nz, xmin, xmax, ymin, ymax,
-					 zmin, zmax);
+                                         zmin, zmax);
     break;
   case 9:
     CHECK_FIXNUM(argv[0]); CHECK_FIXNUM(argv[3]); CHECK_FIXNUM(argv[6]);
@@ -73,7 +73,7 @@ static VALUE rb_gsl_histogram3d_new(int argc, VALUE *argv, VALUE klass)
     ymin = NUM2DBL(argv[4]);    ymax = NUM2DBL(argv[5]);
     zmin = NUM2DBL(argv[7]);    zmax = NUM2DBL(argv[8]);
     h = mygsl_histogram3d_calloc_uniform(nx, ny, nz, xmin, xmax, ymin, ymax,
-					 zmin, zmax);
+                                         zmin, zmax);
     break;
   default:
     break;
@@ -189,37 +189,37 @@ static VALUE rb_gsl_histogram3d_get(int argc, VALUE *argv, VALUE obj)
       //      switch (RARRAY(argv[0])->len) {
       switch (RARRAY_LEN(argv[0])) {
       case 1:
-	i = FIX2INT(rb_ary_entry(argv[0], 0));
-	h2 = ALLOC(mygsl_histogram3d_view);
-	h2->h.nx = h->ny;
-	h2->h.ny = h->nz;
-	h2->h.xrange = h->yrange;
-	h2->h.yrange = h->zrange;
-	h2->h.bin = h->bin + i*h->ny*h->nz;
-	return Data_Wrap_Struct(cgsl_histogram3d_view, 0, free, h2);
-	break;
+        i = FIX2INT(rb_ary_entry(argv[0], 0));
+        h2 = ALLOC(mygsl_histogram3d_view);
+        h2->h.nx = h->ny;
+        h2->h.ny = h->nz;
+        h2->h.xrange = h->yrange;
+        h2->h.yrange = h->zrange;
+        h2->h.bin = h->bin + i*h->ny*h->nz;
+        return Data_Wrap_Struct(cgsl_histogram3d_view, 0, free, h2);
+        break;
       case 2:
-	i = FIX2INT(rb_ary_entry(argv[0], 0));
-	j = FIX2INT(rb_ary_entry(argv[0], 1));
-	h1 = ALLOC(mygsl_histogram2d_view);
-	h1->h.n = h->nz;
-	h1->h.range = h->zrange;
-	h1->h.bin = h->bin + i*h->ny*h->nz + j*h->nz;
-	return Data_Wrap_Struct(cgsl_histogram2d_view, 0, free, h1);    
-	break;
+        i = FIX2INT(rb_ary_entry(argv[0], 0));
+        j = FIX2INT(rb_ary_entry(argv[0], 1));
+        h1 = ALLOC(mygsl_histogram2d_view);
+        h1->h.n = h->nz;
+        h1->h.range = h->zrange;
+        h1->h.bin = h->bin + i*h->ny*h->nz + j*h->nz;
+        return Data_Wrap_Struct(cgsl_histogram2d_view, 0, free, h1);
+        break;
       case 3:
-	i = FIX2INT(rb_ary_entry(argv[0], 0));
-	j = FIX2INT(rb_ary_entry(argv[0], 1));
-	k = FIX2INT(rb_ary_entry(argv[0], 2));
-	/* do the last line of this function */
-	break;
+        i = FIX2INT(rb_ary_entry(argv[0], 0));
+        j = FIX2INT(rb_ary_entry(argv[0], 1));
+        k = FIX2INT(rb_ary_entry(argv[0], 2));
+        /* do the last line of this function */
+        break;
       default:
-	rb_raise(rb_eRuntimeError, "wrong array size");
+        rb_raise(rb_eRuntimeError, "wrong array size");
       }
       break;
     default:
       rb_raise(rb_eTypeError, "wrong argument type %s (Fixnum or Array expected)",
-	       rb_class2name(CLASS_OF(argv[0])));
+               rb_class2name(CLASS_OF(argv[0])));
       break;
     }
     break;
@@ -230,7 +230,7 @@ static VALUE rb_gsl_histogram3d_get(int argc, VALUE *argv, VALUE obj)
     h1->h.n = h->nz;
     h1->h.range = h->zrange;
     h1->h.bin = h->bin + i*h->ny*h->nz + j*h->nz;
-    return Data_Wrap_Struct(cgsl_histogram2d_view, 0, free, h1);    
+    return Data_Wrap_Struct(cgsl_histogram2d_view, 0, free, h1);
     break;
   case 3:
     CHECK_FIXNUM(argv[0]); CHECK_FIXNUM(argv[1]); CHECK_FIXNUM(argv[2]);
@@ -251,7 +251,7 @@ static VALUE rb_gsl_histogram3d_increment(int argc, VALUE *argv, VALUE obj)
   case 4:
     Need_Float(argv[3]);
     weight = NUM2DBL(argv[3]);
-    /* no break */
+  /* no break */
   case 3:
     Need_Float(argv[0]); Need_Float(argv[1]); Need_Float(argv[2]);
     x = NUM2DBL(argv[0]); y = NUM2DBL(argv[1]); z = NUM2DBL(argv[2]);
@@ -273,7 +273,7 @@ static VALUE rb_gsl_histogram3d_increment2(int argc, VALUE *argv, VALUE obj)
   case 4:
     Need_Float(argv[3]);
     weight = NUM2DBL(argv[3]);
-    /* no break */
+  /* no break */
   case 3:
     Need_Float(argv[0]); Need_Float(argv[1]); Need_Float(argv[2]);
     x = NUM2DBL(argv[0]); y = NUM2DBL(argv[1]); z = NUM2DBL(argv[2]);
@@ -329,7 +329,7 @@ static VALUE rb_gsl_histogram3d_find(VALUE obj, VALUE x, VALUE y, VALUE z)
   size_t i, j, k;
   Data_Get_Struct(obj, mygsl_histogram3d, h);
   mygsl_histogram3d_find(h, NUM2DBL(x), NUM2DBL(y), NUM2DBL(z),
-			 &i, &j, &k);
+                         &i, &j, &k);
   return rb_ary_new3(3, INT2FIX(i), INT2FIX(j), INT2FIX(k));
 }
 
@@ -346,7 +346,7 @@ static VALUE rb_gsl_histogram3d_set_ranges(VALUE obj, VALUE xx, VALUE yy, VALUE
     Data_Get_Struct(xx, gsl_vector, xrange);
   } else {
     rb_raise(rb_eTypeError, "wrong argument type %s (Array or Vector expected)",
-	     rb_class2name(CLASS_OF(xx)));
+             rb_class2name(CLASS_OF(xx)));
   }
   if (xrange->size != h->nx+1)
     rb_raise(rb_eIndexError, "xrange length is different");
@@ -357,7 +357,7 @@ static VALUE rb_gsl_histogram3d_set_ranges(VALUE obj, VALUE xx, VALUE yy, VALUE
     Data_Get_Struct(yy, gsl_vector, yrange);
   } else {
     rb_raise(rb_eTypeError, "wrong argument type %s (Array or Vector expected)",
-	     rb_class2name(CLASS_OF(yy)));
+             rb_class2name(CLASS_OF(yy)));
   }
   if (yrange->size != h->ny+1)
     rb_raise(rb_eIndexError, "yrange length is different");
@@ -368,13 +368,13 @@ static VALUE rb_gsl_histogram3d_set_ranges(VALUE obj, VALUE xx, VALUE yy, VALUE
     Data_Get_Struct(zz, gsl_vector, zrange);
   } else {
     rb_raise(rb_eTypeError, "wrong argument type %s (Array or Vector expected)",
-	     rb_class2name(CLASS_OF(zz)));
+             rb_class2name(CLASS_OF(zz)));
   }
   if (zrange->size != h->nz+1)
     rb_raise(rb_eIndexError, "zrange length is different");
   mygsl_histogram3d_set_ranges(h, xrange->data, xrange->size,
-			       yrange->data, yrange->size, 
-			       zrange->data, zrange->size);
+                               yrange->data, yrange->size,
+                               zrange->data, zrange->size);
   if (flagz == 1) gsl_vector_free(zrange);
   if (flagy == 1) gsl_vector_free(yrange);
   if (flagx == 1) gsl_vector_free(xrange);
@@ -695,7 +695,7 @@ static VALUE rb_gsl_histogram3d_reset(VALUE obj)
 }
 
 static VALUE rb_gsl_histogram3d_oper(VALUE obj, VALUE hh,
-				     int (*func)(mygsl_histogram3d *, const mygsl_histogram3d*))
+                                     int (*func)(mygsl_histogram3d *, const mygsl_histogram3d*))
 {
   mygsl_histogram3d *h1, *h2, *hnew;
   CHECK_HISTOGRAM3D(hh);
@@ -782,18 +782,18 @@ void Init_gsl_histogram3d(VALUE module)
 {
   cgsl_histogram3d = rb_define_class_under(module, "Histogram3d", cGSL_Object);
   cgsl_histogram3d_view = rb_define_class_under(cgsl_histogram3d, "View",
-						cgsl_histogram2d);
+                                                cgsl_histogram2d);
 
   /*  rb_define_singleton_method(cgsl_histogram3d, "new", rb_gsl_histogram3d_new, -1);*/
-  rb_define_singleton_method(cgsl_histogram3d, "alloc", 
-			     rb_gsl_histogram3d_new, -1);
-  rb_define_singleton_method(cgsl_histogram3d, "memcpy", 
-			     rb_gsl_histogram3d_memcpy, 2);
+  rb_define_singleton_method(cgsl_histogram3d, "alloc",
+                             rb_gsl_histogram3d_new, -1);
+  rb_define_singleton_method(cgsl_histogram3d, "memcpy",
+                             rb_gsl_histogram3d_memcpy, 2);
   /******/
-  rb_define_method(cgsl_histogram3d, "set_ranges", 
-		   rb_gsl_histogram3d_set_ranges, 3);
-  rb_define_method(cgsl_histogram3d, "set_ranges_uniform", 
-		   rb_gsl_histogram3d_set_ranges_uniform, -1);
+  rb_define_method(cgsl_histogram3d, "set_ranges",
+                   rb_gsl_histogram3d_set_ranges, 3);
+  rb_define_method(cgsl_histogram3d, "set_ranges_uniform",
+                   rb_gsl_histogram3d_set_ranges_uniform, -1);
 
   rb_define_method(cgsl_histogram3d, "nx", rb_gsl_histogram3d_nx, 0);
   rb_define_method(cgsl_histogram3d, "ny", rb_gsl_histogram3d_ny, 0);
@@ -809,22 +809,22 @@ void Init_gsl_histogram3d(VALUE module)
   rb_define_method(cgsl_histogram3d, "get", rb_gsl_histogram3d_get, -1);
   rb_define_alias(cgsl_histogram3d, "[]", "get");
 
-  rb_define_method(cgsl_histogram3d, "increment", 
-		   rb_gsl_histogram3d_increment, -1);
+  rb_define_method(cgsl_histogram3d, "increment",
+                   rb_gsl_histogram3d_increment, -1);
   rb_define_alias(cgsl_histogram3d, "fill", "increment");
   rb_define_alias(cgsl_histogram3d, "accumulate", "increment");
 
-  rb_define_method(cgsl_histogram3d, "increment2", 
-		   rb_gsl_histogram3d_increment2, -1);
+  rb_define_method(cgsl_histogram3d, "increment2",
+                   rb_gsl_histogram3d_increment2, -1);
   rb_define_alias(cgsl_histogram3d, "fill2", "increment2");
   rb_define_alias(cgsl_histogram3d, "accumulate2", "increment2");
 
-  rb_define_method(cgsl_histogram3d, "get_xrange", 
-		   rb_gsl_histogram3d_get_xrange, 1);
-  rb_define_method(cgsl_histogram3d, "get_yrange", 
-		   rb_gsl_histogram3d_get_yrange, 1);
-  rb_define_method(cgsl_histogram3d, "get_zrange", 
-		   rb_gsl_histogram3d_get_zrange, 1);
+  rb_define_method(cgsl_histogram3d, "get_xrange",
+                   rb_gsl_histogram3d_get_xrange, 1);
+  rb_define_method(cgsl_histogram3d, "get_yrange",
+                   rb_gsl_histogram3d_get_yrange, 1);
+  rb_define_method(cgsl_histogram3d, "get_zrange",
+                   rb_gsl_histogram3d_get_zrange, 1);
 
   rb_define_method(cgsl_histogram3d, "find", rb_gsl_histogram3d_find, 3);
 
@@ -835,12 +835,12 @@ void Init_gsl_histogram3d(VALUE module)
 
   /*****/
 
-  rb_define_method(cgsl_histogram3d, "xyproject", 
-		   rb_gsl_histogram3d_xyproject, -1);
-  rb_define_method(cgsl_histogram3d, "xzproject", 
-		   rb_gsl_histogram3d_xzproject, -1);
-  rb_define_method(cgsl_histogram3d, "yzproject", 
-		   rb_gsl_histogram3d_yzproject, -1);
+  rb_define_method(cgsl_histogram3d, "xyproject",
+                   rb_gsl_histogram3d_xyproject, -1);
+  rb_define_method(cgsl_histogram3d, "xzproject",
+                   rb_gsl_histogram3d_xzproject, -1);
+  rb_define_method(cgsl_histogram3d, "yzproject",
+                   rb_gsl_histogram3d_yzproject, -1);
 
   rb_define_method(cgsl_histogram3d, "scale", rb_gsl_histogram3d_scale, 1);
   rb_define_method(cgsl_histogram3d, "scale!", rb_gsl_histogram3d_scale_bang, 1);