narray_miss 1.2.3 → 1.2.4

data/lib/narray_miss/narray_miss.rb

@@ -1010,8 +1010,9 @@ go back to ((<Index>))
      return (({NArray})) as data.
 --- NArrayMiss#get_array
      return (({NArray})) as data.
---- NArrayMiss#valid?
-     return (({Array})) whose elements are true or false corresponding to valid or invalid of elements, respectively.
+--- NArrayMiss#valid?(index)
+     return (({Array})) whose elements are true or false, 
+     or (({True}))/(({False})) corresponding to validity of the specified element(s) by the ((|index|))
 --- NArrayMiss#all_valid?
      return true if all elements are valid, else false.
 --- NArrayMiss#none_valid?
@@ -1090,16 +1091,23 @@ go back to ((<Index>))
     @array.dup
   end
 
-  def valid?
-    where = self.get_mask!.where2
-    tf = Array.new(self.total)
-    for i in where[0]
-      tf[i] = true
-    end
-    for i in where[1]
-      tf[i] = false
+  def valid?(*arg)
+    if arg.any?
+      # For the subset specified by the argument(s) (in the same way as for []).
+      # Returns true or false if a single value is specified.
+      # Otherwise, returns an Array of true of false
+      mask = @mask[*arg]
+      if mask.is_a?(Numeric)
+        return mask == 1  # true if mask (==1); false if not
+      end
+    else
+      # no argument
+      mask = @mask
     end
-    tf
+    ary = mask.to_a
+    ary.flatten!
+    ary.map!{|i| i==1}  # true if element == 1; false if not
+    return ary
   end
   def all_valid?
     @mask.all?

data/lib/narray_miss/version.rb

@@ -1,3 +1,3 @@
 class NArrayMiss
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/test/test_narray_miss.rb

@@ -34,6 +34,15 @@ NArrayMiss.dfloat(4,4):
 =end
   end
 
+  def test_valid?
+    assert_equal([true,true,true,true,false,true,true,true,false,false,false,true,false,false,false,false], @int.valid?)
+    assert_equal([true,true,true,true], @int.valid?(true,0))
+    assert_equal([false,true,true,true], @int.valid?(true,1))
+    assert_equal([true,true,true,false], @int.valid?(3,true))
+    assert_equal(true, @int.valid?[7])
+    assert_equal(false, @int.valid?[10])
+  end
+
   def test_add
     ary = NArrayMiss.float(@n,@n)
     ary[true,0] = [0, 2, 4, 6]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: narray_miss
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Seiya Nishizawa
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-01 00:00:00 Z
+date: 2011-12-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: narray
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: narray_miss
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Additional class with processing of missing value to NArray