narray_miss 1.2.1.1 → 1.2.3

data/lib/narray_miss/version.rb

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

data/narray_miss.gemspec

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "narray_miss/version"
+
+Gem::Specification.new do |s|
+  s.name        = "narray_miss"
+  s.version     = NArrayMiss::VERSION
+  s.authors     = ["Seiya Nishizawa"]
+  s.email       = ["seiya@gfd-dennou.org"]
+  s.homepage    = "http://ruby.gfd-dennou.org/products/narray_miss/"
+  s.summary     = %q{Additional class with processing of missing value to NArray}
+  s.description = %q{NArrayMiss is an additional class with processing of missing value to NArray which is a numeric multi-dimensional array class.}
+
+  s.rubyforge_project = "narray_miss"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  #s.extensions << "ext/extconf.rb"
+
+  # specify any dependencies here; for example:
+  #s.add_development_dependency "rspec"
+  s.add_runtime_dependency "narray"
+end

data/test/test_narray_miss.rb

@@ -0,0 +1,147 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require "narray_miss"
+require "test/unit"
+
+class NArrayMissTest < Test::Unit::TestCase
+
+  def assert_equal(expected, actual, message=nil)
+    if expected.kind_of?(Float)
+      assert((expected-actual)/expected < 1.0e-10, message || <<EOF)
+<#{expected}> expected but was
+<#{actual}>.
+EOF
+    else
+      super(expected, actual, message)
+    end
+  end
+
+  def setup
+    @n = 4
+    @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)
+=begin
+     @float #=>
+NArrayMiss.dfloat(4,4):
+ [ [ 0.0, 1.0, 2.0,  3.0 ], 
+   [  - , 5.0, 6.0,  7.0 ], 
+   [  - ,  - ,  - , 11.0 ], 
+   [  - ,  - ,  - ,   -  ]
+ ]
+=end
+  end
+
+  def test_add
+    ary = NArrayMiss.float(@n,@n)
+    ary[true,0] = [0, 2, 4, 6]
+    ary[1..-1,1] = [10, 12, 14]
+    ary[-1,2] = 22
+    a1 = @float.dup
+    a2 = @int.dup
+    assert_equal(ary, a1 + a2)
+    assert_equal(@float, a1)
+    assert_equal(@int, a2)
+  end
+
+  def test_sum
+    assert_equal(35.0, @float.sum)
+    assert_equal(35, @int.sum)
+
+    assert_equal(NArrayMiss.to_nam([6.0,18.0,11.0,0.0],[1,1,1,0]), @float.sum(0))
+    assert_equal(NArrayMiss.to_nam([6,18,11,0],[1,1,1,0]), @int.sum(0))
+
+    assert_equal(NArrayMiss.to_nam([6.0,18.0,0.0,0.0],[1,1,0,0]), @float.sum(0, "min_count"=>2))
+
+    assert_equal(NArrayMiss.to_nam([0.0,6.0,8.0,21.0],[1,1,1,1]), @float.sum(1))
+    assert_equal(NArrayMiss.to_nam([0,6,8,21],[1,1,1,1]), @int.sum(1))
+
+    assert_equal(NArrayMiss.to_nam([0.0,6.0,8.0,21.0],[0,1,1,1]), @float.sum(1, "min_count"=>2))
+  end
+
+  def test_mean
+    assert_equal(4.375, @float.mean)
+    assert_equal(4.375, @int.mean)
+
+    ary = [1.5, 6, 11, 0]
+    assert_equal(NArrayMiss.to_nam(ary,[1,1,1,0]), @float.mean(0))
+    assert_equal(NArrayMiss.to_nam(ary,[1,0,0,0]), @float.mean(0, "min_count"=>4))
+
+    ary = [0.0, 3, 4, NArray[3,7,11].mean]
+    assert_equal(NArrayMiss.to_nam(ary,[1,1,1,1]), @float.mean(1))
+    assert_equal(NArrayMiss.to_nam(ary,[0,0,0,1]), @float.mean(1, "min_count"=>3))
+  end
+
+  def test_stddev
+    assert_equal(3.62284418654736, @float.stddev)
+    assert_equal(3.62284418654736, @int.stddev)
+
+    ary = [NArray[0,1,2,3].stddev, NArray[5,6,7].stddev, 0, 0]
+    assert_equal(NArrayMiss.to_nam(ary,[1,1,0,0]), @float.stddev(0))
+    assert_equal(NArrayMiss.to_nam(ary,[1,0,0,0]), @float.stddev(0, "min_count"=>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))
+  end
+
+  def test_rms
+    assert_equal(5.53398590529466, @float.rms)
+    assert_equal(5.53398590529466, @int.rms)
+
+    ary = [NArray[0,1,2,3].rms, NArray[5,6,7].rms, 11, 0]
+    assert_equal(NArrayMiss.to_nam(ary,[1,1,1,0]), @float.rms(0))
+    assert_equal(NArrayMiss.to_nam(ary,[1,0,0,0]), @float.rms(0, "min_count"=>4))
+
+    ary = [0.0, NArray[1,5].rms, NArray[2,6].rms, NArray[3,7,11].rms]
+    assert_equal(NArrayMiss.to_nam(ary,[1,1,1,1]), @float.rms(1))
+    assert_equal(NArrayMiss.to_nam(ary,[0,0,0,1]), @float.rms(1, "min_count"=>3))
+  end
+
+  def test_rmsdev
+    assert_equal(3.38886042793149, @float.rms)
+    assert_equal(3.38886042793149, @int.rmsdev)
+
+    ary = [NArray[0,1,2,3].rmsdev, NArray[5,6,7].rmsdev, 0, 0]
+    assert_equal(NArrayMiss.to_nam(ary,[1,1,1,0]), @float.rmsdev(0))
+    assert_equal(NArrayMiss.to_nam(ary,[1,0,0,0]), @float.rmsdev(0, "min_count"=>4))
+
+    ary = [0.0, NArray[1,5].rmsdev, NArray[2,6].rmsdev, NArray[3,7,11].rmsdev]
+    assert_equal(NArrayMiss.to_nam(ary,[1,1,1,1]), @float.rmsdev(1))
+    assert_equal(NArrayMiss.to_nam(ary,[0,0,0,1]), @float.rmsdev(1, "min_count"=>3))
+  end
+
+  def test_covariance
+    x = @float
+    ary = NArray.float(@n,@n).indgen(0,2)
+    mask = NArray.byte(@n,@n).fill(1)
+    mask[-1,0] = 0
+    y = NArrayMiss.to_nam(ary,mask)
+=begin
+y #=>
+NArrayMiss.float(4,4)
+[ [  0.0,  2.0,  4.0,   -  ], 
+  [  8.0, 10.0, 12.0, 14.0 ], 
+  [ 16.0, 18.0, 20.0, 22.0 ], 
+  [ 24.0, 26.0, 28.0, 30.0 ]
+]
+NArrayMiss.dfloat(4,4):
+ [ [ 0.0, 1.0, 2.0,  3.0 ], 
+   [  - , 5.0, 6.0,  7.0 ], 
+   [  - ,  - ,  - , 11.0 ], 
+   [  - ,  - ,  - ,   -  ]
+ ]
+=end
+    assert_equal(NMath.covariance(NArray[0,1,2,4,5,7,11],NArray[0,2,4,10,12,14,22]), NMMath.covariance(x,y))
+
+    ary = Array.new(@n)
+    ary[0] = 0.0
+    ary[1] = NMath.covariance(NArray[1,5],NArray[2,10])
+    ary[2] = NMath.covariance(NArray[2,6],NArray[4,12])
+    ary[3] = NMath.covariance(NArray[7,11],NArray[14,22])
+    assert_equal(NArrayMiss.to_nam(ary,[0,1,1,1]), NMMath.covariance(x,y,1))
+    assert_equal(NArrayMiss.to_nam(ary,[0,0,0,0]), NMMath.covariance(x,y,1,"min_count"=>3))
+  end
+end

metadata

@@ -1,23 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: narray_miss
 version: !ruby/object:Gem::Version 
-  hash: 73
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  - 1
-  version: 1.2.1.1
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
-- GFD Dennou Club
+- Seiya Nishizawa
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 +09:00
-default_executable: 
+date: 2011-12-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: narray
@@ -27,16 +25,15 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
         - 0
-        - 5
-        - 5
-        version: 0.5.5
+        version: "0"
   type: :runtime
   version_requirements: *id001
-description: NArrayMiss is an additional Class of NArray to handle missing value.
-email: eriko@gfd-dennou.org
+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: []
@@ -44,15 +41,18 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- setup.rb
-- README
-- ChangeLog
+- Gemfile
+- LICENSE.txt
+- README.rdoc
+- Rakefile
 - lib/narray_miss.rb
-- doc/narray_miss.html
-has_rdoc: true
+- lib/narray_miss/narray_miss.rb
+- lib/narray_miss/version.rb
+- narray_miss.gemspec
+- test/test_narray_miss.rb
 homepage: http://ruby.gfd-dennou.org/products/narray_miss/
-licenses: 
-- GFD Dennou Club
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -65,9 +65,8 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       hash: 3
       segments: 
-      - 1
-      - 6
-      version: "1.6"
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -79,10 +78,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.4.1
+rubyforge_project: narray_miss
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Multi-dimensional Array class with missing data handling using NArray
-test_files: []
-
+summary: Additional class with processing of missing value to NArray
+test_files: 
+- test/test_narray_miss.rb

data/ChangeLog

@@ -1,408 +0,0 @@
-2010-03-24 15:58  mizuta
-
-	* lib/narray_miss.rb: Wed Mar 24 2010 R Mizuta	   *
-	  lib/narray_miss.rb bugfix for methods hton and htov
-
-2009-07-09 10:58  koshiro
-
-	* lib/narray_miss.rb: Thu Jul  9 2009 T Koshiro 	*
-	  lib/narray_miss.rb: (NArrayMiss#[], NArrayMiss#[]=)	  added
-	  support for masking with a byte NArrayMiss.
-
-2009-07-02 16:22  horinout
-
-	* lib/narray_miss.rb: * update for ruby 1.9
-
-2008-08-04 11:29  seiya
-
-	* lib/narray_miss.rb:
-	  * bugfix: typo
-
-2008-07-17 15:33  seiya
-
-	* lib/narray_miss.rb:
-	  * bugfix
-
-2007-11-05 12:46  seiya
-
-	* lib/narray_miss.rb:
-	  * commit patch from Masuo Nakano
-
-2006-03-09 15:06  seiya
-
-	* lib/narray_miss.rb:
-	  change routine1 to not change original arrays for calculation
-
-2005-08-25 11:00  seiya
-
-	* lib/narray_miss.rb:
-	  remove NArray#_load, _dump
-
-2005-06-30 15:53  seiya
-
-	* lib/narray_miss.rb:
-	  bugfix error in algebra when rank of first term is smaller than
-	  second one
-
-2005-06-30 15:22  seiya
-
-	* lib/narray_miss.rb:
-	  change array.class==NArray to array.is_a?(NArray)
-
-2005-05-26 15:14  seiya
-
-	* lib/narray_miss.rb:
-	  bugfix in #mediun, #sort,, and #sort_index
-
-2005-05-26 12:21  seiya
-
-	* lib/narray_miss.rb:
-	  bugfix for #median, #sort, #sort_index
-
-2005-05-26 11:23  seiya
-
-	* lib/narray_miss.rb:
-	  add new method #median
-
-2004-11-24 12:39  seiya
-
-	* lib/narray_miss.rb:
-	  new methods #all_valid?, #none_valid?, #all_invalid?, and
-	  #any_valid?
-
-2004-08-12 17:01  seiya
-
-	* lib/narray_miss.rb:
-	  bugfix for #-@, #abs, #~@ and #not, that was destructive methods.
-
-2004-08-11 11:18  seiya
-
-	* ChangeLog, README, narray_miss.rb, lib/narray_miss.rb:
-	  change structure of package change to use setup.rb change README
-
-2004-06-23 11:20  seiya
-
-	* narray_miss.rb:
-	  bugfixs
-
-2004-06-11 12:28  seiya
-
-	* narray_miss.rb:
-	  return nil when all missing_value for mean sum max min stddev
-	  mask.not instede of mask.where2[1]
-
-2004-03-29 12:13  seiya
-
-	* ChangeLog:
-	  releas 1.0.3
-
-2004-03-18 17:18  seiya
-
-	* narray_miss.rb:
-	  add NArray#_dump and NArray._load
-
-2004-03-18 17:17  seiya
-
-	* narray_miss.rb:
-	  add NArrayMiss#_dump and NArrayMiss._load
-
-2004-03-03 14:27  seiya
-
-	* narray_miss.rb:
-	  bugfix for NArrayMiss.to_nam bugfix for NArrayMiss#transpose
-
-2004-03-02 18:17  seiya
-
-	* ChangeLog, README:
-	  release for 1.0.2
-
-2004-03-02 17:17  seiya
-
-	* narray_miss.rb:
-	  bugfix for NArrayMiss[] bugfix for NArrayMiss#[] change to return
-	  NArrayMiss insted of Numeric when length==1 in [+,-,*,/, etc]
-
-2003-10-29 12:49  seiya
-
-	* narray_miss.rb:
-	  add option "min_count" to mean
-
-2003-10-06 19:44  seiya
-
-	* narray_miss.rb:
-	  change inspect for within 80 chars in 1 line
-
-2003-10-06 19:27  seiya
-
-	* narray_miss.rb:
-	  bugfix for inspect
-
-2003-10-06 17:12  seiya
-
-	* README:
-	  README for releas narray_miss-1.0.1
-
-2003-10-06 17:11  seiya
-
-	* ChangeLog:
-	  changelog for releas narray_miss-1.0.1
-
-2003-10-06 17:05  seiya
-
-	* narray_miss.rb:
-	  change NMMath and include to NArrayMiss class then x.sin is same
-	  NMMath::sin(x)
-
-2003-10-06 16:15  seiya
-
-	* narray_miss.rb:
-	  change format of NArrayMiss#inspect
-
-2003-10-06 12:52  seiya
-
-	* narray_miss.rb:
-	  add argument to eval (routine, nil, __FILE__, __LINE__+1)
-
-2003-09-01 17:06  seiya
-
-	* ChangeLog, README:
-	  rel for 1.0.0
-
-2003-08-19 16:28  seiya
-
-	* narray_miss.rb:
-	  hoge.nil! -> !hoge
-
-2003-08-19 15:47  seiya
-
-	* narray_miss.rb:
-	  change NArrayMiss[Numeric] return scalor new each_valid,
-	  each_valid_with_index change code for collect
-
-2003-08-19 15:35  seiya
-
-	* narray_miss.rb:
-	  to_na -> to_na! get_mask, get_array -> get_mask!, get_array!
-	  valiadation, invalidation -> set_valid, set_invalid
-
-2003-06-17 18:15  seiya
-
-	* README:
-	  change README
-
-2003-04-17 16:59  seiya
-
-	* narray_miss.rb:
-	  bugfix for NArrayMiss#stddev sometime return NaN when mean is
-	  dominant
-
-2003-04-16 20:36  seiya
-
-	* narray_miss.rb:
-	  several methods to return scalar if length==1 && valid
-
-2003-04-16 17:22  seiya
-
-	* narray_miss.rb:
-	  NArrayMiss#[in]validation to be able to get both of index and
-	  array of indeices for argument
-
-2003-04-11 17:50  seiya
-
-	* narray_miss.rb:
-	  enable for validation and invalidation to get Array of index for
-	  argument
-
-2003-04-11 13:14  seiya
-
-	* narray_miss.rb:
-	  make MArrayMiss#[hoge]= nil to invalidation
-
-2003-03-25 10:31  seiya
-
-	* narray_miss.rb:
-	  bugfix for set_mask
-
-2003-03-18 19:36  seiya
-
-	* ChangeLog:
-	  ChangeLog for releas 0.5
-
-2003-03-13 15:25  seiya
-
-	* narray_miss.rb:
-	  bugfix to_na
-
-2003-03-13 15:03  seiya
-
-	* narray_miss.rb:
-	  bug for +,-,*,.... when NArrayMiss.***(1,10)+NArrayMiss.***(10,1)
-
-2003-03-13 12:58  seiya
-
-	* narray_miss.rb:
-	  change to validate for indgen bugfix (stddev for no arg) bugfix
-	  (switch validation and invalidation)
-
-2003-03-06 10:55  seiya
-
-	* narray_miss.rb:
-	  missfix for document
-
-2003-02-24 12:29  seiya
-
-	* ChangeLog, README:
-	  ChangeLog and README for releas 0.4
-
-2003-02-24 12:21  seiya
-
-	* narray_miss.rb:
-	  document
-
-2003-02-24 12:17  seiya
-
-	* narray_miss.rb:
-	  new method NArrayMiss#set_without_validation change
-	  NArrayMiss#[]= to make valid elements bugfix
-
-2003-02-24 11:24  seiya
-
-	* narray_miss.rb:
-	  NArrayMiss#to_na -> NArrayMiss#to_na([missing_value])
-
-2003-02-21 19:22  seiya
-
-	* narray_miss.rb:
-	  new methods "all_valid", "all_invalid" bugfix for "mean" "mask"
-	  "set_mask"
-
-2003-02-21 18:10  seiya
-
-	* narray_miss.rb:
-	  new methods "size", "length"
-
-2003-02-20 14:45  seiya
-
-	* ChangeLog, narray_miss.rb:
-	  bugfix of set_missing_value
-
-2003-02-20 14:37  seiya
-
-	* ChangeLog, README:
-	  chage ChangeLog README
-
-2003-02-20 14:29  seiya
-
-	* narray_miss.rb:
-	  update document
-
-2003-02-20 14:27  seiya
-
-	* narray_miss.rb:
-	  bug fix
-
-2003-02-01 18:09  seiya
-
-	* narray_miss.rb:
-	  change document
-
-2003-02-01 17:16  seiya
-
-	* ChangeLog:
-	  change ChangeLog for releas narray_miss-0.2
-
-2003-02-01 17:11  seiya
-
-	* narray_miss.rb:
-	  make "min_count" option valid for accum, sum, min, max, mean and
-	  stddev methods.  new methods to_type change document for above
-	  change
-
-2003-01-31 19:58  seiya
-
-	* narray_miss.rb:
-	  update document for rd.
-
-2003-01-30 17:20  seiya
-
-	* narray_miss.html:
-	  remove narray_miss.html
-
-2003-01-30 17:19  seiya
-
-	* narray_miss.rb:
-	  change header for rd remove narray_miss.html for cvs
-
-2003-01-30 17:15  seiya
-
-	* narray_miss.html, narray_miss.rb:
-	  add narray_miss.html < rd2 narray_miss.rb new method	rondomn add
-	  args for rd
-
-2003-01-30 16:48  seiya
-
-	* narray_miss.rb:
-	  change for use rdtool == is obsolete all? none? any? was defined
-	  twice
-
-2003-01-30 15:03  seiya
-
-	* ChangeLog:
-	  add ChangeLog
-
-2003-01-30 14:59  seiya
-
-	* README:
-	  add README
-
-2003-01-09 17:13  seiya
-
-	* narray_miss.rb:
-	  some bug fixes some new methods
-
-2003-01-09 13:14  seiya
-
-	* narray_miss.rb:
-	  to_nam use dup Routine -> private method routine use coerce
-	  inprove count_[in]valid set_missing_value[!] some bug fixes
-
-2003-01-08 18:38  seiya
-
-	* narray_miss.rb:
-	  bug fix remove missing_value
-
-2003-01-08 18:01  seiya
-
-	* narray_miss.rb:
-	  @missing_value -> @default_missing_value
-
-2003-01-08 17:44  seiya
-
-	* narray_miss.rb:
-	  change to_nam
-
-2003-01-08 17:15  seiya
-
-	* narray_miss.rb:
-	  not make new array for to_nar alias hoge fuge -> alias :hoge
-	  :fuge
-
-2003-01-08 16:39  seiya
-
-	* narray_miss.rb:
-	  bug fix
-
-2003-01-06 11:41  seiya
-
-	* narray_miss.rb:
-	  pos -> private
-
-2003-01-06 11:22  seiya
-
-	* narray_miss.rb:
-	  class NArrayMiss
-
-2003-01-06 11:22  seiya
-
-	* narray_miss.rb: Initial revision
-