gsl 1.15.3 → 1.16.0.6

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

@@ -1,23 +1,23 @@
 /* histogram/find.c
- * 
+ *
  * Copyright (C) 1996, 1997, 1998, 1999, 2000 Brian Gough
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or (at
  * your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "rb_gsl_histogram.h"
+#include "include/rb_gsl_histogram.h"
 /* determines whether to optimize for linear ranges  */
 #define LINEAR_OPT 1
 
@@ -26,7 +26,6 @@ int mygsl_find (const size_t n, const double range[], const double x, size_t * i
   size_t i_linear, lower, upper, mid;
   if (x < range[0]) return -1;
   if (x >= range[n]) return +1;
-
   /* optimize for linear case */
 
 #ifdef LINEAR_OPT
@@ -36,47 +35,46 @@ int mygsl_find (const size_t n, const double range[], const double x, size_t * i
   }
 
   if (x >= range[i_linear] && x < range[i_linear + 1])
-    {
-      *i = i_linear;
-      return 0;
-    }
+  {
+    *i = i_linear;
+    return 0;
+  }
 #endif
 
   /* perform binary search */
 
-  upper = n ;
-  lower = 0 ;
+  upper = n;
+  lower = 0;
 
   while (upper - lower > 1)
+  {
+    mid = (upper + lower) / 2;
+
+    if (x >= range[mid])
     {
-      mid = (upper + lower) / 2 ;
-      
-      if (x >= range[mid])
-        {
-          lower = mid ;
-        }
-      else
-        {
-          upper = mid ;
-        }
+      lower = mid;
     }
+    else
+    {
+      upper = mid;
+    }
+  }
 
-  *i = lower ;
+  *i = lower;
 
   /* sanity check the result */
 
   if (x < range[lower] || x >= range[lower + 1])
-    {
-      GSL_ERROR ("x not found in range", GSL_ESANITY);
-    }
-
+  {
+    GSL_ERROR ("x not found in range", GSL_ESANITY);
+  }
   return 0;
 }
 
 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 status = mygsl_find (nx, xrange, x, i);
   if (status) return status;
@@ -86,10 +84,10 @@ int mygsl_find2d (const size_t nx, const double xrange[],
 }
 
 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)
+                  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 status = mygsl_find (nx, xrange, x, i);
   if (status) return status;

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

@@ -18,11 +18,11 @@
  */
 /***************************************************************
  *
- * File gsl_histogram_oper.c: 
- * Routine to make operation on histograms. 
+ * File gsl_histogram_oper.c:
+ * Routine to make operation on histograms.
  * Need GSL library and header.
  * Contains the routines:
- * gsl_histogram_same_binning check if two histograms have the same binning 
+ * gsl_histogram_same_binning check if two histograms have the same binning
  * gsl_histogram_add          add two histograms
  * gsl_histogram_sub          subctract two histograms
  * gsl_histogram_mult         multiply two histograms
@@ -38,7 +38,7 @@
 #include <gsl/gsl_math.h>
 #include <gsl/gsl_histogram.h>
 
-/* 
+/*
  * gsl_histogram_same_binning:
  * control if two histograms have the
  * same binning
@@ -48,112 +48,103 @@ int
 mygsl_histogram_equal_bins_p (const gsl_histogram * h1, const gsl_histogram * h2)
 {
   if (h1->n != h2->n)
-    {
-      return 0;
-    }
-
+  {
+    return 0;
+  }
   {
     size_t i;
     /* init ranges */
 
     for (i = 0; i <= h1->n; i++)
+    {
+      if (gsl_fcmp(h1->range[i],h2->range[i], 1e-12))
       {
-        if (gsl_fcmp(h1->range[i],h2->range[i], 1e-12))
-          {
-            return 0;
-          }
+        return 0;
       }
+    }
   }
 
   return 1;
 }
 
-/* 
+/*
  * gsl_histogram_add:
  * add two histograms
  */
-int 
+int
 mygsl_histogram_add (gsl_histogram * h1, const gsl_histogram * h2)
 {
   size_t i;
 
   if (!mygsl_histogram_equal_bins_p (h1, h2))
-    {
-      GSL_ERROR ("histograms have different binning", GSL_EINVAL);
-    }
-
+  {
+    GSL_ERROR ("histograms have different binning", GSL_EINVAL);
+  }
   for (i = 0; i < h1->n; i++)
-    {
-      h1->bin[i] += h2->bin[i];
-    }
-
+  {
+    h1->bin[i] += h2->bin[i];
+  }
   return GSL_SUCCESS;
 }
 
-/* 
+/*
  * gsl_histogram_sub:
  * subtract two histograms
  */
 
-int 
+int
 mygsl_histogram_sub (gsl_histogram * h1, const gsl_histogram * h2)
 {
   size_t i;
 
   if (!mygsl_histogram_equal_bins_p (h1, h2))
-    {
-      GSL_ERROR ("histograms have different binning", GSL_EINVAL);
-    }
-
+  {
+    GSL_ERROR ("histograms have different binning", GSL_EINVAL);
+  }
   for (i = 0; i < h1->n; i++)
-    {
-      h1->bin[i] -= h2->bin[i];
-    }
-
+  {
+    h1->bin[i] -= h2->bin[i];
+  }
   return GSL_SUCCESS;
 
 }
 
-/* 
+/*
  * gsl_histogram_mult:
  * multiply two histograms
  */
 
-int 
+int
 mygsl_histogram_mul (gsl_histogram * h1, const gsl_histogram * h2)
 {
   size_t i;
 
   if (!mygsl_histogram_equal_bins_p (h1, h2))
-    {
-      GSL_ERROR ("histograms have different binning", GSL_EINVAL);
-    }
-
+  {
+    GSL_ERROR ("histograms have different binning", GSL_EINVAL);
+  }
   for (i = 0; i < h1->n; i++)
-    {
-      h1->bin[i] *= h2->bin[i];
-    }
-
+  {
+    h1->bin[i] *= h2->bin[i];
+  }
   return GSL_SUCCESS;
 }
-/* 
+/*
  * gsl_histogram_div:
  * divide two histograms
  */
-int 
+int
 mygsl_histogram_div (gsl_histogram * h1, const gsl_histogram * h2)
 {
   size_t i;
 
   if (!mygsl_histogram_equal_bins_p (h1, h2))
-    {
-      GSL_ERROR ("histograms have different binning", GSL_EINVAL);
-    }
-
+  {
+    GSL_ERROR ("histograms have different binning", GSL_EINVAL);
+  }
   for (i = 0; i < h1->n; i++)
-    {
-      h1->bin[i] /= h2->bin[i];
-    }
-
+  {
+    h1->bin[i] /= h2->bin[i];
+  }
   return GSL_SUCCESS;
 }

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

@@ -9,7 +9,7 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl.h"
+#include "include/rb_gsl.h"
 
 static VALUE rb_gsl_ieee_env_setup(VALUE obj)
 {
@@ -19,15 +19,11 @@ static VALUE rb_gsl_ieee_env_setup(VALUE obj)
 
 static VALUE rb_gsl_ieee_fprintf_double(int argc, VALUE *argv, VALUE obj)
 {
-#ifdef RUBY_1_9_LATER
   rb_io_t *fptr = NULL;
-  double ftmp;
-#else
-  OpenFile *fptr = NULL;
-#endif
   FILE *fp = NULL;
   int flag = 0;
   VALUE vtmp;
+  double ftmp;
 
   switch (argc) {
   case 2:
@@ -39,15 +35,11 @@ static VALUE rb_gsl_ieee_fprintf_double(int argc, VALUE *argv, VALUE obj)
     case T_FILE:
       GetOpenFile(argv[0], fptr);
       rb_io_check_writable(fptr);
-#ifdef RUBY_1_9_LATER
       fp = rb_io_stdio_file(fptr);
-#else
-      fp = GetWriteFile(fptr);
-#endif
       break;
     default:
       rb_raise(rb_eTypeError, "wrong type argument %s (IO or String expected)",
-	       rb_class2name(CLASS_OF(argv[0])));
+               rb_class2name(CLASS_OF(argv[0])));
     }
     vtmp = argv[1];
     break;
@@ -60,13 +52,9 @@ static VALUE rb_gsl_ieee_fprintf_double(int argc, VALUE *argv, VALUE obj)
   }
   if (TYPE(vtmp) != T_FLOAT)
     rb_raise(rb_eTypeError, "wrong argument type %s (Float expected)",
-	     rb_class2name(CLASS_OF(vtmp)));
-#ifdef RUBY_1_9_LATER
+             rb_class2name(CLASS_OF(vtmp)));
   ftmp = RFLOAT_VALUE(vtmp);
   gsl_ieee_fprintf_double(fp, &ftmp);
-#else
-  gsl_ieee_fprintf_double(fp, &(RFLOAT(vtmp)->value));
-#endif
   if (fp == stdout) fprintf(stdout, "\n");
   if (flag == 1) fclose(fp);
   return obj;
@@ -86,15 +74,15 @@ void Init_gsl_ieee(VALUE module)
   mgsl_ieee = rb_define_module_under(module, "IEEE");
 
   rb_define_singleton_method(mgsl_ieee, "env_setup",
-			     rb_gsl_ieee_env_setup, 0);
+                             rb_gsl_ieee_env_setup, 0);
   rb_define_module_function(module, "ieee_env_setup", rb_gsl_ieee_env_setup, 0);
   rb_define_singleton_method(mgsl_ieee, "fprintf_double",
-			     rb_gsl_ieee_fprintf_double, -1);
+                             rb_gsl_ieee_fprintf_double, -1);
   rb_define_singleton_method(mgsl_ieee, "fprintf",
-			     rb_gsl_ieee_fprintf_double, -1);
+                             rb_gsl_ieee_fprintf_double, -1);
   rb_define_singleton_method(mgsl_ieee, "printf",
-			     rb_gsl_ieee_printf_double, -1);
+                             rb_gsl_ieee_printf_double, -1);
   rb_define_singleton_method(mgsl_ieee, "printf_double",
-			     rb_gsl_ieee_printf_double, -1);
+                             rb_gsl_ieee_printf_double, -1);
 
 }

data/{include → ext/gsl_native/include}/rb_gsl.h

@@ -12,40 +12,25 @@
 #ifndef ___RB_GSL_H___
 #define ___RB_GSL_H___
 
-#include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <stdlib.h>
 #include <gsl/gsl_mode.h>
-#include "rb_gsl_common.h"
-#include "rb_gsl_math.h"
-#include "rb_gsl_complex.h"
-#include "rb_gsl_array.h"
-#include "rb_gsl_function.h"
 #include "rb_gsl_poly.h"
-#include "rb_gsl_sf.h"
 #include "rb_gsl_linalg.h"
+#include "rb_gsl_math.h"
+#include "rb_gsl_root.h"
+#include "rb_gsl_histogram.h"
+#include "rb_gsl_sf.h"
 #include "rb_gsl_eigen.h"
 #include "rb_gsl_fft.h"
 #include "rb_gsl_integration.h"
 #include "rb_gsl_rng.h"
 #include "rb_gsl_statistics.h"
-#include "rb_gsl_histogram.h"
 #include "rb_gsl_odeiv.h"
 #include "rb_gsl_interp.h"
 #include "rb_gsl_cheb.h"
-#include "rb_gsl_root.h"
 #include "rb_gsl_fit.h"
 #include "rb_gsl_const.h"
-#include "rb_gsl_config.h"
-
-
-#include "ruby.h"
-#ifdef RUBY_1_9_LATER
-#include "ruby/io.h"
-#else
-#include "rubyio.h"
-#endif
 
 void Init_gsl_error(VALUE module);
 void Init_gsl_math(VALUE module);
@@ -82,9 +67,7 @@ void Init_gsl_odeiv(VALUE module);
 void Init_gsl_interp(VALUE module);
 void Init_gsl_spline(VALUE module);
 void Init_gsl_diff(VALUE module);
-#ifdef GSL_1_4_9_LATER
 void Init_gsl_deriv(VALUE module);
-#endif
 
 void Init_gsl_cheb(VALUE module);
 void Init_gsl_sum(VALUE module);
@@ -138,9 +121,7 @@ void Init_cqp(VALUE module);
 
 void Init_fresnel(VALUE module);
 
-#ifdef GSL_1_9_LATER
 void Init_bspline(VALUE module);
-#endif
 
 #ifdef HAVE_ALF_ALF_H
 #include "alf/alf.h"
@@ -148,11 +129,8 @@ void Init_bspline(VALUE module);
 void Init_alf(VALUE module);
 void Init_geometry(VALUE module);
 
-#ifdef GSL_1_14_LATER
 #include <gsl/gsl_multiset.h>
 extern VALUE cMultiset;
 void Init_multiset(VALUE module);
 
 #endif
-
-#endif

data/{include → ext/gsl_native/include}/rb_gsl_array.h

@@ -13,15 +13,10 @@
 #define ___RB_GSL_ARRAY_H___
 
 #include <math.h>
-#include <gsl/gsl_errno.h>
-#include <gsl/gsl_complex.h>
 #include <gsl/gsl_block.h>
-#include <gsl/gsl_vector.h>
 #include <gsl/gsl_vector_complex.h>
 #include <gsl/gsl_vector_complex_double.h>
-#include <gsl/gsl_matrix.h>
 #include <gsl/gsl_matrix_complex_double.h>
-#include <gsl/gsl_permutation.h>
 #include <gsl/gsl_combination.h>
 #include <gsl/gsl_sort.h>
 #include <gsl/gsl_sort_vector.h>
@@ -29,15 +24,6 @@
 #include <gsl/gsl_eigen.h>
 #include <gsl/gsl_odeiv.h>
 #include <gsl/gsl_blas.h>
-#include "rb_gsl_config.h"
-
-#include "ruby.h"
-#ifdef RUBY_1_9_LATER
-#include "ruby/io.h"
-#else
-#include "rubyio.h"
-#endif
-
 #include "rb_gsl_common.h"
 
 typedef gsl_permutation gsl_index;
@@ -123,14 +109,14 @@ double* get_vector_ptr(VALUE ary, size_t *stride, size_t *n);
 
 gsl_matrix_complex* matrix_to_complex(const gsl_matrix *m);
 
-void gsl_matrix_complex_mul(gsl_matrix_complex *mnew, const gsl_matrix_complex *m, 
-			    const gsl_matrix_complex *mb);
+void gsl_matrix_complex_mul(gsl_matrix_complex *mnew, const gsl_matrix_complex *m,
+                            const gsl_matrix_complex *mb);
 void gsl_matrix_mul(gsl_matrix *mnew, gsl_matrix *m, gsl_matrix *b);
-void gsl_matrix_complex_mul_vector(gsl_vector_complex *vnew, 
-				   const gsl_matrix_complex *m, 
-				   const gsl_vector_complex *v);
-void gsl_matrix_mul_vector(gsl_vector *vnew, 
-			   const gsl_matrix *m, const gsl_vector *v);
+void gsl_matrix_complex_mul_vector(gsl_vector_complex *vnew,
+                                   const gsl_matrix_complex *m,
+                                   const gsl_vector_complex *v);
+void gsl_matrix_mul_vector(gsl_vector *vnew,
+                           const gsl_matrix *m, const gsl_vector *v);
 gsl_vector_complex* vector_to_complex(const gsl_vector *v);
 
 gsl_vector* make_vector_clone(const gsl_vector *v);
@@ -164,8 +150,8 @@ gsl_matrix_int_view* rb_gsl_matrix_int_view_alloc();
 void rb_gsl_matrix_int_view_free(gsl_matrix_int_view *v);
 VALUE rb_gsl_matrix_to_i(VALUE obj);
 VALUE rb_gsl_matrix_int_to_f(VALUE obj);
-void gsl_matrix_int_mul_vector(gsl_vector_int *vnew, 
-			       const gsl_matrix_int *m, const gsl_vector_int *v);
+void gsl_matrix_int_mul_vector(gsl_vector_int *vnew,
+                               const gsl_matrix_int *m, const gsl_vector_int *v);
 VALUE rb_gsl_vector_to_i(VALUE obj);
 VALUE make_rarray_from_cvector_int(const gsl_vector_int *v);
 VALUE rb_gsl_vector_int_to_f(VALUE obj);
@@ -174,34 +160,24 @@ VALUE rb_gsl_vector_print(VALUE obj);
 void gsl_vector_print(const gsl_vector *v, VALUE klass);
 int rbgsl_vector_equal(const gsl_vector *v1, const gsl_vector *v2, double eps);
 
-#ifndef GSL_1_2_LATER
-int gsl_matrix_complex_add(gsl_matrix_complex * a, const gsl_matrix_complex * b);
-int gsl_matrix_complex_sub(gsl_matrix_complex * a, const gsl_matrix_complex * b);
-int gsl_matrix_complex_mul_elements(gsl_matrix_complex * a, const gsl_matrix_complex * b);
-int gsl_matrix_complex_div_elements(gsl_matrix_complex * a, const gsl_matrix_complex * b);
-int gsl_matrix_complex_scale(gsl_matrix_complex * a, const gsl_complex x);
-int gsl_matrix_complex_add_constant(gsl_matrix_complex * a, const gsl_complex x);
-int gsl_matrix_complex_add_diagonal(gsl_matrix_complex * a, const gsl_complex x);
-#endif
-
 void Init_gsl_vector_init(VALUE module);
 void Init_gsl_vector_int_init(VALUE module);
 void Init_gsl_matrix_init(VALUE module);
 void Init_gsl_matrix_int_init(VALUE module);
 
-gsl_matrix* gsl_matrix_alloc_from_array_sizes(VALUE ary, 
-						     VALUE nn1, VALUE nn2);
+gsl_matrix* gsl_matrix_alloc_from_array_sizes(VALUE ary,
+                                              VALUE nn1, VALUE nn2);
 gsl_matrix* gsl_matrix_alloc_from_arrays(int argc, VALUE *argv);
 
 gsl_matrix* gsl_matrix_alloc_from_vector_sizes(VALUE ary,
-					      VALUE nn1, VALUE nn2);
+                                               VALUE nn1, VALUE nn2);
 gsl_matrix* gsl_matrix_alloc_from_vectors(int argc, VALUE *argv);
-gsl_matrix_int* gsl_matrix_int_alloc_from_array_sizes(VALUE ary, 
-						     VALUE nn1, VALUE nn2);
+gsl_matrix_int* gsl_matrix_int_alloc_from_array_sizes(VALUE ary,
+                                                      VALUE nn1, VALUE nn2);
 gsl_matrix_int* gsl_matrix_int_alloc_from_arrays(int argc, VALUE *argv);
 
 gsl_matrix_int* gsl_matrix_int_alloc_from_vector_sizes(VALUE ary,
-					      VALUE nn1, VALUE nn2);
+                                                       VALUE nn1, VALUE nn2);
 gsl_matrix_int* gsl_matrix_int_alloc_from_vectors(int argc, VALUE *argv);
 
 VALUE rb_gsl_matrix_do_something(VALUE obj, void (*f)(gsl_matrix *));