narray 0.6.0.8 → 0.6.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56a5e5c60ab2450492b8e19b78387d62e090fdbc
-  data.tar.gz: ff0771dbbde2a98e9e92db8f0b821ffc25658e3c
+  metadata.gz: b502e43bb2703b09703eab484b27a2230c7f215f
+  data.tar.gz: b1bcbb6b5388d48fac66d206c42ddfb6cc533481
 SHA512:
-  metadata.gz: 8993262cf562f08738f314e567f3d596c7661c64d4722260db5e0fb809f9fb4e5ce9f1b07ee16bc424d474f5e1b1abd8a51a22949f25b025c45b35998a417a38
-  data.tar.gz: 30166a5c16acd63324282142da10fd6ed2dc8e182fad3fb280b731e0e234e0eb5a787df43b2d8b9d680a51281964747d5a8f4a1f0bba9b44deeca87c85f89eda
+  metadata.gz: 68631b41d59afb56f9cb006d8959b9c74f8f9e1f9ab9aa4fcf650ea08b639566c9e29ae74b191ee60feb24393c088d9ff5c687b4a9c8d6211a513aadd1566535
+  data.tar.gz: 3ebb0656301126842e704047c8c331d098f2497dae23b64620b10fc751f3f1548865c98e6b359d07d6e5eb7c912cd387bcd3dce84fdff5587aa17e4bc08f01fb

data/ChangeLog

@@ -1,3 +1,8 @@
+2013-03-16  Masahiro TANAKA  <masa16.tanaka@gmail.com>
+
+	* narray.c (Init_narray): add map, map!
+	Thanks to Michael Macias.
+
 2013-02-27  Masahiro TANAKA  <masa16.tanaka@gmail.com>
 
 	* Rakefile: use rubygems/package_task.

data/MANIFEST

@@ -1,9 +1,9 @@
 ChangeLog
 MANIFEST
-README.en
-README.ja
-SPEC.en
-SPEC.ja
+README.md
+README.ja.md
+SPEC.en.txt
+SPEC.ja.txt
 depend
 extconf.rb
 mkmath.rb

data/README.ja.md

@@ -0,0 +1,54 @@
+# Ruby/NArray
+
+* ver 0.6.0.9 (2014-05-29)
+* [Home page](http://masa16.github.io/narray/index.ja.html)
+* [リポジトリ](https://github.com/masa16/narray)
+* [NArrayメソッド一覧](https://github.com/masa16/narray/blob/master/SPEC.ja.txt)
+
+## Ruby/NArrayの特徴:
+
+* Rubyで、高速な数値計算が可能。
+* 要素には、8,16,32 bit 整数、単精度/倍精度の実数/複素数、
+  および Rubyオブジェクトをサポート。
+* 部分配列の取出し、代入も容易。
+  要素位置の指定には、数値、範囲、インデックスの配列が使用可能。
+* +, -, *, /, %, ** や 算術関数の演算は、要素-対-要素でおこなう。
+* NMath 算術関数モジュール
+* 配列同士の演算・代入は、各次元のサイズが同じであることが必要。
+  ただし、サイズが1の次元は、他方の配列のサイズに合わせて
+  「繰り返し」同じ要素が適用される。
+* FFTW (高速フーリエ変換) version 3 は次のモジュールでサポート。
+* Ruby/PGPLOT (グラフィックスライブラリ、別悃) にて
+  XYグラフ、ヒストグラム、等高線、イメージ表示可能。
+* 数値計算・画像処理・データ解析など幅広い応用が可能(と思う)。
+
+* 類似品
+  * Python/NumPy, Perl/PDL, Yorick, IDL
+
+* 不十分な点
+  * メソッドが不足。
+  * バグ出しが不十分。
+  * ドキュメントがない。
+
+## インストール方法
+
+Rubyの標準的な拡張ライブラリと同じです。ソースを展開したディレクトリで、
+
+    ruby extconf.rb
+    make
+    make install
+
+と実行します。
+
+## 動作確認
+
+* ruby 2.1.2p95 (2014-05-08 revision 45877) [x86_64-linux]
+* gcc version 4.4.7 20120313 (Red Hat 4.4.7-4) (GCC)
+
+## 配布条件
+
+Rubyのライセンスに準拠します。
+
+## 著者
+
+田中昌宏

data/README.md

@@ -0,0 +1,50 @@
+# Ruby/NArray
+
+* ver 0.6.0.9 (2014-05-29)
+* [Home page](http://masa16.github.io/narray/)
+* [Repository](https://github.com/masa16/narray)
+* [NArray method list](https://github.com/masa16/narray/blob/master/SPEC.en.txt)
+
+## NArray Features:
+
+* Fast and easy calculation for large numerical array.
+* Accepting Elements:
+  8,16,32 bit integer, single/double float/complex, Ruby Object.
+* Easy extraction/substitution of array subset,
+  using assignment with number, range, array index.
+* Operator: +, -, *, /, %, **, etc.
+* NMath: Mathematics functions.
+* FFTW version 2 or 3 is separately supported.
+* Ruby/PGPLOT: Graphics library interface (separately distributed)
+  X-Y Graph, Histogram, Contour map, Image map, etc.
+
+* NArray is similar to:
+  * Python/NumPy, Perl/PDL, Yorick, IDL
+
+* NArray is far from completed!
+  * Experimental!  Specification may be changed.
+  * Far from completed.
+  * Bugs may be included.
+  * No document.
+
+## Installation
+
+    ruby extconf.rb
+    make
+    make install
+
+## Tested Platform
+
+* ruby 2.1.2p95 (2014-05-08 revision 45877) [x86_64-linux]
+* gcc version 4.4.7 20120313 (Red Hat 4.4.7-4) (GCC)
+
+## License
+
+    This program is free software.
+    You can distribute/modify this program
+    under the same terms as Ruby itself.
+    NO WARRANTY.
+
+## Author
+
+Masahiro TANAKA

data/src/na_func.c

@@ -1037,6 +1037,7 @@ static int
   int i, j, c=0;
   long r, n;
   VALUE v;
+  volatile VALUE s;
 
   if (flag==0)
     MEMZERO(rankv,int,rankc);
@@ -1061,8 +1062,10 @@ static int
     else
     if (CLASS_OF(v)==rb_cRange) {
       rb_range_beg_len( v, &r, &n, rankc, 1 );
-      if ( c+n > rankc )
-	rb_raise(rb_eArgError, "too many ranks");
+      if ( c+n > rankc ) {
+        s = rb_inspect(v);
+        rb_raise(rb_eArgError,"invalid dimension range: %s",StringValueCStr(s));
+      }
       if (flag) {
 	for(j=0; j<n; ++j)
 	  rankv[c++] = r++;
@@ -1123,11 +1126,9 @@ static VALUE
   GetNArray(self,a2);
 
   /* Parse Argument */
-  rankv = ALLOC_N( int, NA_MAX_RANK*2 );
-  shape = &rankv[NA_MAX_RANK];
+  rankv = ALLOC_N( int, a2->rank*2 );
+  shape = &rankv[a2->rank];
   rankc = na_arg_to_rank( argc, argv, a2->rank, rankv, 1 );
-  if (rankc > a2->rank)
-    rb_raise(rb_eArgError, "too many args");
   for ( ;rankc<a2->rank; ++rankc)
     rankv[rankc] = rankc;
 

data/src/na_random.c

@@ -9,7 +9,7 @@
   NO WARRANTY.
 */
 
-/* 
+/*
 This is based on trimmed version of MT19937.  To get the original version,
 contact <http://www.math.keio.ac.jp/~matumoto/emt.html>.
 
@@ -20,11 +20,11 @@ The original copyright notice follows.
    This is a faster version by taking Shawn Cokus's optimization,
    Matthe Bellew's simplification, Isaku Wada's real version.
 
-   Before using, initialize the state by using init_genrand(seed) 
+   Before using, initialize the state by using init_genrand(seed)
    or init_by_array(init_key, key_length).
 
    Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-   All rights reserved.                          
+   All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
@@ -37,8 +37,8 @@ The original copyright notice follows.
         notice, this list of conditions and the following disclaimer in the
         documentation and/or other materials provided with the distribution.
 
-     3. The names of its contributors may not be used to endorse or promote 
-        products derived from this software without specific prior written 
+     3. The names of its contributors may not be used to endorse or promote
+        products derived from this software without specific prior written
         permission.
 
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -62,7 +62,7 @@ The original copyright notice follows.
 #include "narray.h"
 #include "narray_local.h"
 
-/* Period parameters */  
+/* Period parameters */
 #define N 624
 #define M 397
 #define MATRIX_A 0x9908b0dfUL   /* constant vector a */
@@ -83,7 +83,7 @@ static void
     int j;
     state[0]= s & 0xffffffffUL;
     for (j=1; j<N; ++j) {
-        state[j] = (1812433253UL * (state[j-1] ^ (state[j-1] >> 30)) + j); 
+        state[j] = (1812433253UL * (state[j-1] ^ (state[j-1] >> 30)) + j);
         /* See Knuth TAOCP Vol2. 3rd Ed. P.106 for multiplier. */
         /* In the previous versions, MSBs of the seed affect   */
         /* only MSBs of the array state[].                        */
@@ -105,11 +105,11 @@ static void
 
     left = N;
     next = state;
-    
-    for (j=N-M+1; --j; ++p) 
+
+    for (j=N-M+1; --j; ++p)
         *p = p[M] ^ TWIST(p[0], p[1]);
 
-    for (j=M; --j; ++p) 
+    for (j=M; --j; ++p)
         *p = p[M-N] ^ TWIST(p[0], p[1]);
 
     *p = p[M-N] ^ TWIST(p[0], state[0]);
@@ -161,7 +161,7 @@ static VALUE
     VALUE sd;
     u_int32_t seed, old;
 
-    rb_secure(4);
+    //rb_secure(4);
     if (rb_scan_args(argc, argv, "01", &sd) == 0) {
 	seed = random_seed();
     }

data/src/narray.c

@@ -931,8 +931,6 @@ static void
 
   if (argc==0)
     rb_raise(rb_eArgError, "Argument required");
-  if (ary->rank + argc > NA_MAX_RANK-1)
-    rb_raise(rb_eArgError, "Exceed maximum ranks");
   if (ary->total==0)
     rb_raise(rb_eRuntimeError, "cannot extend empty array");
 
@@ -1240,6 +1238,8 @@ void
     rb_define_method(cNArray, "each", na_each,0);
     rb_define_method(cNArray, "collect", na_collect,0);
     rb_define_method(cNArray, "collect!", na_collect_bang,0);
+    rb_define_alias(cNArray, "map", "collect");
+    rb_define_alias(cNArray, "map!", "collect!");
     rb_define_method(cNArray, "to_s", na_to_s, 0);
     rb_define_method(cNArray, "to_f", na_to_float, 0);
     rb_define_method(cNArray, "to_i", na_to_integer, 0);

data/src/narray.h

@@ -23,8 +23,8 @@
 # include <sys/types.h>
 #endif
 
-#define NARRAY_VERSION "0.6.0.8"
-#define NARRAY_VERSION_CODE 608
+#define NARRAY_VERSION "0.6.0.9"
+#define NARRAY_VERSION_CODE 609
 
 /*
   Data types used in NArray :
@@ -110,8 +110,6 @@ extern VALUE cNArray;
 extern const int na_sizeof[NA_NTYPES+1];
 #endif
 
-#define NA_MAX_RANK 15
-
 #define GetNArray(obj,var)  Data_Get_Struct(obj, struct NARRAY, var)
 #define IsNArray(obj) (rb_obj_is_kind_of(obj,cNArray)==Qtrue)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: narray
 version: !ruby/object:Gem::Version
-  version: 0.6.0.8
+  version: 0.6.0.9
 platform: ruby
 authors:
 - Masahiro Tanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies: []
 description: Numerical N-dimensional Array class
 email: masa16.tanaka@gmail.com
@@ -19,12 +19,14 @@ extra_rdoc_files: []
 files:
 - ChangeLog
 - MANIFEST
-- README.en
-- README.ja
-- SPEC.en
-- SPEC.ja
+- README.ja.md
+- README.md
+- SPEC.en.txt
+- SPEC.ja.txt
 - src/depend
 - src/extconf.rb
+- src/lib/narray_ext.rb
+- src/lib/nmatrix.rb
 - src/mkmath.rb
 - src/mknafunc.rb
 - src/mkop.rb
@@ -37,47 +39,45 @@ files:
 - src/narray.def
 - src/narray.h
 - src/narray_local.h
-- src/lib/narray_ext.rb
-- src/lib/nmatrix.rb
-homepage: http://narray.rubyforge.org/
+homepage: http://masa16.github.io/narray/
 licenses:
 - Ruby
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - NArray
-- --main
+- "--main"
 - NArray
-- --exclude
+- "--exclude"
 - mk.*
-- --exclude
+- "--exclude"
 - extconf\.rb
-- --exclude
+- "--exclude"
 - src/.*\.h
-- --exclude
+- "--exclude"
 - src/lib/
-- --exclude
-- .*\.o
-- --exclude
+- "--exclude"
+- ".*\\.o"
+- "--exclude"
 - narray\.so
-- --exclude
+- "--exclude"
 - libnarray\.*
 require_paths:
-- .
+- "."
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: narray
-rubygems_version: 2.0.0
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 2
 summary: N-dimensional Numerical Array class for Ruby

data/README.en

@@ -1,49 +0,0 @@
-	Ruby/NArray  ver 0.6.0.0 (2011-08-27)	by Masahiro TANAKA
-
-* NArray properties:
-
-  + Fast and easy calculation for large numerical array.
-  + Accepting Elements:
-    8,16,32 bit integer, single/double float/complex, Ruby Object.
-  + Easy extraction/substitution of array subset,
-    using assignment with number, range, array index.
-  + Operator: +,-,*,/,%,**, etc.
-  + FFTW version 2 or 3 is separately supported.
-  + NImage: Image viewer class.
-  + Ruby/PGPLOT: Graphics library interface (separately distributed)
-     X-Y Graph, Histogram, Contour map, Image map, etc.
-
-* NArray is similar to:
-
-  + Python/NumPy, Perl/PDL, Yorick, IDL
-
-* NArray is far from completed!
-
-  + Experimental!  Specification may be changed.
-  + Far from completed.
-  + Bugs may be included.
-  + No document.
-
-* Installation
-
-  + Compile & Install NArray
-
-    ruby extconf.rb
-    make
-    make install
-
-* Tested Platform
-
-  ruby 1.9.2p180 (2011-02-18 revision 30909) [x86_64-linux]
-  gcc version 4.5.1 20100924 (Red Hat 4.5.1-4) (GCC)
-
-* License
-
-  This program is free software.
-  You can distribute/modify this program
-  under the same terms as Ruby itself.
-  NO WARRANTY.
-
-* Author
-
-    Masahiro TANAKA <masa16.tanaka@gmail.com>

data/README.ja

@@ -1,52 +0,0 @@
-	Ruby/NArray  ver 0.6.0.0 (2011-08-27)	by Masahiro TANAKA
-
-* Ruby/NArrayの特徴。
-
-  + Rubyで、高速な数値計算が可能。
-  + 要素には、8,16,32 bit 整数、単精度/倍精度の実数/複素数、
-    および Rubyオブジェクトをサポート。
-  + 部分配列の取出し、代入も容易。
-    要素位置の指定には、数値、範囲、インデックスの配列が使用可能。
-  + +,-,*,/,%,** や 算術関数の演算は、要素-対-要素でおこなう。
-  + 配列同士の演算・代入は、各次元のサイズが同じであることが必要。
-    ただし、サイズが1の次元は、他方の配列のサイズに合わせて
-    「繰り返し」同じ要素が適用される。
-  + FFTW (高速フーリエ変換) version 3 は次のモジュールでサポート。
-  + NImage (X11イメージ表示) クラス附属。(nimage/ ディレクトリ参照)
-  + Ruby/PGPLOT (グラフィックスライブラリ、別悃) にて
-     XYグラフ、ヒストグラム、等高線、イメージ表示可能。
-  + 数値計算・画像処理・データ解析など幅広い応用が可能(と思う)。
-
-* 類似品
-
-  + Python/NumPy, Perl/PDL, Yorick, IDL
-
-* 不十分な点
-
-  + メソッドが不足。
-  + バグ出しが不十分。
-  + ドキュメントがない。
-
-* インストール方法
-
-  Rubyの標準的な拡張ライブラリと同じです。ソースを展開したディレクトリで、
-
-    ruby extconf.rb
-    make
-    make install
-
-  と実行します。
-
-* 動作確認
-
-  ruby 1.9.2p180 (2011-02-18 revision 30909) [x86_64-linux]
-  gcc version 4.5.1 20100924 (Red Hat 4.5.1-4) (GCC)
-
-* 配布条件
-
-  Rubyのライセンスに準拠します。
-
-* 著者
-
-  田中昌宏
-  ご意見，バグレポートその他は masa16.tanaka@gmail.com までお願いします。