narray_miss 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0eae189cb0630885345fb435009238c765297353
-  data.tar.gz: 6439d44068f017bab6f17b7853abcc337d614154
+  metadata.gz: ad81e7b19996cde6cb259232a5d63498de4264ea
+  data.tar.gz: 6a6fcb1482ed57dd4305a90468a78062beb897ac
 SHA512:
-  metadata.gz: a1679506a1a943f754aeff6bc7a9a3f93373d67bca0f76d5c6fbbf6ff4add65c5c84d798cc42fe61975d80a8c877f3a98425e90100d06366dbcdd24fa3861135
-  data.tar.gz: 4c85b99c69bf120b1e2d21c0de7953dfebe3eb2328cdd1692bdf524ef93a000e4e06c79816cd1f192c6be042f4046e953e6daeff1ef96c05c9b04bdd71bbd769
+  metadata.gz: a05718777eee5284f4ce9c202acaf0994976fc50ed6f8f7c6be95325fd9da2dc0beca71c0cd9de4744eb2c0c021a988fa31463133ac4674383f9fe3c2c314c4b
+  data.tar.gz: 0f350a12bff835850166279c8daff99cb3019c6da5ec96bcdf3e7d2c70e0de27f9ccbbd81c4e06623d0e167a3016765bd06ffa63693df7d3a220d7d57378b581

data/lib/narray_miss/narray_miss.rb

@@ -34,18 +34,26 @@ To use NArrayMiss class, you need invoking "require 'narray_miss.rb'" in your sc
 
 =end
 
-begin
-  require 'numru/narray'
+if defined?(NumRu::NArray)
   NARRAY = NumRu::NArray
-rescue LoadError
-  err = $!
+elsif defined?(NArray)
+  NARRAY = NArray
+else
+
   begin
     require 'narray'
     NARRAY = NArray
   rescue LoadError
-    STDERR.puts "You should install numru-narray or narray"
-    raise err
+    err = $!
+    begin
+      require 'numru/narray'
+      NARRAY = NumRu::NArray
+    rescue LoadError
+      STDERR.puts "You should install numru-narray or narray"
+      raise err
+    end
   end
+
 end
 
 
@@ -185,7 +193,7 @@ go back to ((<Index>))
     array = arg[0]
     if Numeric===array then array = NARRAY[array] end
     if Array===array then array = NARRAY.to_na(array) end
-    if !array.is_a?(NARRAY) then
+    unless array.is_a?(NARRAY) || /NArray/=~ array.class.to_s then
       raise("argument must be Numeric, NArray or Array")
     end
 
@@ -193,29 +201,26 @@ go back to ((<Index>))
       mask = arg[1]
       if Numeric===mask then mask = array.ne(mask) end
       if Array===mask then
-	mask = NARRAY.to_na(mask).ne(0)
+	mask = array.class.to_na(mask).ne(0)
       end
       if mask.class == FalseClass then
-	mask = NARRAY.byte(*array.shape)
+	mask = array.class.byte(*array.shape)
       end
       if mask.class == TrueClass then
-	mask = NARRAY.byte(*array.shape).fill(1)
+	mask = array.class.byte(*array.shape).fill(1)
       end
-      if !(NARRAY===mask && mask.typecode==BYTE) then
+      if !(array.class===mask && mask.typecode==BYTE) then
 	  raise("mask must be Numeric, Array, true, false or NArray(byte)")
       end
       if mask.length!=array.length
         raise "mask.length must be same as array.length"
       end
     else
-      mask = NARRAY.byte(*array.shape).fill(1)
+      mask = array.class.byte(*array.shape).fill(1)
     end
     __new__(array,mask)
   end
   def self.to_nam(*arg)
-    if !(Numeric===arg[0]) && !(Array===arg[0]) && !arg[0].is_a?(NARRAY)
-      raise "first argument must be Numeric, NArray or Array"
-    end
     arg[0] = arg[0].dup if !(Numeric===arg[0])
     if arg.length==2 && !(Numeric===arg[1]) && arg[1].class!=TrueClass && arg[1].class!=FalseClass then
       arg[1] = arg[1].dup
@@ -617,7 +622,7 @@ go back to ((<Index>))
   def mean(*dims)
     min_count = NArrayMiss.check_options(dims, 1)
     # 整数型の場合は浮動小数型へ変換
-    ary0 = self.integer? ? self.to_type(NARRAY::DFLOAT) : self
+    ary0 = self.integer? ? self.to_type(@array.class.const_get(:DFLOAT)) : self
     NArrayMiss.reduction(@mask, rank, min_count, dims, true, typecode) do |count_sum, count_accum|
       ary0.sum(*dims)/count_sum
     end
@@ -625,7 +630,7 @@ go back to ((<Index>))
   def stddev(*dims)
     min_count = NArrayMiss.check_options(dims, 2)
     # 整数型の場合は浮動小数型へ変換
-    ary0 = self.integer? ? self.to_type(NARRAY::DFLOAT) : self
+    ary0 = self.integer? ? self.to_type(@array.class.const_get(:DFLOAT)) : self
     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?
@@ -636,7 +641,7 @@ go back to ((<Index>))
   def rms(*dims)
     min_count = NArrayMiss.check_options(dims, 1)
     # 整数型の場合は浮動小数型へ変換
-    ary0 = self.integer? ? self.to_type(NARRAY::DFLOAT) : self
+    ary0 = self.integer? ? self.to_type(@array.class.const_get(:DFLOAT)) : self
     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
@@ -646,7 +651,7 @@ go back to ((<Index>))
   def rmsdev(*dims)
     min_count = NArrayMiss.check_options(dims, 1)
     # 整数型の場合は浮動小数型へ変換
-    ary0 = self.integer? ? self.to_type(NARRAY::DFLOAT) : self
+    ary0 = self.integer? ? self.to_type(@array.class.const_get(:DFLOAT)) : self
     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?
@@ -659,17 +664,17 @@ go back to ((<Index>))
     if arg.length==0 then
       return @array[@mask].median
     else
-      nshape = NARRAY.to_na(@array.shape)
+      nshape = @array.class.to_na(@array.shape)
       nshape[arg]=1
       nslice = nshape[nshape.ne(1).where]
-      index = NARRAY.object(@mask.rank)
+      index = @array.class.object(@mask.rank)
       index[nshape.eq(1).where] = true
       obj = NArrayMiss.new(@array.typecode,*nslice.to_a)
       total = 1
       nslice.each{|n| total *= n}
       for i in 0...total
         index[nshape.ne(1).where] = pos(i,nslice)
-        mask = NARRAY.byte(*@array.shape).fill(0)
+        mask = @array.class.byte(*@array.shape).fill(0)
         mask[*index] = 1
         mask = @mask&mask
         if mask.count_true != 0 then
@@ -697,17 +702,17 @@ go back to ((<Index>))
 	obj[@mask] = @array[@mask].#{operator}
         return obj
       else
-        nshape = NARRAY.to_na(@array.shape)
+        nshape = @array.class.to_na(@array.shape)
         nshape[arg]=1
         nslice = nshape[nshape.ne(1).where]
-        index = NARRAY.object(@mask.rank)
+        index = @array.class.object(@mask.rank)
         index[nshape.eq(1).where] = true
         obj = NArrayMiss.new(@array.typecode,*@array.shape)
         total = 1
         nslice.each{|n| total *= n}
         for i in 0...total
           index[nshape.ne(1).where] = pos(i,nslice)
-          mask = NARRAY.byte(*@array.shape).fill(0)
+          mask = @array.class.byte(*@array.shape).fill(0)
           mask[*index] = 1
           mask = @mask&mask
           if mask.count_true != 0 then
@@ -1077,14 +1082,14 @@ go back to ((<Index>))
   end
   def set_mask(mask)
     if mask.class == Array then
-      tmp = NARRAY.byte(*@mask.shape)
+      tmp = @array.class.byte(*@mask.shape)
       tmp[true] = mask
       mask = tmp
     end
     if mask.class == NArrayMiss then
       mask = mask.to_na(0)
     end
-    if mask.class == NARRAY then
+    if mask.class == @array.class then
       if mask.typecode != BYTE then
 	raise("mask must be NArrayMiss.byte, NArray.byte or Array")
       end
@@ -1160,7 +1165,7 @@ go back to ((<Index>))
     if arg.length==0 then
       return @mask.count_false
     else
-      return NARRAY.int(*@mask.shape).fill(1).sum(*arg)-
+      return @array.class.int(*@mask.shape).fill(1).sum(*arg)-
 	     @mask.to_type(MINT).sum(*arg)
     end
   end
@@ -1201,8 +1206,8 @@ go back to ((<Index>))
 
   def coerce(x)
     if Numeric===x then
-      return [NArrayMiss.new(NARRAY[x].typecode,*self.shape).fill(x),self]
-    elsif x.class==Array || x.class==NARRAY then
+      return [NArrayMiss.new(@array.class[x].typecode,*self.shape).fill(x),self]
+    elsif x.class==Array || x.class==@array.class then
       return [NArrayMiss.to_nam(x), self]
     else
       raise("donnot know how to cange #{x.class} to NArrayMiss")
@@ -1217,7 +1222,7 @@ go back to ((<Index>))
     max_col = 80
     sep = ", "
     const = Hash.new
-    NARRAY.constants.each{|c| const[NARRAY.const_get(c)] = c}
+    @array.class.constants.each{|c| const[@array.class.const_get(c)] = c}
     str_ret = "NArrayMiss."+const[typecode].to_s.downcase+"("+shape.join(",")+"):"
     if rank == 0 then
       str_ret << " []"
@@ -1291,7 +1296,7 @@ go back to ((<Index>))
   private
   def pos(n,shape)
     rank = shape.length
-    result = NARRAY.int(rank)
+    result = @array.class.int(rank)
     m=n
     for i in 0..rank-2
       j = rank-1-i
@@ -1310,11 +1315,11 @@ go back to ((<Index>))
       term1 = @array
       term2 = arg
       mask = @mask
-    when Array, NARRAY
+    when Array, @array.class
       term1 = @array.dup
       term1[@mask.not] = dummy # 欠損部分に dummy を代入
-      term2 = arg.kind_of?(NARRAY) ? arg : NARRAY.to_na(arg) # Array -> NArray
-      mask = NARRAY.byte(*term2.shape).fill(1) # 2項目は欠損無し
+      term2 = arg.kind_of?(@array.class) ? arg : @array.class.to_na(arg) # Array -> NArray
+      mask = @array.class.byte(*term2.shape).fill(1) # 2項目は欠損無し
       mask = @mask & mask
     when NArrayMiss
       term1 = @array.dup
@@ -1337,12 +1342,13 @@ go back to ((<Index>))
   def self.reduction(mask, rank, min_count, dims, flag, typecode)
     # flag: リダクションを行う次元方向の有効な値の個数で、割り算を行うかどうかのフラグ
     count_sum = mask.to_type(MINT).sum(*dims)
+    klass = mask.class
     # 返り値が配列か、スカラーかによって分岐
-    if count_sum.kind_of?(NARRAY)
+    if count_sum.kind_of?(klass)
       mask = count_sum.ge(min_count)
       # すべての要素が欠損値にならないかチェック
       if mask.any?
-        count_accum = NARRAY.ref(count_sum)
+        count_accum = klass.ref(count_sum)
         dims.collect{|d|d<0 ? d+rank : d}.sort.each do |d|
           count_accum.newdim!(d)
         end
@@ -1355,13 +1361,13 @@ go back to ((<Index>))
         ary = NArrayMiss.to_nam_no_dup(ary, mask) unless flag
       else
         # すべての要素が欠損値の NArrayMiss を返す
-        na = NARRAY.new(typecode, *mask.shape)
+        na = klass.new(typecode, *mask.shape)
         ary = NArrayMiss.to_nam_no_dup(na, false)
       end
     else
       # 有効な要素数があるかチェック
       if count_sum >= min_count
-        count_accum = NARRAY.int(*([1]*mask.rank)).fill!(count_sum)
+        count_accum = klass.int(*([1]*mask.rank)).fill!(count_sum)
         ary = yield(count_sum, count_accum)
       else
         # 有効な要素数が足りない場合は nil を返す

data/lib/narray_miss/version.rb

@@ -1,3 +1,3 @@
 class NArrayMiss
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/narray_miss.gemspec

@@ -31,5 +31,6 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   #s.add_development_dependency "rspec"
-  s.add_runtime_dependency "numru-narray"
+  s.add_runtime_dependency "narray"
+  #s.add_runtime_dependency "numru-narray"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: narray_miss
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Seiya Nishizawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: numru-narray
+  name: narray
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="