gsl 1.15.3 → 1.16.0.6

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

@@ -13,33 +13,33 @@
   This source code is created modifying gsl-1.5/histogram/ *2d.c
  */
 
-#include "rb_gsl_histogram.h"
+#include "include/rb_gsl_histogram.h"
 
 mygsl_histogram3d* mygsl_histogram3d_alloc(const size_t nx, const size_t ny,
-					   const size_t nz)
+                                           const size_t nz)
 {
   mygsl_histogram3d *h = NULL;
   if (nx == 0) GSL_ERROR_VAL ("histogram3d length nx must be positive integer",
-			      GSL_EDOM, 0);
+                              GSL_EDOM, 0);
   if (ny == 0) GSL_ERROR_VAL ("histogram3d length ny must be positive integer",
-			      GSL_EDOM, 0);
+                              GSL_EDOM, 0);
   if (nz == 0) GSL_ERROR_VAL ("histogram3d length nz must be positive integer",
-			      GSL_EDOM, 0);
+                              GSL_EDOM, 0);
   h = (mygsl_histogram3d *) malloc(sizeof(mygsl_histogram3d));
   if (h == NULL) GSL_ERROR_VAL ("failed to allocate space for histogram3d struct",
-				GSL_ENOMEM, 0);
+                                GSL_ENOMEM, 0);
   h->xrange = (double *) malloc ((nx + 1) * sizeof (double));
   if (h->xrange == 0) {
     free (h);         /* exception in constructor, avoid memory leak */
     GSL_ERROR_VAL ("failed to allocate space for histogram3d x ranges",
-		   GSL_ENOMEM, 0);
+                   GSL_ENOMEM, 0);
   }
   h->yrange = (double *) malloc ((ny + 1) * sizeof (double));
   if (h->yrange == 0) {
     free (h->xrange);
     free (h);         /* exception in constructor, avoid memory leak */
     GSL_ERROR_VAL ("failed to allocate space for histogram3d y ranges",
-		   GSL_ENOMEM, 0);
+                   GSL_ENOMEM, 0);
   }
   h->zrange = (double *) malloc ((nz + 1) * sizeof (double));
   if (h->zrange == 0) {
@@ -47,7 +47,7 @@ mygsl_histogram3d* mygsl_histogram3d_alloc(const size_t nx, const size_t ny,
     free (h->yrange);
     free (h);         /* exception in constructor, avoid memory leak */
     GSL_ERROR_VAL ("failed to allocate space for histogram3d z ranges",
-		   GSL_ENOMEM, 0);
+                   GSL_ENOMEM, 0);
   }
   h->bin = (double *) malloc (nx*ny*nz*sizeof (double));
   if (h->bin == 0) {
@@ -56,7 +56,7 @@ mygsl_histogram3d* mygsl_histogram3d_alloc(const size_t nx, const size_t ny,
     free (h->zrange);
     free (h);         /* exception in constructor, avoid memory leak */
     GSL_ERROR_VAL ("failed to allocate space for histogram bins",
-		   GSL_ENOMEM, 0);
+                   GSL_ENOMEM, 0);
   }
   h->nx = nx;
   h->ny = ny;
@@ -64,15 +64,15 @@ mygsl_histogram3d* mygsl_histogram3d_alloc(const size_t nx, const size_t ny,
   return h;
 }
 
-mygsl_histogram3d* mygsl_histogram3d_calloc_uniform(const size_t nx, 
-						    const size_t ny,
-						    const size_t nz,
-						    const double xmin,
-						    const double xmax,
-						    const double ymin,
-						    const double ymax,
-						    const double zmin,
-						    const double zmax)
+mygsl_histogram3d* mygsl_histogram3d_calloc_uniform(const size_t nx,
+                                                    const size_t ny,
+                                                    const size_t nz,
+                                                    const double xmin,
+                                                    const double xmax,
+                                                    const double ymin,
+                                                    const double ymax,
+                                                    const double zmin,
+                                                    const double zmax)
 {
   mygsl_histogram3d *h;
   size_t i;
@@ -86,9 +86,9 @@ mygsl_histogram3d* mygsl_histogram3d_calloc_uniform(const size_t nx,
   return h;
 }
 
-mygsl_histogram3d* mygsl_histogram3d_calloc(const size_t nx, 
-					    const size_t ny,
-					    const size_t nz)
+mygsl_histogram3d* mygsl_histogram3d_calloc(const size_t nx,
+                                            const size_t ny,
+                                            const size_t nz)
 {
   mygsl_histogram3d *h;
   size_t i;
@@ -104,10 +104,10 @@ mygsl_histogram3d* mygsl_histogram3d_calloc(const size_t nx,
   return h;
 }
 
-int mygsl_histogram3d_set_ranges_uniform (mygsl_histogram3d * h, 
-					  double xmin, double xmax,
-					  double ymin, double ymax,
-					  double zmin, double zmax)
+int mygsl_histogram3d_set_ranges_uniform (mygsl_histogram3d * h,
+                                          double xmin, double xmax,
+                                          double ymin, double ymax,
+                                          double zmin, double zmax)
 {
   size_t i;
   const size_t nx = h->nx, ny = h->ny, nz = h->nz;
@@ -115,7 +115,6 @@ int mygsl_histogram3d_set_ranges_uniform (mygsl_histogram3d * h,
   if (xmin >= xmax) GSL_ERROR_VAL ("xmin must be less than xmax", GSL_EINVAL, 0);
   if (ymin >= ymax) GSL_ERROR_VAL ("ymin must be less than ymax", GSL_EINVAL, 0);
   if (zmin >= zmax) GSL_ERROR_VAL ("zmin must be less than zmax", GSL_EINVAL, 0);
-
   for (i = 0; i <= nx; i++)
     h->xrange[i] = xmin + ((double) i / (double) nx) * (xmax - xmin);
   for (i = 0; i <= ny; i++)
@@ -126,22 +125,22 @@ int mygsl_histogram3d_set_ranges_uniform (mygsl_histogram3d * h,
   return GSL_SUCCESS;
 }
 
-int mygsl_histogram3d_set_ranges(mygsl_histogram3d * h, 
-				 const double xrange[], size_t xsize,
-				 const double yrange[], size_t ysize,
-				 const double zrange[], size_t zsize)
+int mygsl_histogram3d_set_ranges(mygsl_histogram3d * h,
+                                 const double xrange[], size_t xsize,
+                                 const double yrange[], size_t ysize,
+                                 const double zrange[], size_t zsize)
 {
   size_t i;
   const size_t nx = h->nx, ny = h->ny, nz = h->nz;
   if (xsize != (nx + 1))
-    GSL_ERROR_VAL ("size of xrange must match size of histogram", 
-		   GSL_EINVAL, 0);
+    GSL_ERROR_VAL ("size of xrange must match size of histogram",
+                   GSL_EINVAL, 0);
   if (ysize != (ny + 1))
-    GSL_ERROR_VAL ("size of yrange must match size of histogram", 
-		   GSL_EINVAL, 0);
+    GSL_ERROR_VAL ("size of yrange must match size of histogram",
+                   GSL_EINVAL, 0);
   if (zsize != (nz + 1))
-    GSL_ERROR_VAL ("size of yrange must match size of histogram", 
-		   GSL_EINVAL, 0);
+    GSL_ERROR_VAL ("size of yrange must match size of histogram",
+                   GSL_EINVAL, 0);
   memcpy(h->xrange, xrange, sizeof(double)*xsize);
   memcpy(h->yrange, yrange, sizeof(double)*ysize);
   memcpy(h->zrange, zrange, sizeof(double)*zsize);
@@ -161,13 +160,13 @@ void mygsl_histogram3d_free (mygsl_histogram3d * h)
 /*****/
 
 int mygsl_histogram3d_memcpy(mygsl_histogram3d * dest, const mygsl_histogram3d * src)
-{  
-  size_t nx = src->nx;  
-  size_t ny = src->ny;  
-  size_t nz = src->nz;  
+{
+  size_t nx = src->nx;
+  size_t ny = src->ny;
+  size_t nz = src->nz;
   if (dest->nx != src->nx || dest->ny != src->ny ||  dest->nz != src->nz) {
-    GSL_ERROR ("histograms have different sizes, cannot copy",   
-	       GSL_EINVAL);    
+    GSL_ERROR ("histograms have different sizes, cannot copy",
+               GSL_EINVAL);
   }
   memcpy(dest->xrange, src->xrange, sizeof(double)*(nx+1));
   memcpy(dest->yrange, src->yrange, sizeof(double)*(ny+1));
@@ -187,78 +186,78 @@ mygsl_histogram3d* mygsl_histogram3d_clone(const mygsl_histogram3d * src)
 /*****/
 
 int mygsl_histogram3d_fread(FILE * stream, mygsl_histogram3d * h)
-{  
-  int status = gsl_block_raw_fread (stream, h->xrange, h->nx + 1, 1);  
-  if (status)    return status;  
-  status = gsl_block_raw_fread (stream, h->yrange, h->ny + 1, 1);  
-  if (status)    return status;  
-  status = gsl_block_raw_fread (stream, h->zrange, h->nz + 1, 1);  
-  if (status)    return status;  
-  status = gsl_block_raw_fread (stream, h->bin, h->nx * h->ny * h->nz, 1);  
+{
+  int status = gsl_block_raw_fread (stream, h->xrange, h->nx + 1, 1);
+  if (status)    return status;
+  status = gsl_block_raw_fread (stream, h->yrange, h->ny + 1, 1);
+  if (status)    return status;
+  status = gsl_block_raw_fread (stream, h->zrange, h->nz + 1, 1);
+  if (status)    return status;
+  status = gsl_block_raw_fread (stream, h->bin, h->nx * h->ny * h->nz, 1);
   return status;
 }
 
 int mygsl_histogram3d_fwrite(FILE * stream, const mygsl_histogram3d * h)
-{  
-  int status = gsl_block_raw_fwrite (stream, h->xrange, h->nx + 1, 1);  
-  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->zrange, h->nz + 1, 1);  
-  if (status)    return status;  
-  status = gsl_block_raw_fwrite (stream, h->bin, h->nx * h->ny * h->nz, 1);  
+{
+  int status = gsl_block_raw_fwrite (stream, h->xrange, h->nx + 1, 1);
+  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->zrange, h->nz + 1, 1);
+  if (status)    return status;
+  status = gsl_block_raw_fwrite (stream, h->bin, h->nx * h->ny * h->nz, 1);
   return status;
 }
 
 int mygsl_histogram3d_increment(mygsl_histogram3d * h, double x, double y, double z)
-{  
-  int status = mygsl_histogram3d_accumulate (h, x, y, z, 1.0);  
+{
+  int status = mygsl_histogram3d_accumulate (h, x, y, z, 1.0);
   return status;
 }
 
 int mygsl_find (const size_t n, const double range[], const double x, size_t * i);
 int mygsl_find2d (const size_t nx, const double xrange[],
-		  const size_t ny, const double yrange[],
-		  const double x, const double y,
-		  size_t * i, size_t * j);
+                  const size_t ny, const double yrange[],
+                  const double x, const double y,
+                  size_t * i, size_t * j);
 int mygsl_find3d (const size_t nx, const double xrange[],
-		  const size_t ny, const double yrange[],
-		  const size_t nz, const double zrange[],
-		  const double x, const double y, const double z,
-		  size_t * i, size_t * j, size_t *k);
-
-int mygsl_histogram3d_accumulate(mygsl_histogram3d * h, 
-				 double x, double y, double z, double weight)
-{  
-  const size_t nx = h->nx;  
-  const size_t ny = h->ny;  
-  const size_t nz = h->nz;  
-  size_t i = 0, j = 0, k = 0;  
+                  const size_t ny, const double yrange[],
+                  const size_t nz, const double zrange[],
+                  const double x, const double y, const double z,
+                  size_t * i, size_t * j, size_t *k);
+
+int mygsl_histogram3d_accumulate(mygsl_histogram3d * h,
+                                 double x, double y, double z, double weight)
+{
+  const size_t nx = h->nx;
+  const size_t ny = h->ny;
+  const size_t nz = h->nz;
+  size_t i = 0, j = 0, k = 0;
   int status = mygsl_find3d (h->nx, h->xrange, h->ny, h->yrange, h->nz, h->zrange,
-			     x, y, z, &i, &j, &k);  
-  if (status) return GSL_EDOM; 
-  if (i >= nx) GSL_ERROR ("index lies outside valid range of 0 .. nx - 1",   
-			  GSL_ESANITY);    
-  if (j >= ny) GSL_ERROR ("index lies outside valid range of 0 .. ny - 1",  
-			  GSL_ESANITY);   
-  if (k >= nz) GSL_ERROR ("index lies outside valid range of 0 .. nz - 1",  
-			  GSL_ESANITY);   
-  h->bin[i*ny*nz + j*nz + k] += weight;  
+                             x, y, z, &i, &j, &k);
+  if (status) return GSL_EDOM;
+  if (i >= nx) GSL_ERROR ("index lies outside valid range of 0 .. nx - 1",
+                          GSL_ESANITY);
+  if (j >= ny) GSL_ERROR ("index lies outside valid range of 0 .. ny - 1",
+                          GSL_ESANITY);
+  if (k >= nz) GSL_ERROR ("index lies outside valid range of 0 .. nz - 1",
+                          GSL_ESANITY);
+  h->bin[i*ny*nz + j*nz + k] += weight;
   return GSL_SUCCESS;
 }
 
-int mygsl_histogram3d_increment2(mygsl_histogram3d * h, 
-				 double x, double y, double z)
+int mygsl_histogram3d_increment2(mygsl_histogram3d * h,
+                                 double x, double y, double z)
 {
   return mygsl_histogram3d_accumulate2(h, x, y, z, 1.0);
 }
 
-int mygsl_histogram3d_accumulate2(mygsl_histogram3d * h, 
-				  double x, double y, double z, double weight)
-{  
-  const size_t nx = h->nx;  
-  const size_t ny = h->ny;  
-  const size_t nz = h->nz;  
+int mygsl_histogram3d_accumulate2(mygsl_histogram3d * h,
+                                  double x, double y, double z, double weight)
+{
+  const size_t nx = h->nx;
+  const size_t ny = h->ny;
+  const size_t nz = h->nz;
   size_t i = 0, j = 0, k = 0;
   int status;
   if (x < h->xrange[0]) x = h->xrange[0] + 4*GSL_DBL_EPSILON;
@@ -268,81 +267,81 @@ int mygsl_histogram3d_accumulate2(mygsl_histogram3d * h,
   if (z < h->zrange[0]) z = h->zrange[0] + 4*GSL_DBL_EPSILON;
   if (z > h->zrange[h->nz]) z = h->zrange[h->nz] - 4*GSL_DBL_EPSILON;
   status = mygsl_find3d (h->nx, h->xrange, h->ny, h->yrange, h->nz, h->zrange,
-			 x, y, z, &i, &j, &k);  
-  if (status) return GSL_EDOM; 
-  if (i >= nx) GSL_ERROR ("index lies outside valid range of 0 .. nx - 1",   
-			  GSL_ESANITY);    
-  if (j >= ny) GSL_ERROR ("index lies outside valid range of 0 .. ny - 1",  
-			  GSL_ESANITY);   
-  if (k >= nz) GSL_ERROR ("index lies outside valid range of 0 .. nz - 1",  
-			  GSL_ESANITY);   
-  h->bin[i*ny*nz + j*nz + k] += weight;  
+                         x, y, z, &i, &j, &k);
+  if (status) return GSL_EDOM;
+  if (i >= nx) GSL_ERROR ("index lies outside valid range of 0 .. nx - 1",
+                          GSL_ESANITY);
+  if (j >= ny) GSL_ERROR ("index lies outside valid range of 0 .. ny - 1",
+                          GSL_ESANITY);
+  if (k >= nz) GSL_ERROR ("index lies outside valid range of 0 .. nz - 1",
+                          GSL_ESANITY);
+  h->bin[i*ny*nz + j*nz + k] += weight;
   return GSL_SUCCESS;
 }
 
-double mygsl_histogram3d_get(const mygsl_histogram3d * h, const size_t i, 
-			     const size_t j, const size_t k)
-{  
-  const size_t nx = h->nx;  
-  const size_t ny = h->ny;  
-  const size_t nz = h->nz;  
-  if (i >= nx) GSL_ERROR_VAL ("index i lies outside valid range of 0 .. nx - 1", 
-			      GSL_EDOM, 0);   
-  if (j >= ny) GSL_ERROR_VAL ("index j lies outside valid range of 0 .. ny - 1",    
-			      GSL_EDOM, 0);    
-  if (k >= nz) GSL_ERROR_VAL ("index k lies outside valid range of 0 .. nz - 1",    
-			      GSL_EDOM, 0);    
+double mygsl_histogram3d_get(const mygsl_histogram3d * h, const size_t i,
+                             const size_t j, const size_t k)
+{
+  const size_t nx = h->nx;
+  const size_t ny = h->ny;
+  const size_t nz = h->nz;
+  if (i >= nx) GSL_ERROR_VAL ("index i lies outside valid range of 0 .. nx - 1",
+                              GSL_EDOM, 0);
+  if (j >= ny) GSL_ERROR_VAL ("index j lies outside valid range of 0 .. ny - 1",
+                              GSL_EDOM, 0);
+  if (k >= nz) GSL_ERROR_VAL ("index k lies outside valid range of 0 .. nz - 1",
+                              GSL_EDOM, 0);
   return h->bin[i*ny*nz + j*nz + k];
 }
 
-int mygsl_histogram3d_get_xrange(const mygsl_histogram3d * h, const size_t i,  
-			       double *xlower, double *xupper)
-{ 
-  const size_t nx = h->nx;  
-  if (i >= nx) GSL_ERROR ("index i lies outside valid range of 0 .. nx - 1", 
-			  GSL_EDOM);    
-  *xlower = h->xrange[i];  
-  *xupper = h->xrange[i + 1];  
+int mygsl_histogram3d_get_xrange(const mygsl_histogram3d * h, const size_t i,
+                                 double *xlower, double *xupper)
+{
+  const size_t nx = h->nx;
+  if (i >= nx) GSL_ERROR ("index i lies outside valid range of 0 .. nx - 1",
+                          GSL_EDOM);
+  *xlower = h->xrange[i];
+  *xupper = h->xrange[i + 1];
   return GSL_SUCCESS;
 }
 
-int mygsl_histogram3d_get_yrange(const mygsl_histogram3d * h, const size_t j,  
-			       double *ylower, double *yupper)
-{ 
-  const size_t ny = h->ny;  
-  if (j >= ny) GSL_ERROR ("index j lies outside valid range of 0 .. ny - 1", 
-			  GSL_EDOM);    
-  *ylower = h->yrange[j];  
-  *yupper = h->yrange[j + 1];  
+int mygsl_histogram3d_get_yrange(const mygsl_histogram3d * h, const size_t j,
+                                 double *ylower, double *yupper)
+{
+  const size_t ny = h->ny;
+  if (j >= ny) GSL_ERROR ("index j lies outside valid range of 0 .. ny - 1",
+                          GSL_EDOM);
+  *ylower = h->yrange[j];
+  *yupper = h->yrange[j + 1];
   return GSL_SUCCESS;
 }
 
-int mygsl_histogram3d_get_zrange(const mygsl_histogram3d * h, const size_t k,  
-			       double *zlower, double *zupper)
-{ 
-  const size_t nz = h->nz;  
-  if (k >= nz) GSL_ERROR ("index k lies outside valid range of 0 .. nz - 1", 
-			  GSL_EDOM);    
-  *zlower = h->zrange[k];  
-  *zupper = h->zrange[k + 1];  
+int mygsl_histogram3d_get_zrange(const mygsl_histogram3d * h, const size_t k,
+                                 double *zlower, double *zupper)
+{
+  const size_t nz = h->nz;
+  if (k >= nz) GSL_ERROR ("index k lies outside valid range of 0 .. nz - 1",
+                          GSL_EDOM);
+  *zlower = h->zrange[k];
+  *zupper = h->zrange[k + 1];
   return GSL_SUCCESS;
 }
 
 int mygsl_histogram3d_find (const mygsl_histogram3d * h,
-			    const double x, const double y, const double z,
-			    size_t * i, size_t * j, size_t *k)
-{ 
-  int status = mygsl_find(h->nx, h->xrange, x, i);  
-  if (status) GSL_ERROR ("x not found in range of h", GSL_EDOM);    
-  status = mygsl_find (h->ny, h->yrange, y, j);  
-  if (status) GSL_ERROR ("y not found in range of h", GSL_EDOM);    
-  status = mygsl_find (h->nz, h->zrange, z, k);  
-  if (status) GSL_ERROR ("z not found in range of h", GSL_EDOM);    
+                            const double x, const double y, const double z,
+                            size_t * i, size_t * j, size_t *k)
+{
+  int status = mygsl_find(h->nx, h->xrange, x, i);
+  if (status) GSL_ERROR ("x not found in range of h", GSL_EDOM);
+  status = mygsl_find (h->ny, h->yrange, y, j);
+  if (status) GSL_ERROR ("y not found in range of h", GSL_EDOM);
+  status = mygsl_find (h->nz, h->zrange, z, k);
+  if (status) GSL_ERROR ("z not found in range of h", GSL_EDOM);
   return GSL_SUCCESS;
 }
 
 gsl_histogram2d* mygsl_histogram3d_xyproject(const mygsl_histogram3d * h3,
-					     size_t kstart, size_t kend)
+                                             size_t kstart, size_t kend)
 {
   gsl_histogram2d *h2;
   double count;
@@ -353,8 +352,8 @@ gsl_histogram2d* mygsl_histogram3d_xyproject(const mygsl_histogram3d * h3,
     for (j = 0; j < h3->ny; j++) {
       count = 0;
       for (k = kstart; k <= kend; k++) {
-	if (k >= h3->nz) break;
-	count += mygsl_histogram3d_get(h3, i, j, k);
+        if (k >= h3->nz) break;
+        count += mygsl_histogram3d_get(h3, i, j, k);
       }
       h2->bin[i*h2->ny + j] = count;
     }
@@ -363,7 +362,7 @@ gsl_histogram2d* mygsl_histogram3d_xyproject(const mygsl_histogram3d * h3,
 }
 
 gsl_histogram2d* mygsl_histogram3d_xzproject(const mygsl_histogram3d * h3,
-					     size_t jstart, size_t jend)
+                                             size_t jstart, size_t jend)
 {
   gsl_histogram2d *h2;
   double count;
@@ -374,8 +373,8 @@ gsl_histogram2d* mygsl_histogram3d_xzproject(const mygsl_histogram3d * h3,
     for (k = 0; k < h3->nz; k++) {
       count = 0;
       for (j = jstart; j <= jend; j++) {
-	if (j >= h3->ny) break;
-	count += mygsl_histogram3d_get(h3, i, j, k);
+        if (j >= h3->ny) break;
+        count += mygsl_histogram3d_get(h3, i, j, k);
       }
       h2->bin[i*h2->ny + k] = count;
     }
@@ -384,7 +383,7 @@ gsl_histogram2d* mygsl_histogram3d_xzproject(const mygsl_histogram3d * h3,
 }
 
 gsl_histogram2d* mygsl_histogram3d_yzproject(const mygsl_histogram3d * h3,
-					     size_t istart, size_t iend)
+                                             size_t istart, size_t iend)
 {
   gsl_histogram2d *h2;
   double count;
@@ -395,8 +394,8 @@ gsl_histogram2d* mygsl_histogram3d_yzproject(const mygsl_histogram3d * h3,
     for (k = 0; k < h3->nz; k++) {
       count = 0;
       for (i = istart; i <= iend; i++) {
-	if (i >= h3->nx) break;
-	count += mygsl_histogram3d_get(h3, i, j, k);
+        if (i >= h3->nx) break;
+        count += mygsl_histogram3d_get(h3, i, j, k);
       }
       h2->bin[j*h2->ny + k] = count;
     }
@@ -422,7 +421,7 @@ int mygsl_histogram3d_shift(mygsl_histogram3d * h, double shift)
 
 double mygsl_histogram3d_xmax(const mygsl_histogram3d * h)
 {
-  const int nx = h->nx;  
+  const int nx = h->nx;
   return h->xrange[nx];
 }
 double mygsl_histogram3d_xmin(const mygsl_histogram3d * h)
@@ -432,7 +431,7 @@ double mygsl_histogram3d_xmin(const mygsl_histogram3d * h)
 
 double mygsl_histogram3d_ymax(const mygsl_histogram3d * h)
 {
-  const int ny = h->ny;  
+  const int ny = h->ny;
   return h->yrange[ny];
 }
 double mygsl_histogram3d_ymin(const mygsl_histogram3d * h)
@@ -442,7 +441,7 @@ double mygsl_histogram3d_ymin(const mygsl_histogram3d * h)
 
 double mygsl_histogram3d_zmax(const mygsl_histogram3d * h)
 {
-  const int nz = h->nz;  
+  const int nz = h->nz;
   return h->zrange[nz];
 }
 
@@ -464,8 +463,8 @@ double mygsl_histogram3d_max_val(const mygsl_histogram3d * h)
   return max;
 }
 
-void mygsl_histogram3d_max_bin(const mygsl_histogram3d * h, 
-			       size_t *imax_out, size_t *jmax_out, size_t *kmax_out)
+void mygsl_histogram3d_max_bin(const mygsl_histogram3d * h,
+                               size_t *imax_out, size_t *jmax_out, size_t *kmax_out)
 {
   const size_t nx = h->nx;
   const size_t ny = h->ny;
@@ -475,13 +474,13 @@ void mygsl_histogram3d_max_bin(const mygsl_histogram3d * h,
   for (i = 0; i < nx; i++) {
     for (j = 0; j < ny; j++) {
       for (k = 0; k < nz; k++) {
-	x = h->bin[i * ny*nz + j*nz + k];
-	if (x > max) {
-	  max = x;
-	  imax = i;
-	  jmax = j;
-	  kmax = k;
-	}
+        x = h->bin[i * ny*nz + j*nz + k];
+        if (x > max) {
+          max = x;
+          imax = i;
+          jmax = j;
+          kmax = k;
+        }
       }
     }
   }
@@ -503,8 +502,8 @@ double mygsl_histogram3d_min_val(const mygsl_histogram3d * h)
   return min;
 }
 
-void mygsl_histogram3d_min_bin(const mygsl_histogram3d * h, 
-			       size_t *imin_out, size_t *jmin_out, size_t *kmin_out)
+void mygsl_histogram3d_min_bin(const mygsl_histogram3d * h,
+                               size_t *imin_out, size_t *jmin_out, size_t *kmin_out)
 {
   const size_t nx = h->nx;
   const size_t ny = h->ny;
@@ -514,13 +513,13 @@ void mygsl_histogram3d_min_bin(const mygsl_histogram3d * h,
   for (i = 0; i < nx; i++) {
     for (j = 0; j < ny; j++) {
       for (k = 0; k < nz; k++) {
-	x = h->bin[i * ny*nz + j*nz + k];
-	if (x < min) {
-	  min = x;
-	  imin = i;
-	  jmin = j;
-	  kmin = k;
-	}
+        x = h->bin[i * ny*nz + j*nz + k];
+        if (x < min) {
+          min = x;
+          imin = i;
+          jmin = j;
+          kmin = k;
+        }
       }
     }
   }
@@ -551,8 +550,8 @@ double mygsl_histogram3d_xmean (const mygsl_histogram3d * h)
     double wi = 0;
     for (j = 0; j < ny; j++) {
       for (k = 0; k < nz; k++) {
-	double wijk = h->bin[i * ny *nz + j * nz + k];
-	if (wijk > 0) wi += wijk;
+        double wijk = h->bin[i * ny *nz + j * nz + k];
+        if (wijk > 0) wi += wijk;
       }
     }
     if (wi > 0) {
@@ -576,8 +575,8 @@ double mygsl_histogram3d_ymean (const mygsl_histogram3d * h)
     double wj = 0;
     for (i = 0; i < nx; i++) {
       for (k = 0; k < nz; k++) {
-	double wijk = h->bin[i * ny *nz + j * nz + k];
-	if (wijk > 0) wj += wijk;
+        double wijk = h->bin[i * ny *nz + j * nz + k];
+        if (wijk > 0) wj += wijk;
       }
     }
     if (wj > 0) {
@@ -601,8 +600,8 @@ double mygsl_histogram3d_zmean (const mygsl_histogram3d * h)
     double wk = 0;
     for (i = 0; i < nx; i++) {
       for (j = 0; j < ny; j++) {
-	double wijk = h->bin[i * ny *nz + j * nz + k];
-	if (wijk > 0) wk += wijk;
+        double wijk = h->bin[i * ny *nz + j * nz + k];
+        if (wijk > 0) wk += wijk;
       }
     }
     if (wk > 0) {
@@ -624,8 +623,8 @@ double mygsl_histogram3d_xsigma(const mygsl_histogram3d * h)
     double wi = 0;
     for (j = 0; j < ny; j++) {
       for (k = 0; k < nz; k++) {
-	double wijk = h->bin[i * ny*nz + j*nz + k];
-	if (wijk > 0) wi += wijk;
+        double wijk = h->bin[i * ny*nz + j*nz + k];
+        if (wijk > 0) wi += wijk;
       }
     }
     if (wi > 0) {
@@ -633,7 +632,7 @@ double mygsl_histogram3d_xsigma(const mygsl_histogram3d * h)
       wvariance += ((xi * xi) - wvariance) * (wi / W);
     }
   }
-  return  sqrt(wvariance);
+  return sqrt(wvariance);
 }
 
 double mygsl_histogram3d_ysigma(const mygsl_histogram3d * h)
@@ -647,8 +646,8 @@ double mygsl_histogram3d_ysigma(const mygsl_histogram3d * h)
     double wj = 0;
     for (i = 0; i < nx; i++) {
       for (k = 0; k < nz; k++) {
-	double wjjk = h->bin[i * ny*nz + j*nz + k];
-	if (wjjk > 0) wj += wjjk;
+        double wjjk = h->bin[i * ny*nz + j*nz + k];
+        if (wjjk > 0) wj += wjjk;
       }
     }
     if (wj > 0) {
@@ -656,7 +655,7 @@ double mygsl_histogram3d_ysigma(const mygsl_histogram3d * h)
       wvariance += ((yj * yj) - wvariance) * (wj / W);
     }
   }
-  return  sqrt(wvariance);
+  return sqrt(wvariance);
 }
 
 double mygsl_histogram3d_zsigma(const mygsl_histogram3d * h)
@@ -670,8 +669,8 @@ double mygsl_histogram3d_zsigma(const mygsl_histogram3d * h)
     double wk = 0;
     for (i = 0; i < nx; i++) {
       for (j = 0; j < ny; j++) {
-	double wijk = h->bin[i * ny*nz + j*nz + k];
-	if (wijk > 0) wk += wijk;
+        double wijk = h->bin[i * ny*nz + j*nz + k];
+        if (wijk > 0) wk += wijk;
       }
     }
     if (wk > 0) {
@@ -679,7 +678,7 @@ double mygsl_histogram3d_zsigma(const mygsl_histogram3d * h)
       wvariance += ((zk * zk) - wvariance) * (wk / W);
     }
   }
-  return  sqrt(wvariance);
+  return sqrt(wvariance);
 }
 
 void mygsl_histogram3d_reset(mygsl_histogram3d * h)
@@ -690,17 +689,17 @@ void mygsl_histogram3d_reset(mygsl_histogram3d * h)
   const size_t nz = h->nz;
 
   for (i = 0; i < nx * ny * nz; i++)
-    {
-      h->bin[i] = 0;
-    }
+  {
+    h->bin[i] = 0;
+  }
 }
 
 int mygsl_histogram3d_equal_bins_p(const mygsl_histogram3d * h1,
-				   const mygsl_histogram3d * h2)
+                                   const mygsl_histogram3d * h2)
 {
   size_t i;
   if ((h1->nx != h2->nx) || (h1->ny != h2->ny) || (h1->nz != h2->nz)) return 0;
-  for (i = 0; i <= h1->nx; i++) 
+  for (i = 0; i <= h1->nx; i++)
     if (h1->xrange[i] != h2->xrange[i]) return 0;
   for (i = 0; i <= h1->ny; i++)
     if (h1->yrange[i] != h2->yrange[i]) return 0;