gsl 1.14.7 → 1.15.3

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/rdoctask'
 
 RB_GSL_VERSION = File.readlines('VERSION')[0].chomp
@@ -33,7 +33,8 @@ spec = Gem::Specification.new do |s|
     'THANKS',
     'VERSION',
     'examples/**/*',
-    'ext/*',
+    'ext/extconf.rb',
+    'ext/*.c',
     'lib/**/*',
     'include/*',
     'rdoc/*',
@@ -69,7 +70,7 @@ Rake::PackageTask.new('rb-gsl', RB_GSL_VERSION) do |pkg|
   pkg.package_files = spec.files
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.need_zip = false
   pkg.need_tar = false
 end

data/VERSION

@@ -1 +1 @@
-1.14.7
+1.15.3

data/ext/array.c

@@ -169,21 +169,6 @@ void cvector_set_from_carray(gsl_vector *v, const double *a)
   for (i = 0; i < v->size; i++) gsl_vector_set(v, i, a[i]);
 }
 
-void cvector_set_from_rarrays(gsl_vector *v, VALUE ary)
-{
-  if (CLASS_OF(ary) == rb_cRange) ary = rb_gsl_range2ary(ary);
-  if (TYPE(ary) == T_ARRAY) {
-    return cvector_set_from_rarray(v, ary);
-#ifdef HAVE_NARRAY_H
-  } else if (NA_IsNArray(ary)) {
-    return cvector_set_from_narray(v, ary);
-#endif
-  } else {
-    rb_raise(rb_eTypeError,
-	     "wrong argument type %s", rb_class2name(CLASS_OF(ary)));
-  }
-}
-
 void carray_set_from_cvector(double *a, const gsl_vector *v)
 {
   size_t i;
@@ -255,15 +240,6 @@ gsl_vector* make_cvector_from_narray(VALUE ary)
   return v;
 }
 
-void cvector_set_from_narray(gsl_vector *v, VALUE ary)
-{
-  int size;
-  if (!NA_IsNArray(ary))
-    rb_raise(rb_eTypeError,
-             "wrong argument type %s", rb_class2name(CLASS_OF(ary)));
-  size = NA_TOTAL(ary);
-  carray_set_from_narray(v->data, ary);
-}
 #endif
 
 gsl_vector_complex* make_vector_complex_clone(const gsl_vector_complex *v)

data/ext/array_complex.c

@@ -30,29 +30,30 @@ static VALUE rb_gsl_complex_arithmetics5(int flag, VALUE obj, VALUE bb)
   gsl_vector *v = NULL;
   gsl_vector_complex *cv = NULL, *cvnew = NULL;
   gsl_complex (*func1)(gsl_complex, gsl_complex);
-  int (*func2)(gsl_matrix_complex*, const gsl_matrix_complex*);
-  int (*func3)(gsl_matrix_complex*, const gsl_complex);
+  // local variables "func2" iand "func3" declared and set, but never used
+  //int (*func2)(gsl_matrix_complex*, const gsl_matrix_complex*);
+  //int (*func3)(gsl_matrix_complex*, const gsl_complex);
   int flagcm = 0;
   switch (flag) {
   case GSL_COMPLEX_ADD:
     func1 = gsl_complex_add;
-    func2 = gsl_matrix_complex_add;
-    func3 = gsl_matrix_complex_add_constant;
+    //func2 = gsl_matrix_complex_add;
+    //func3 = gsl_matrix_complex_add_constant;
     break;
   case GSL_COMPLEX_SUB:
     func1 = gsl_complex_sub;
-    func2 = gsl_matrix_complex_sub;
-    func3 = gsl_matrix_complex_add_constant;
+    //func2 = gsl_matrix_complex_sub;
+    //func3 = gsl_matrix_complex_add_constant;
     break;
   case GSL_COMPLEX_MUL:
     func1 = gsl_complex_mul;
-    func2 = gsl_matrix_complex_mul_elements;
-    func3 = gsl_matrix_complex_scale;
+    //func2 = gsl_matrix_complex_mul_elements;
+    //func3 = gsl_matrix_complex_scale;
     break;
   case GSL_COMPLEX_DIV:
     func1 = gsl_complex_div;
-    func2 = gsl_matrix_complex_div_elements;
-    func3 = gsl_matrix_complex_scale;
+    //func2 = gsl_matrix_complex_div_elements;
+    //func3 = gsl_matrix_complex_scale;
     break;
   default:
     rb_raise(rb_eRuntimeError, "undefined operation");

data/ext/blas1.c

@@ -116,32 +116,35 @@ static int get_vector_complex2(int argc, VALUE *argv, VALUE obj,
 static VALUE rb_gsl_blas_ddot(int argc, VALUE *argv, VALUE obj)
 {
   double r;
-  int status;
+  // local variable "status" declared and set, but never used
+  //int status;
   gsl_vector *x = NULL, *y = NULL;
   get_vector2(argc, argv, obj, &x, &y);
-  status = gsl_blas_ddot(x, y, &r);
+  /*status =*/ gsl_blas_ddot(x, y, &r);
   return rb_float_new(r);
 }
 
 static VALUE rb_gsl_blas_zdotu(int argc, VALUE *argv, VALUE obj)
 {
   gsl_complex *r;
-  int status;
+  // local variable "status" declared and set, but never used
+  //int status;
   gsl_vector_complex *x = NULL, *y = NULL;
   get_vector_complex2(argc, argv, obj, &x, &y);
   r = ALLOC(gsl_complex);
-  status = gsl_blas_zdotu(x, y, r);
+  /*status =*/ gsl_blas_zdotu(x, y, r);
   return Data_Wrap_Struct(cgsl_complex, 0, free, r);
 }
 
 static VALUE rb_gsl_blas_zdotc(int argc, VALUE *argv, VALUE obj)
 {
   gsl_complex *r;
-  int status;
+  // local variable "status" declared and set, but never used
+  //int status;
   gsl_vector_complex *x = NULL, *y = NULL;
   get_vector_complex2(argc, argv, obj, &x, &y);
   r = ALLOC(gsl_complex);
-  status = gsl_blas_zdotc(x, y, r);
+  /*status =*/ gsl_blas_zdotc(x, y, r);
   return Data_Wrap_Struct(cgsl_complex, 0, free, r);
 }
 

data/ext/block_source.c

@@ -547,7 +547,8 @@ static VALUE FUNCTION(rb_gsl_block,compare)(VALUE aa, VALUE bb,
   GSL_TYPE(gsl_block) *a, *b;
   /*  gsl_block_int *c;*/
   gsl_block_uchar *c;
-  int status;
+  // local variable "status" declared and set, but never used
+  //int status;
   Data_Get_Struct(aa, GSL_TYPE(gsl_block), a);
   c = gsl_block_uchar_alloc(a->size);
   if (BL_P(bb)) {
@@ -555,9 +556,9 @@ static VALUE FUNCTION(rb_gsl_block,compare)(VALUE aa, VALUE bb,
     if (a->size != b->size) 
       rb_raise(rb_eRuntimeError, "Block size mismatch, %d and %d", (int) a->size, 
 	       (int) b->size);
-    status = (*cmp)(a, b, c);
+    /*status =*/ (*cmp)(a, b, c);
   } else {
-    status = (*cmp2)(a, NUMCONV(bb), c);
+    /*status =*/ (*cmp2)(a, NUMCONV(bb), c);
   }
   return Data_Wrap_Struct(cgsl_block_uchar, 0, gsl_block_uchar_free, c);
 }

data/ext/dirac.c

@@ -33,9 +33,6 @@ static VALUE rb_dirac_commute(VALUE obj, VALUE mm1, VALUE mm2)
 {
   gsl_matrix_complex *m1, *m2;
   gsl_matrix_complex *mnew1, *mnew2;
-  gsl_complex z, z2;
-  z.dat[0] = 1; z.dat[1] = 0;
-  z2.dat[0] = 0; z2.dat[1] = 0;
   CHECK_MATRIX_COMPLEX(mm1);
   CHECK_MATRIX_COMPLEX(mm2);
   Data_Get_Struct(mm1, gsl_matrix_complex, m1);
@@ -54,9 +51,6 @@ static VALUE rb_dirac_anticommute(VALUE obj, VALUE mm1, VALUE mm2)
 {
   gsl_matrix_complex *m1, *m2;
   gsl_matrix_complex *mnew1, *mnew2;
-  gsl_complex z, z2;
-  z.dat[0] = 1; z.dat[1] = 0;
-  z2.dat[0] = 0; z2.dat[1] = 0;
   CHECK_MATRIX_COMPLEX(mm1);
   CHECK_MATRIX_COMPLEX(mm2);
   Data_Get_Struct(mm1, gsl_matrix_complex, m1);

data/ext/error.c

@@ -38,12 +38,11 @@ static void rb_gsl_my_error_handler(const char *reason, const char *file,
 {
   VALUE vreason, vfile;
   VALUE vline, verrno;
-  VALUE result;
   vreason = rb_str_new2(reason);
   vfile = rb_str_new2(file);
   vline = INT2FIX(line);
   verrno = INT2FIX(gsl_errno);
-  result = rb_funcall(eHandler, RBGSL_ID_call, 4, vreason, vfile, vline, verrno);
+  rb_funcall(eHandler, RBGSL_ID_call, 4, vreason, vfile, vline, verrno);
 }
 
 static VALUE rb_gsl_set_error_handler(int argc, VALUE *argv, VALUE module)

data/ext/extconf.rb

@@ -126,14 +126,19 @@ def check_version(configfile)
 
     if ver >= "1.14"
       configfile.printf("#ifndef GSL_1_14_LATER\n#define GSL_1_14_LATER\n#endif\n")
-    end    
-    
+    end
+
+    if ver >= "1.15"
+      configfile.printf("#ifndef GSL_1_15_LATER\n#define GSL_1_15_LATER\n#endif\n")
+    end
+
   end
 end
 
 #####
 
-$CFLAGS = " -Wall -I../include "
+$CFLAGS ||= ''
+$CFLAGS += " -Wall -I../include "
 
 begin
   RB_GSL_CONFIG = File.open("../include/rb_gsl_config.h", "w")
@@ -242,7 +247,7 @@ narray_config = dir_config('narray',$sitearchdir,$sitearchdir)
 # Try to find narray with RubyGems
 begin
   require 'rubygems'
-  na_gemspec=Gem.searcher.find('narray.h')
+  na_gemspec=Gem::Specification.find_by_path('narray.h')
   if na_gemspec
     narray_config = File.join(na_gemspec.full_gem_path, na_gemspec.require_path)
     $CPPFLAGS = " -I#{narray_config} "+$CPPFLAGS

data/ext/fft.c

@@ -463,7 +463,9 @@ static VALUE rb_fft_complex_trans(int argc, VALUE *argv, VALUE obj,
 						   gsl_fft_complex_workspace *),
 				  int sss)
 {
-  int flag = 0, status;
+  int flag = 0;
+  // local variable "status" was defined and set, but never used
+  //int status;
   size_t stride, n;
   gsl_complex_packed_array data;
   gsl_vector_complex *vin, *vout;
@@ -473,11 +475,11 @@ static VALUE rb_fft_complex_trans(int argc, VALUE *argv, VALUE obj,
   if (sss == RB_GSL_FFT_COPY) {
     vout = gsl_vector_complex_alloc(n);
     gsl_vector_complex_memcpy(vout, vin);
-    status = (*transform)(vout->data, vout->stride /*1*/, vout->size /*n*/, table, space);
+    /*status =*/ (*transform)(vout->data, vout->stride /*1*/, vout->size /*n*/, table, space);
     gsl_fft_free(flag, (GSL_FFT_Wavetable *) table, (GSL_FFT_Workspace *) space);
     return Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, vout);
   } else {    /* in-place */
-    status = (*transform)(data, stride, n, table, space);
+    /*status =*/ (*transform)(data, stride, n, table, space);
     gsl_fft_free(flag, (GSL_FFT_Wavetable *) table, (GSL_FFT_Workspace *) space);
     return obj;
   }
@@ -497,7 +499,9 @@ static VALUE rb_gsl_fft_complex_forward2(int argc, VALUE *argv, VALUE obj)
 
 static VALUE rb_gsl_fft_complex_transform(int argc, VALUE *argv, VALUE obj)
 {
-  int flag = 0, status;
+  int flag = 0;
+  // local variable "status" was defined and set, but never used
+  //int status;
   size_t stride, n;
   gsl_vector_complex *vin, *vout;
   gsl_fft_direction sign;
@@ -509,7 +513,7 @@ static VALUE rb_gsl_fft_complex_transform(int argc, VALUE *argv, VALUE obj)
   flag = gsl_fft_get_argv_complex(argc-1, argv, obj, &vin, &data, &stride, &n, &table, &space);
   vout = gsl_vector_complex_alloc(n);
   gsl_vector_complex_memcpy(vout, vin);
-  status = gsl_fft_complex_transform(vout->data, stride, n, table, space, sign);
+  /*status =*/ gsl_fft_complex_transform(vout->data, stride, n, table, space, sign);
   gsl_fft_free(flag, (GSL_FFT_Wavetable *) table, (GSL_FFT_Workspace *) space);
   return Data_Wrap_Struct(cgsl_vector_complex, 0, gsl_vector_complex_free, vout);
 }
@@ -517,7 +521,9 @@ static VALUE rb_gsl_fft_complex_transform(int argc, VALUE *argv, VALUE obj)
 /* in-place */
 static VALUE rb_gsl_fft_complex_transform2(int argc, VALUE *argv, VALUE obj)
 {
-  int flag = 0, status;
+  int flag = 0;
+  // local variable "status" was defined and set, but never used
+  //int status;
   size_t stride, n;
   gsl_fft_direction sign;
   gsl_complex_packed_array data;
@@ -526,7 +532,7 @@ static VALUE rb_gsl_fft_complex_transform2(int argc, VALUE *argv, VALUE obj)
   CHECK_FIXNUM(argv[argc-1]);
   sign = FIX2INT(argv[argc-1]);
   flag = gsl_fft_get_argv_complex(argc-1, argv, obj, NULL, &data, &stride, &n, &table, &space);
-  status = gsl_fft_complex_transform(data, stride, n, table, space, sign);
+  /*status =*/ gsl_fft_complex_transform(data, stride, n, table, space, sign);
   gsl_fft_free(flag, (GSL_FFT_Wavetable *) table, (GSL_FFT_Workspace *) space);
   return obj;
 }
@@ -666,7 +672,9 @@ static VALUE rb_fft_real_trans(int argc, VALUE *argv, VALUE obj,
 					    gsl_fft_real_workspace *),
 			       int sss)
 {
-  int flag = 0, status, naflag = 0;
+  int flag = 0, naflag = 0;
+  // local variable "status" was defined and set, but never used
+  //int status;
   size_t stride, n;
   gsl_vector *vnew;
   gsl_vector_view vv;
@@ -708,9 +716,9 @@ static VALUE rb_fft_real_trans(int argc, VALUE *argv, VALUE obj,
   } else {
     rb_raise(rb_eRuntimeError, "something wrong");
   }
-  status = (*trans)(ptr2, stride, n, table, space);
+  /*status =*/ (*trans)(ptr2, stride, n, table, space);
   gsl_fft_free(flag, (GSL_FFT_Wavetable *) table, (GSL_FFT_Workspace *) space);
-return ary;
+  return ary;
 }
 
 static VALUE rb_gsl_fft_real_transform(int argc, VALUE *argv, VALUE obj)
@@ -730,7 +738,9 @@ static VALUE rb_fft_halfcomplex_trans(int argc, VALUE *argv, VALUE obj,
 						   const gsl_fft_halfcomplex_wavetable *, gsl_fft_real_workspace *),
 				      int sss)
 {
-  int flag = 0, status, naflag = 0;
+  int flag = 0, naflag = 0;
+  // local variable "status" was defined and set, but never used
+  //int status;
   size_t stride, n;
   gsl_vector *vnew;
   gsl_vector_view vv;
@@ -773,7 +783,7 @@ static VALUE rb_fft_halfcomplex_trans(int argc, VALUE *argv, VALUE obj,
   } else {
     rb_raise(rb_eRuntimeError, "something wrong");
   }
-  status = (*trans)(ptr2, stride, n, table, space);
+  /*status =*/ (*trans)(ptr2, stride, n, table, space);
   gsl_fft_free(flag, (GSL_FFT_Wavetable *) table, (GSL_FFT_Workspace *) space);
   return ary;
 }

data/ext/function.c

@@ -485,13 +485,13 @@ static void rb_gsl_function_fdf_fdf(double x, void *p, double *f, double *df)
 
 void Init_gsl_function(VALUE module)
 {
-  VALUE cgsl_function_fdf2;
   RBGSL_ID_call = rb_intern("call");
   RBGSL_ID_arity = rb_intern("arity");
 
   cgsl_function = rb_define_class_under(module, "Function", cGSL_Object);
   cgsl_function_fdf = rb_define_class_under(module, "Function_fdf", cGSL_Object);
-  cgsl_function_fdf2 = rb_define_class_under(cgsl_function_fdf, "Fdf", cgsl_function_fdf);
+  // This Fdf class seems superfluous.  Should probably be deleted?
+  rb_define_class_under(cgsl_function_fdf, "Fdf", cgsl_function_fdf);
 
   /*  rb_define_singleton_method(cgsl_function, "new", rb_gsl_function_new, -1);*/
   rb_define_singleton_method(cgsl_function, "alloc", rb_gsl_function_alloc, -1);

data/ext/graph.c

@@ -971,6 +971,7 @@ static VALUE rb_gsl_graph_O(VALUE obj)
   return g->O;
 }
 
+#ifdef HAVE_GNU_GRAPH
 static void gsl_graph_set_command(gsl_graph *g, char *command)
 {
   char str[256];
@@ -1200,6 +1201,7 @@ static void gsl_graph_set_command(gsl_graph *g, char *command)
   if (g->O == Qtrue)
     sprintf(command, "%s -O", command);
 }
+#endif
 
 static VALUE rb_gsl_graph_graph(int argc, VALUE *argv, VALUE obj)
 {

data/ext/gsl_narray.c

@@ -31,8 +31,6 @@ 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;
-    struct NARRAY *na;
-    GetNArray(nary, na);
     for(i=0; i < v->size; i++) {
       (NA_PTR_TYPE(nary,double*))[i] = gsl_vector_get(v, i);
     }
@@ -52,8 +50,6 @@ 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;
-    struct NARRAY *na;
-    GetNArray(nary, na);
     for(i=0; i < 2*v->size; i++) {
       (NA_PTR_TYPE(nary,gsl_complex*))[i] = gsl_vector_complex_get(v, i);
     }
@@ -174,8 +170,6 @@ 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;
-    struct NARRAY *na;
-    GetNArray(nary, na);
     for(i=0; i < v->size; i++) {
       (NA_PTR_TYPE(nary,int*))[i] = gsl_vector_int_get(v, i);
     }
@@ -244,7 +238,7 @@ static VALUE rb_gsl_na_to_gsl_vector_method(VALUE na)
   return v;
 }
 
-static VALUE rb_gsl_na_to_gsl_vector_view_method(VALUE na)
+VALUE rb_gsl_na_to_gsl_vector_view_method(VALUE na)
 {
   VALUE v;
 

data/ext/histogram.c

@@ -1026,7 +1026,6 @@ struct fit_histogram {
 
 static VALUE rb_gsl_histogram_fit_exponential(int argc, VALUE *argv, VALUE obj)
 {
-  struct fit_histogram hh;
   gsl_histogram *h;
   gsl_vector *x, *lny, *w;
   size_t binstart = 0, binend, n, p = 2, dof, i;
@@ -1047,9 +1046,6 @@ static VALUE rb_gsl_histogram_fit_exponential(int argc, VALUE *argv, VALUE obj)
     rb_raise(rb_eArgError, "too many arguments (%d for 0 or 2)", argc);
     break;
   }
-  hh.h = h;
-  hh.binstart = binstart;
-  hh.binend = binend;
   n = binend - binstart + 1;
   dof = n - p;
   
@@ -1076,7 +1072,6 @@ static VALUE rb_gsl_histogram_fit_exponential(int argc, VALUE *argv, VALUE obj)
 
 static VALUE rb_gsl_histogram_fit_power(int argc, VALUE *argv, VALUE obj)
 {
-  struct fit_histogram hh;
   gsl_histogram *h;
   gsl_vector *lnx, *lny, *w;
   size_t binstart = 0, binend, n, p = 2, dof, i;
@@ -1097,9 +1092,6 @@ static VALUE rb_gsl_histogram_fit_power(int argc, VALUE *argv, VALUE obj)
     rb_raise(rb_eArgError, "too many arguments (%d for 0 or 2)", argc);
     break;
   }
-  hh.h = h;
-  hh.binstart = binstart;
-  hh.binend = binend;
   n = binend - binstart + 1;
   dof = n - p;