narray_miss 1.2.7 → 1.2.8

data/lib/narray_miss/narray_miss.rb

@@ -560,7 +560,7 @@ go back to ((<Index>))
     # 欠損値に 0 を入れて普通に sum する
     ary0 = @array.dup
     ary0[@mask.not] = 0
-    NArrayMiss.reduction(@mask, min_count, dims, false, typecode) do
+    NArrayMiss.reduction(@mask, rank, min_count, dims, false, typecode) do
       ary0.sum(*dims)
     end
   end
@@ -570,7 +570,7 @@ go back to ((<Index>))
     # byte,sint,int,sfloat,float の MAX の値を入れるように変更すべき
     ary0 = @array.dup
     ary0[@mask.not] = @array.max
-    NArrayMiss.reduction(@mask, min_count, dims, false, typecode) do
+    NArrayMiss.reduction(@mask, rank, min_count, dims, false, typecode) do
       ary0.min(*dims)
     end
   end
@@ -580,7 +580,7 @@ go back to ((<Index>))
     # byte,sint,int,sfloat,float の MIN の値を入れるように変更すべき
     ary0 = @array.dup
     ary0[@mask.not] = @array.min
-    NArrayMiss.reduction(@mask, min_count, dims, false, typecode) do
+    NArrayMiss.reduction(@mask, rank, min_count, dims, false, typecode) do
       ary0.max(*dims)
     end
   end
@@ -589,7 +589,7 @@ go back to ((<Index>))
     min_count = NArrayMiss.check_options(dims, 1)
     # 整数型の場合は浮動小数型へ変換
     ary0 = self.integer? ? self.to_type(NArray::DFLOAT) : self
-    NArrayMiss.reduction(@mask, min_count, dims, true, typecode) do |count_sum, count_accum|
+    NArrayMiss.reduction(@mask, rank, min_count, dims, true, typecode) do |count_sum, count_accum|
       ary0.sum(*dims)/count_sum
     end
   end
@@ -597,7 +597,7 @@ go back to ((<Index>))
     min_count = NArrayMiss.check_options(dims, 2)
     # 整数型の場合は浮動小数型へ変換
     ary0 = self.integer? ? self.to_type(NArray::DFLOAT) : self
-    NArrayMiss.reduction(@mask, min_count, dims, true, typecode) do |count_sum, count_accum|
+    NArrayMiss.reduction(@mask, rank, min_count, dims, true, typecode) do |count_sum, count_accum|
       ary0 = ary0 - ary0.accum(*dims)/count_accum
       ary0 = ary0.abs if ary0.complex?
       ary0 = (ary0**2).sum(*dims) / (count_sum-1)
@@ -608,7 +608,7 @@ go back to ((<Index>))
     min_count = NArrayMiss.check_options(dims, 1)
     # 整数型の場合は浮動小数型へ変換
     ary0 = self.integer? ? self.to_type(NArray::DFLOAT) : self
-    NArrayMiss.reduction(@mask, min_count, dims, true, typecode) do |count_sum, count_accum|
+    NArrayMiss.reduction(@mask, rank, min_count, dims, true, typecode) do |count_sum, count_accum|
       ary0 = ary0.abs if ary0.complex?
       ary0 = (ary0**2).sum(*dims) / count_sum
       NMMath.sqrt(ary0)
@@ -618,7 +618,7 @@ go back to ((<Index>))
     min_count = NArrayMiss.check_options(dims, 1)
     # 整数型の場合は浮動小数型へ変換
     ary0 = self.integer? ? self.to_type(NArray::DFLOAT) : self
-    NArrayMiss.reduction(@mask, min_count, dims, true, typecode) do |count_sum, count_accum|
+    NArrayMiss.reduction(@mask, rank, min_count, dims, true, typecode) do |count_sum, count_accum|
       ary0 = ary0 - ary0.accum(*dims)/count_accum
       ary0 = ary0.abs if ary0.complex?
       ary0 = (ary0**2).sum(*dims) / count_sum
@@ -1305,7 +1305,7 @@ go back to ((<Index>))
   end
 
 
-  def self.reduction(mask, min_count, dims, flag, typecode)
+  def self.reduction(mask, rank, min_count, dims, flag, typecode)
     # flag: リダクションを行う次元方向の有効な値の個数で、割り算を行うかどうかのフラグ
     count_sum = mask.to_type(NArray::LINT).sum(*dims)
     # 返り値が配列か、スカラーかによって分岐
@@ -1314,7 +1314,7 @@ go back to ((<Index>))
       # すべての要素が欠損値にならないかチェック
       if mask.any?
         count_accum = NArray.ref(count_sum)
-        dims.collect{|d|d<0 ? d+mask.rank : d}.sort.each do |d|
+        dims.collect{|d|d<0 ? d+rank : d}.sort.each do |d|
           count_accum.newdim!(d)
         end
         # 割り算を行う場合は、先に count_sum を NArrayMiss 化
@@ -1494,7 +1494,7 @@ module NMMath
         mask = mask0.nil? ? mask1 : mask1.nil? ? mask0 : mask0&mask1
         ary0.set_mask(mask)
         ary1.set_mask(mask)
-        NArrayMiss.reduction(mask, min_count, dims, true, NArray::DFLOAT) do |count_sum, count_accum|
+        NArrayMiss.reduction(mask, ary0.rank, min_count, dims, true, NArray::DFLOAT) do |count_sum, count_accum|
           #{hash[:post]}
         end
       end

data/lib/narray_miss/version.rb

@@ -1,3 +1,3 @@
 class NArrayMiss
-  VERSION = "1.2.7"
+  VERSION = "1.2.8"
 end

data/test/test_narray_miss.rb

@@ -17,12 +17,14 @@ EOF
 
   def setup
     @n = 4
+    @m = 3
     @mask = NArray.byte(@n,@n)
     @mask[true,0] = 1
     @mask[1..-1,1] = 1
     @mask[-1,2] = 1
     @float = NArrayMiss.float(@n,@n).indgen; @float.set_mask(@mask)
     @int = NArrayMiss.int(@n,@n).indgen; @int.set_mask(@mask)
+    @float3d = NArrayMiss.float(@n,@m,@n).indgen
 =begin
      @float #=>
 NArrayMiss.dfloat(4,4):
@@ -94,6 +96,8 @@ NArrayMiss.dfloat(4,4):
     ary = [0, NArray[1,5].stddev, NArray[2,6].stddev, NArray[3,7,11].stddev]
     assert_equal(NArrayMiss.to_nam(ary,[0,1,1,1]), @float.stddev(1))
     assert_equal(NArrayMiss.to_nam(ary,[0,0,0,1]), @float.stddev(1, "min_count"=>3))
+
+    assert_equal(NArrayMiss.to_nam(NArray.float(@n,@m,@n).indgen.stddev(-1)), @float3d.stddev(-1))
   end
 
   def test_rms

metadata

@@ -1,46 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: narray_miss
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 1.2.8
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 7
-  version: 1.2.7
 platform: ruby
-authors: 
+authors:
 - Seiya Nishizawa
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: narray
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: NArrayMiss is an additional class with processing of missing value to NArray which is a numeric multi-dimensional array class.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: NArrayMiss is an additional class with processing of missing value to
+  NArray which is a numeric multi-dimensional array class.
+email:
 - seiya@gfd-dennou.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -52,36 +46,27 @@ files:
 - test/test_narray_miss.rb
 homepage: http://ruby.gfd-dennou.org/products/narray_miss/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: narray_miss
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Additional class with processing of missing value to NArray
-test_files: 
+test_files:
 - test/test_narray_miss.rb