rb-gsl 1.16.0 → 1.16.0.1

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

@@ -9,9 +9,9 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl.h"
-#include "rb_gsl_array.h"
-#include "rb_gsl_common.h"
+#include "include/rb_gsl.h"
+#include "include/rb_gsl_array.h"
+#include "include/rb_gsl_common.h"
 #include <gsl/gsl_dht.h>
 #ifdef HAVE_NARRAY_H
 #include "narray.h"

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

@@ -8,9 +8,9 @@
   This library is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY.
 */
-#include "rb_gsl_config.h"
-#include "rb_gsl_common.h"
-#include "rb_gsl_function.h"
+
+#include "include/rb_gsl_common.h"
+#include "include/rb_gsl_function.h"
 #include <gsl/gsl_math.h>
 #include <gsl/gsl_diff.h>
 

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

@@ -1,4 +1,4 @@
-#include "rb_gsl_dirac.h"
+#include "include/rb_gsl_dirac.h"
 
 static VALUE cgsl_matrix_complex_const;
 static VALUE cPauli;

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

@@ -9,11 +9,11 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl.h"
-#include "rb_gsl_array.h"
+#include "include/rb_gsl.h"
+#include "include/rb_gsl_array.h"
 
-#include "rb_gsl_eigen.h"
-#include "rb_gsl_complex.h"
+#include "include/rb_gsl_eigen.h"
+#include "include/rb_gsl_complex.h"
 #include <gsl/gsl_complex.h>
 #include <gsl/gsl_complex_math.h>
 #include <gsl/gsl_math.h>
@@ -29,7 +29,7 @@ static VALUE cgsl_eigen_vector;
 static VALUE cgsl_eigen_vector_complex;
 static VALUE cgsl_eigen_herm_vectors;
 
-#ifdef HAVE_EIGEN_FRANCIS
+#ifdef HAVE_GSL_EIGEN_FRANCIS
 static VALUE cgsl_eigen_francis_workspace;
 
 #endif
@@ -600,7 +600,7 @@ static VALUE rb_gsl_eigen_hermv_sort(int argc, VALUE *argv, VALUE obj)
 }
 
 
-#ifdef HAVE_EIGEN_FRANCIS
+#ifdef HAVE_GSL_EIGEN_FRANCIS
 static VALUE rb_gsl_eigen_francis_alloc(VALUE klass)
 {
   gsl_eigen_francis_workspace *w = NULL;
@@ -1571,7 +1571,7 @@ static VALUE rb_gsl_eigen_gensymm(int argc, VALUE *argv, VALUE obj)
 	gsl_vector *eval = NULL;
 	gsl_eigen_gensymm_workspace *w = NULL;
 	int flag;
-	VALUE veval = NULL;
+	VALUE veval = Qnil;
 	flag = check_argv_gensymm(argc, argv, obj, &A, &B, &eval, &w);
   Atmp = make_matrix_clone(A);
 //  Btmp = make_matrix_clone(B);  
@@ -1606,7 +1606,7 @@ static VALUE rb_gsl_eigen_gensymmv(int argc, VALUE *argv, VALUE obj)
 	gsl_matrix *evec = NULL;
 	gsl_eigen_gensymmv_workspace *w = NULL;
 	int flag;
-	VALUE veval = NULL, vevec = NULL;
+	VALUE veval = Qnil, vevec = Qnil;
 	flag = check_argv_gensymmv(argc, argv, obj, &A, &B, &eval, &evec, &w);
   Atmp = make_matrix_clone(A);
 //  Btmp = make_matrix_clone(B);  	
@@ -1645,7 +1645,7 @@ static VALUE rb_gsl_eigen_genherm(int argc, VALUE *argv, VALUE obj)
 	gsl_vector *eval = NULL;
 	gsl_eigen_genherm_workspace *w = NULL;
 	int flag;
-	VALUE veval = NULL;
+	VALUE veval = Qnil;
 	flag = check_argv_genherm(argc, argv, obj, &A, &B, &eval, &w);
   Atmp = make_matrix_complex_clone(A);
   Btmp = make_matrix_complex_clone(B);  
@@ -1680,7 +1680,7 @@ static VALUE rb_gsl_eigen_genhermv(int argc, VALUE *argv, VALUE obj)
 	gsl_matrix_complex *evec = NULL;
 	gsl_eigen_genhermv_workspace *w = NULL;
 	int flag;
-	VALUE veval = NULL, vevec = NULL;
+	VALUE veval = Qnil, vevec = Qnil;
 	flag = check_argv_genhermv(argc, argv, obj, &A, &B, &eval, &evec, &w);
   Atmp = make_matrix_complex_clone(A);
   Btmp = make_matrix_complex_clone(B);  	
@@ -1833,7 +1833,7 @@ static VALUE rb_gsl_eigen_gen(int argc, VALUE *argv, VALUE obj)
 	gsl_vector *beta = NULL;
 	gsl_eigen_gen_workspace *w = NULL;
 	int flag;
-	VALUE valpha = NULL, vbeta = NULL;
+	VALUE valpha = Qnil, vbeta = Qnil;
 	flag = check_argv_gen(argc, argv, obj, &A, &B, &alpha, &beta, &w);
 //  Atmp = make_matrix_clone(A);
 //  Btmp = make_matrix_clone(B);  	
@@ -1874,7 +1874,7 @@ static VALUE rb_gsl_eigen_gen_QZ(int argc, VALUE *argv, VALUE obj)
 	gsl_matrix *Q, *Z;
 	gsl_eigen_gen_workspace *w = NULL;
 	int flag;
-	VALUE valpha = NULL, vbeta = NULL, vQ, vZ;
+	VALUE valpha = Qnil, vbeta = Qnil, vQ, vZ;
 	flag = check_argv_gen(argc, argv, obj, &A, &B, &alpha, &beta, &w);
 /*  Atmp = make_matrix_clone(A);
   Btmp = make_matrix_clone(B);  	*/
@@ -1987,7 +1987,7 @@ static VALUE rb_gsl_eigen_genv(int argc, VALUE *argv, VALUE obj)
 	gsl_matrix_complex *evec = NULL;
 	gsl_eigen_genv_workspace *w = NULL;
 	int flag;
-	VALUE valpha = NULL, vbeta = NULL, vevec = NULL;
+	VALUE valpha = Qnil, vbeta = Qnil, vevec = Qnil;
 	flag = check_argv_genv(argc, argv, obj, &A, &B, &alpha, &beta, &evec, &w);
 //  Atmp = make_matrix_clone(A);
 //  Btmp = make_matrix_clone(B);  	
@@ -2035,7 +2035,7 @@ static VALUE rb_gsl_eigen_genv_QZ(int argc, VALUE *argv, VALUE obj)
 	gsl_matrix *Q, *Z;
 	gsl_eigen_genv_workspace *w = NULL;
 	int flag;
-	VALUE valpha = NULL, vbeta = NULL, vevec = NULL, vQ, vZ;
+	VALUE valpha = Qnil, vbeta = Qnil, vevec = Qnil, vQ, vZ;
 	flag = check_argv_genv(argc, argv, obj, &A, &B, &alpha, &beta, &evec, &w);
 /*  Atmp = make_matrix_clone(A);
   Btmp = make_matrix_clone(B);  	*/
@@ -2121,7 +2121,7 @@ void Init_gsl_eigen(VALUE module)
   VALUE mgsl_eigen_symmv;
   VALUE mgsl_eigen_herm;
   VALUE mgsl_eigen_hermv;
-#ifdef HAVE_EIGEN_FRANCIS
+#ifdef HAVE_GSL_EIGEN_FRANCIS
   VALUE mgsl_eigen_francis;
 #endif
 #ifdef GSL_1_9_LATER
@@ -2211,7 +2211,7 @@ void Init_gsl_eigen(VALUE module)
   rb_define_module_function(mgsl_eigen_hermv, "sort", 
 			     rb_gsl_eigen_hermv_sort, -1);
 
-#ifdef HAVE_EIGEN_FRANCIS
+#ifdef HAVE_GSL_EIGEN_FRANCIS
   mgsl_eigen_francis = rb_define_module_under(mgsl_eigen, "francis");
   cgsl_eigen_francis_workspace = rb_define_class_under(mgsl_eigen_francis, 
 						    "Workspace", cGSL_Object);

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

@@ -8,11 +8,11 @@
   This library is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY.
 */
-#include "rb_gsl.h"
+#include "include/rb_gsl.h"
 #include <gsl/gsl_errno.h>
-#include "rb_gsl_array.h"
-#include "rb_gsl_common.h"
-#include "rb_gsl_function.h"
+#include "include/rb_gsl_array.h"
+#include "include/rb_gsl_common.h"
+#include "include/rb_gsl_function.h"
 
 static VALUE eHandler;
 static VALUE cgsl_error[35];
@@ -48,7 +48,7 @@ static void rb_gsl_my_error_handler(const char *reason, const char *file,
 static VALUE rb_gsl_set_error_handler(int argc, VALUE *argv, VALUE module)
 {
   if (rb_block_given_p()) {
-    eHandler = RB_GSL_MAKE_PROC;
+    eHandler = rb_block_proc();
     gsl_set_error_handler(&rb_gsl_my_error_handler);
     return Qtrue;
   }

data/ext/gsl/extconf.rb

@@ -0,0 +1,121 @@
+require 'mkmf'
+
+def gsl_config_arg(arg)
+  yield arg_config("--with-gsl-#{arg}") {
+    sh = 'sh ' if RUBY_PLATFORM =~ /mingw/
+    IO.popen("#{sh}gsl-config --#{arg}") { |f| f.gets.chomp }
+  }, lambda { |val| puts "checking gsl #{arg}... #{val}"; val }
+rescue => err
+  abort "*** ERROR: missing required library to compile this module: #{err}"
+end
+
+def gsl_def(const, value = nil)
+  $defs << "-D#{const}#{"=#{value}" if value}"
+end
+
+def gsl_have_header(library, header)
+  have_library(library) if have_header(header)
+end
+
+def gsl_have_library(func)
+  have_func(func) if have_library('gsl', func)
+end
+
+def gsl_dir_config(target)
+  dir_config(target, $sitearchdir, $sitearchdir)
+end
+
+$CFLAGS += ' -Wall -Iinclude'
+
+gsl_config_arg(:version) { |version, check|
+  gsl_def(:GSL_VERSION, check[version])
+
+  ver = version.split('.').map { |x| x.to_i }
+
+  later = lambda { |other|
+    ary = other.split('.').map { |x| x.to_i }
+
+    gte = ver[0] > ary[0] ? true  :
+          ver[0] < ary[0] ? false :
+          ver[1] > ary[1] ? true  :
+          ver[1] < ary[1] ? false :
+          ver.size < ary.size ? false :
+          ver.size == 3 && ary.size == 3 ? ver[2] >= ary[2] : true
+
+    ary.pop && ary[-1] += 1 if ary.last == 90
+
+    gte && gsl_def("GSL_#{ary.join('_')}_LATER")
+  }
+
+  raise 'Ruby/GSL requires gsl-0.9.4 or later.' unless later['0.9.4']
+
+  gsl_def(:GSL_1_4_9_LATER) if later['1.4.90']
+
+  %w[
+    1.0 1.1 1.1.1 1.2 1.3 1.4 1.5.90 1.7.90
+    1.8.90 1.9.90 1.11 1.12.90 1.14 1.15
+  ].each { |v| later[v] }
+}
+
+gsl_config_arg(:cflags) { |cflags, check|
+  $CFLAGS += ' ' + check[cflags]
+}
+
+gsl_config_arg(:libs) { |libs, check|
+  libs.tr!(File::PATH_SEPARATOR, ' ')
+
+  if enable_config('atlas')
+    dir_config('cblas')
+    dir_config('atlas')
+
+    if have_library('cblas') && have_library('atlas')
+      libs.gsub!('-lgslcblas', '-lcblas -latlas')
+    end
+  end
+
+  $LOCAL_LIBS += ' ' + check[libs]
+}
+
+have_header('ruby/io.h')
+have_func('round')
+
+%w[alf qrngextra rngextra tensor].each { |library|
+  gsl_have_header(library, "#{library}/#{library}.h")
+}
+
+gsl_have_header('bundle_method', 'gsl/gsl_multimin_fsdf.h')
+gsl_have_header('cqp',           'gsl/gsl_cqp.h')
+gsl_have_header('jacobi',        'jacobi.h')
+gsl_have_header('ndlinear',      'ndlinear/gsl_multifit_ndlinear.h')
+gsl_have_header('ool',           'ool/ool_version.h')
+
+gsl_have_library('gsl_eigen_francis')
+gsl_have_library('gsl_poly_solve_quartic')
+
+gsl_def(:HAVE_GNU_GRAPH) if find_executable('graph')
+
+narray = gsl_dir_config('narray')
+
+begin
+  require 'rubygems'
+
+  if spec = Gem::Specification.find_by_path('narray.h')
+    $LOCAL_LIBS = "-L#{File.join(narray = spec.full_gem_path, 'src')} " + $LOCAL_LIBS
+    $CPPFLAGS   = "-I#{File.join(narray, spec.require_path)} "          + $CPPFLAGS
+
+    $LOCAL_LIBS += ' -l:narray.so' if RUBY_PLATFORM.include?('linux')
+  end
+rescue LoadError
+end
+
+have_header('narray.h')
+have_library('narray') if narray && RUBY_PLATFORM =~ /cygwin|mingw/
+
+if !arg_config('--disable-tamu-anova') && gsl_dir_config('tamu_anova')
+  gsl_have_header('tamuanova', 'tamu_anova/tamu_anova.h')
+end
+
+$objs = Dir["#{File.dirname(__FILE__)}/*.c"].map { |f| File.basename(f, '.c') << '.o' }.
+  sort - %w[block matrix poly tensor vector].map { |f| "#{f}_source.o" }
+
+create_makefile('gsl/gsl_native')

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

@@ -22,8 +22,6 @@
  *
  */
 
-#include "rb_gsl_config.h"
-
 #ifndef GSL_1_3_LATER
 
 #include <config.h>

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

@@ -9,8 +9,7 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl_config.h"
-#include "rb_gsl_fft.h"
+#include "include/rb_gsl_fft.h"
 
 VALUE mgsl_fft;
 VALUE cgsl_fft_wavetable;

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

@@ -9,8 +9,7 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl_config.h"
-#include "rb_gsl_fit.h"
+#include "include/rb_gsl_fit.h"
 
 /* linear fit without weights: y = c0 + c1 x */
 /* This returns 7 elements array */

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

@@ -11,8 +11,8 @@
 					2006/Dec/24 Y. TSUNESADA
 */
 #include <math.h>
-#include "rb_gsl.h"
-#include "rb_gsl_sf.h"
+#include "include/rb_gsl.h"
+#include "include/rb_gsl_sf.h"
 
 static const double sqrt_pi_2   = 1.2533141373155002512078826424; /* sqrt(pi/2) */
 static const double sqrt_2_pi   = 0.7978845608028653558798921199; /* sqrt(2/pi) */

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

@@ -8,8 +8,8 @@
   This library is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY.
 */
-#include "rb_gsl_config.h"
-#include "rb_gsl_function.h"
+
+#include "include/rb_gsl_function.h"
 #ifdef HAVE_NARRAY_H
 #include "narray.h"
 #endif
@@ -56,7 +56,7 @@ static VALUE rb_gsl_function_set_f(int argc, VALUE *argv, VALUE obj)
     rb_ary_store(ary, 1, ary2);
     break;
   }
-  if (rb_block_given_p()) rb_ary_store(ary, 0, RB_GSL_MAKE_PROC);
+  if (rb_block_given_p()) rb_ary_store(ary, 0, rb_block_proc());
   return obj;
 }
 

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

@@ -1,4 +1,4 @@
-#include "rb_gsl.h"
+#include "include/rb_gsl.h"
 
 /*!
   Counter-clockwise rotation around the X-axis 

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

@@ -8,8 +8,8 @@
   This library is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY.
 */
-#include "rb_gsl_config.h"
-#include "rb_gsl_graph.h"
+
+#include "include/rb_gsl_graph.h"
 
 void make_graphcommand(char *command, VALUE hash)
 {

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

@@ -9,7 +9,7 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl.h"
+#include "include/rb_gsl.h"
 #include <gsl/gsl_machine.h>
 
 ID rb_gsl_id_beg, rb_gsl_id_end, rb_gsl_id_excl, rb_gsl_id_to_a;
@@ -46,11 +46,7 @@ static VALUE rb_gsl_object_info(VALUE obj)
   char buf[256];
   VALUE s;
   sprintf(buf, "Class:      %s\n", rb_class2name(CLASS_OF(obj)));
-#ifdef RUBY_1_9_LATER
   sprintf(buf, "%sSuperClass: %s\n", buf, rb_class2name(RCLASS_SUPER(CLASS_OF(obj))));
-#else
-  sprintf(buf, "%sSuperClass: %s\n", buf, rb_class2name(RCLASS(CLASS_OF(obj))->super));
-#endif
   s = rb_rescue(rb_gsl_call_name, obj, rb_gsl_call_rescue, obj);
   if (s) sprintf(buf, "%sType:       %s\n", buf, STR2CSTR(s));
   s = rb_rescue(rb_gsl_call_size, obj, rb_gsl_call_rescue, obj);
@@ -64,7 +60,7 @@ static VALUE rb_gsl_not_implemeted(VALUE obj)
   return Qnil;
 }
 
-void Init_rb_gsl()
+void Init_gsl_native()
 {
   VALUE mgsl;
 
@@ -217,10 +213,6 @@ static void rb_gsl_define_const(VALUE module)
   rb_define_const(module, "VERSION", rb_str_new2(GSL_VERSION));
   rb_define_const(module, "GSL_VERSION", rb_str_new2(GSL_VERSION));
 #endif
-#ifdef RUBY_GSL_VERSION
-  rb_define_const(module, "RUBY_GSL_VERSION", rb_str_new2(RUBY_GSL_VERSION));
-  rb_define_const(module, "RB_GSL_VERSION", rb_str_new2(RUBY_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));

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

@@ -5,11 +5,10 @@
   Modified by Seiya Nishizawa        14/Apr/2004
  */
 
-#include "rb_gsl_config.h"
 #ifdef HAVE_NARRAY_H
-#include "rb_gsl_array.h"
+#include "include/rb_gsl_array.h"
 #include "narray.h"
-#include "rb_gsl_with_narray.h"
+#include "include/rb_gsl_with_narray.h"
 
 static VALUE rb_gsl_na_to_gsl_matrix_method(VALUE nna);
 static VALUE rb_gsl_na_to_gsl_matrix_int_method(VALUE nna);

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

@@ -9,9 +9,8 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl_config.h"
-#include "rb_gsl_histogram.h"
-#include "rb_gsl_array.h"
+#include "include/rb_gsl_histogram.h"
+#include "include/rb_gsl_array.h"
 #include <gsl/gsl_fit.h>
 #include <gsl/gsl_multifit_nlin.h>
 #include <gsl/gsl_blas.h>
@@ -114,7 +113,7 @@ static VALUE rb_gsl_histogram_alloc_from_file(VALUE klass, VALUE name)
   size_t n, i;
   FILE *fp = NULL;
   double upper;
-  strcpy(filename, STR2CHARPTR(name));
+  strcpy(filename, StringValuePtr(name));
   sprintf(buf, "wc %s", filename);
   fp = popen(buf, "r");
   if (fp == NULL) rb_raise(rb_eIOError, "popen failed.");