narray 0.6.0.4 → 0.6.0.5

data/src/ChangeLog

@@ -1,3 +1,11 @@
+2013-01-30  Masahiro TANAKA  <masa16.tanaka@gmail.com>
+
+	* narray.c (na_check_class_narray):
+	  use Module#<= instead of rb_mod_ancestors
+	* na_random.c, na_linalg.c:
+	  avoid warnings of signed <=> unsigned comparison
+	* ver 0.6.0.5
+
 2012-12-07 geoffyoungs
 
 	* narray.c (na_check_class_narray):

data/src/na_linalg.c

@@ -575,7 +575,7 @@ void Init_na_linalg()
 
   for (i=1;i<NA_NTYPES;++i) {
     sz = na_funcset[i].elmsz = na_sizeof[i];
-    sz = (sz>sizeof(int)) ? sz : sizeof(int);
+    sz = (sz>((int)sizeof(int))) ? sz : (int)sizeof(int);
     SetFuncs[i][NA_LINT](1, a,0, &one, 0);
     na_funcset[i].one = a;
     a += sz;

data/src/na_random.c

@@ -217,19 +217,22 @@ static int n_bits(int32_t a)
   return xl;
 }
 
-static int32_t size_check(double rmax, double limit)
+// max&limit must be integer
+static u_int32_t size_check(double rmax, double limit)
 {
+  u_int32_t max;
+
   if ( rmax == 0 ) {
-    return (int32_t)(limit-1);
+    return (u_int32_t)(limit-1);
   }
   if ( rmax < 0 ) {
     rmax = -rmax;
   }
-  rmax -= 1;
-  if ( rmax >= limit ) {
-    rb_raise(rb_eArgError, "rand-max(%.0f) must be <= %.0f", rmax+1, limit);
+  max = (u_int32_t)(rmax - 1);
+  if ( max >= limit ) {
+    rb_raise(rb_eArgError, "rand-max(%.0f) must be <= %.0f", rmax, limit);
   }
-  return (int32_t)rmax;
+  return max;
 }
 
 static void TpErr(void) {
@@ -268,7 +271,7 @@ static void RndB(int n, char *p1, int i1, double rmax)
 static void RndI(int n, char *p1, int i1, double rmax)
 {
   u_int32_t y;
-  int16_t max;
+  u_int16_t max;
   int shift, sign=1;
 
   if ( rmax < 0 ) { rmax = -rmax; sign = -1; }
@@ -295,7 +298,7 @@ static void RndI(int n, char *p1, int i1, double rmax)
 static void RndL(int n, char *p1, int i1, double rmax)
 {
   u_int32_t y;
-  int32_t max;
+  u_int32_t max;
   int shift, sign=1;
 
   if ( rmax < 0 ) { rmax = -rmax; sign = -1; }

data/src/narray.c

@@ -182,7 +182,9 @@ static void
     rb_raise(rb_eRuntimeError, "class required");
   }
 
-  if(RTEST(rb_ary_includes(rb_mod_ancestors(v), cNArray)))
+  if (v == cNArray)
+    return;
+  if (RTEST(rb_funcall(v, rb_intern("<="), 1, cNArray)))
     return;
 
   rb_raise(rb_eRuntimeError, "need NArray or its subclass");
@@ -741,10 +743,6 @@ static VALUE
 static VALUE
  na_s_to_na(int argc, VALUE *argv, VALUE klass)
 {
-  static int shape=1;
-  VALUE v;
-  struct NARRAY *ary;
-
   if (argc < 1) {
     rb_raise(rb_eArgError, "Argument is required");
   }
@@ -795,8 +793,8 @@ static VALUE
   int i;
   char buf[256];
   const char *classname;
-  char *ref = "%s(ref).%s(%i";
-  char *org = "%s.%s(%i";
+  const char *ref = "%s(ref).%s(%i";
+  const char *org = "%s.%s(%i";
 
   GetNArray(self,ary);
   classname = rb_class2name(CLASS_OF(self));

data/src/narray.h

@@ -23,8 +23,8 @@
 # include <sys/types.h>
 #endif
 
-#define NARRAY_VERSION "0.6.0.4"
-#define NARRAY_VERSION_CODE 604
+#define NARRAY_VERSION "0.6.0.5"
+#define NARRAY_VERSION_CODE 605
 
 /*
   Data types used in NArray :

metadata

@@ -1,27 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: narray
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.0.5
   prerelease: 
-  version: 0.6.0.4
 platform: ruby
-authors: 
+authors:
 - Masahiro Tanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-29 00:00:00 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies: []
-
 description: Numerical N-dimensional Array class
 email: masa16.tanaka@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - src/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - src/ChangeLog
 - src/MANIFEST
 - src/README.en
@@ -45,31 +41,28 @@ files:
 - src/lib/narray_ext.rb
 - src/lib/nmatrix.rb
 homepage: http://narray.rubyforge.org/
-licenses: 
+licenses:
 - Ruby
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - .
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: narray
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: N-dimensional Numerical Array class for Ruby
 test_files: []
-