narray 0.6.0.1 → 0.6.0.3

data/src/ChangeLog

@@ -1,3 +1,18 @@
+2012-12-07 geoffyoungs
+
+	* narray.c (na_check_class_narray):
+	  Use ruby methods to check class ancestors,
+	  instead of m_tbl directly
+	* ver 0.6.0.2
+
+2012-09-20  Masahiro TANAKA  <masa16.tanaka@gmail.com>
+
+	* lib/narray_ext.rb (reverse,rot90): new method
+
+2012-09-01  ohai
+
+	* lib/narray_ext.rb: Change NMath#recip into a module function.
+
 2011-08-29  Masahiro TANAKA  <masa16.tanaka@gmail.com>
 
 	* narray.c (na_alloc_struct): check array size (zero/negative).

data/src/SPEC.en

@@ -86,6 +86,11 @@ Replacing Elements -- Same rule as slicing
     a[0..2,0..3]  = b[0..2,1]	Storing repetitively
 				( a[0,0]=b[0,1],..,a[0,3]=b[0,1] )
 
+Delete row/columns -- Complement of slice
+
+    self.delete_at(...)	  Arguments are the same as the [] and slice methods
+			  see https://github.com/masa16/narray/issues/5
+
 Filling values
     self.indgen!([start[,step]]) Generate index;
 				 Set values from 'start' with 'step' increment
@@ -196,6 +201,10 @@ Reference to another NArray
     self.reshape(size,...)	same as self.refer.reshape!
     self.newdim(dim,...)	same as self.refer.newdim!
 
+Reverse and Rotate
+    self.reverse([dim,...])	Reverse array at axes
+    self.rot90([k])		Rotate array by 90 degrees k times
+
 Type conversion
     self.floor      Return integer NArray whose elements processed 'floor'
     self.ceil

data/src/SPEC.ja

@@ -75,6 +75,11 @@
     a[0..2,0..3]  = b[0..2,1]	繰り返し代入。
 				( a[0,0]=b[0,1],..,a[0,3]=b[0,1] )
 
+行・列の削除 -- インデックス取り出しの逆
+
+    self.delete_at(...)	  引数はインデクス参照と同じ。
+			  参照: https://github.com/masa16/narray/issues/5
+
 値のセット。
     self.indgen!([start[,step]]) startからstepづつ増加した値をセット。
     self.fill!(value)		 すべての要素にvalueをセット。
@@ -181,6 +186,10 @@
     self.reshape(size,...)	self.refer.reshape! と同様。
     self.newdim(dim,...)	self.refer.newdim! と同様。
 
+反転・回転
+    self.reverse([dim,...])	指定した次元を逆順にする
+    self.rot90([k])		2次元配列の90度の回転をk回行う
+
 型変換
     self.floor selfより小さい最大の整数を返す。
     self.ceil  selfより大きい最小の整数を返す。

data/src/lib/narray_ext.rb

@@ -78,7 +78,7 @@ class NArray
       when Array
         x = (0...n).to_a
         x -= a.map do |j|
-          raise IndexError, "contains non-integer" unless Interger===j
+          raise IndexError, "contains non-integer" unless Integer===j
           (j<0) ? n+j : j
         end
       else
@@ -208,6 +208,42 @@ class NArray
     self
   end
 
+  def reverse(*ranks)
+    if self.rank==0
+      return self.dup
+    elsif ranks.size==0
+      idx = (0...self.rank).map{-1..0}
+    else
+      idx = [true]*self.rank
+      ranks.each do |i|
+        if !i.kind_of?(Integer)
+          raise ArgumentError, "Argument must be Integer"
+        end
+        if i >= self.rank
+          raise ArgumentError, "dimension(%s) out of range"%[i]
+        end
+        idx[i] = -1..0
+      end
+    end
+    self[*idx]
+  end
+
+  def rot90(n_times=1)
+    if self.rank < 2
+      raise "must be >= 2 dimensional array"
+    end
+    case n_times%4
+    when 0
+      self.dup
+    when 1
+      self.transpose(1,0).reverse(0)
+    when 2
+      self.reverse(0,1)
+    when 3
+      self.transpose(1,0).reverse(1)
+    end
+  end
+
   #SFloatOne = NArray.sfloat(1).fill!(1)
 end
 
@@ -272,6 +308,7 @@ module NMath
     ((x-xm)*(y-ym)).sum(*ranks) / (n-1)
   end
 
+  module_function :recip
   module_function :csc,:sec,:cot,:csch,:sech,:coth
   module_function :acsc,:asec,:acot,:acsch,:asech,:acoth
   module_function :covariance

data/src/narray.c

@@ -181,11 +181,10 @@ static void
   if (TYPE(v) != T_CLASS) {
     rb_raise(rb_eRuntimeError, "class required");
   }
-  while (v) {
-    if (v == cNArray || RCLASS(v)->m_tbl == RCLASS(cNArray)->m_tbl)
-      return;
-    v = RCLASS_SUPER(v);
-  }
+
+  if(RTEST(rb_ary_includes(rb_mod_ancestors(v), cNArray)))
+    return;
+
   rb_raise(rb_eRuntimeError, "need NArray or its subclass");
 }
 

data/src/narray.h

@@ -23,8 +23,8 @@
 # include <sys/types.h>
 #endif
 
-#define NARRAY_VERSION "0.6.0.1"
-#define NARRAY_VERSION_CODE 601
+#define NARRAY_VERSION "0.6.0.2"
+#define NARRAY_VERSION_CODE 602
 
 /*
   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: 0.6.0.1
+version: !ruby/object:Gem::Version
+  version: 0.6.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Masahiro Tanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-27
-default_executable: 
+date: 2012-12-26 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
@@ -44,33 +40,28 @@ files:
 - src/narray_local.h
 - src/lib/narray_ext.rb
 - src/lib/nmatrix.rb
-has_rdoc: false
 homepage: http://narray.rubyforge.org/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - .
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: narray
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: N-dimensional Numerical Array class for Ruby
 test_files: []
-