narray 0.5.9.9 → 0.6.0.0

data/src/ChangeLog

@@ -1,3 +1,39 @@
+2011-08-27  Masahiro TANAKA  <masa16.tanaka@gmail.com>
+
+	* narray.c (na_alloc_struct): check array size.
+	* extconf.rb (#install_rb): --export-all option for mingw.
+	* ver 0.6.0.0
+
+2011-02-04  Masahiro TANAKA  <masa16.tanaka@gmail.com>
+
+	* na_func.c (na_prod, na_prod_body, na_cumprod, na_cumprod_bang):
+	  New method.
+
+2010-01-04  David MacMahon <davidm at astro.berkeley...>
+
+	* mkop.rb, na_func.c, na_linalg.c, narray_local.h:
+	Add NArray#mod! method
+	Also adds NArray#mod as an alias for NArray#%.
+
+2010-01-04  David MacMahon <davidm at astro.berkeley...>
+
+	* mkop.rb: Fix divide-by-zero bug in % operator
+	Prior to this fix, the following would crash Ruby with a floating point
+	exception (at least on Mac OS X 10.6)...
+	  1 % NArray[0]
+	Now that code raises ZeroDivisionError which can be rescued.
+
+2010-01-04  David MacMahon <davidm at astro.berkeley...>
+
+	* Rakefile: Add Rakefile for easy gem creation
+	Just run "rake gem" to create the gem file in the pkg/ subdirectory.
+	Added .gitignore file to ignore pkg/ subdirectory.
+
+2011-01-04  sgwong
+
+	* extconf.rb: failure due to the change of
+	  $DLDFLAGS in ruby1.9
+
 2010-12-14  Masahiro TANAKA  <masa16.tanaka@gmail.com>
 
 	* lib/nmatrix.rb (NMatrix#diagonal!):

data/src/README.en

@@ -1,4 +1,4 @@
-	Ruby/NArray  ver 0.5.9 (2006-08-09)	by Masahiro TANAKA
+	Ruby/NArray  ver 0.6.0.0 (2011-08-27)	by Masahiro TANAKA
 
 * NArray properties:
 
@@ -15,7 +15,7 @@
 
 * NArray is similar to:
 
-  + Python/NumPy, Perl/PDL, Yorick, IDL 
+  + Python/NumPy, Perl/PDL, Yorick, IDL
 
 * NArray is far from completed!
 
@@ -30,13 +30,12 @@
 
     ruby extconf.rb
     make
-    make site-install
-    (or, make install)
+    make install
 
 * Tested Platform
 
-  ruby 1.8.4 (2005-12-24) [i686-linux]
-  gcc version 4.1.1 20060525 (Red Hat 4.1.1-1)
+  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
 

data/src/README.ja

@@ -1,4 +1,4 @@
-	Ruby/NArray  ver 0.5.9 (2006-08-09)	by Masahiro TANAKA
+	Ruby/NArray  ver 0.6.0.0 (2011-08-27)	by Masahiro TANAKA
 
 * Ruby/NArrayの特徴。
 
@@ -33,15 +33,14 @@
 
     ruby extconf.rb
     make
-    make site-install
-    (または make install)
+    make install
 
   と実行します。
 
 * 動作確認
 
-  ruby 1.8.4 (2005-12-24) [i686-linux]
-  gcc version 4.1.1 20060525 (Red Hat 4.1.1-1)
+  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)
 
 * 配布条件
 

data/src/SPEC.en

@@ -1,5 +1,5 @@
 
-	Ruby/NArray  ver 0.5.9p8 (2010-12-06)	by Masahiro TANAKA
+	Ruby/NArray  ver 0.6.0.0 (2011-08-27)	by Masahiro TANAKA
 
 
 Class method:
@@ -56,7 +56,7 @@ Slicing Array
 			value of each element of mask, the corresponding
 			element in "a" is eliminated (when 0) or
 			retained (when not 0).
-			Example: 
+			Example:
 				a=NArray.float(2,2).indgen!
 				p a[ a.lt 3 ]
 				--> [ 0.0, 1.0, 2.0 ]
@@ -68,8 +68,8 @@ Slicing Array
    e.g.: a[3] is same as a[0,1] if a is 3x3 array.
 
  - self.slice(...)	Same as self[...] but keeps the rank of
-			original array by not elimiting dimensions 
-			whose length became equal to 1 (which self[] 
+			original array by not elimiting dimensions
+			whose length became equal to 1 (which self[]
 			does). This is not the case with the
 			1-dimensional indexing and masking (same as []).
 
@@ -79,7 +79,7 @@ Replacing Elements -- Same rule as slicing
     a[ 0..3, 1..4, 2..5 ] = 2
     a[ [1,3,2,4], true ] = 3
     a[] = 4			Same as a.fill!(4)
-  
+
     a[0..2]  = b[1..5]		--> Error! due to different num of elements.
     a[1,2]   = b[0..2,1..3]	Storing elements from index [1,2]
 				( a[1,2]=b[0,1],a[2,2]=b[1,1],... )
@@ -138,9 +138,9 @@ Comparison
     self.ge other
     self >= other
     self.lt other
-    self <  other 
+    self <  other
     self.le other
-    self <= other 
+    self <= other
 
     self.and other  element-wise condition.
     self.or  other
@@ -158,6 +158,9 @@ Comparison
 
 Statistics
     self.sum(dim,..)     Summation
+    self.cumsum          Cumulative Summation (for 1-d array)
+    self.prod(dim,..)    Product (Multiply elements)
+    self.cumprod         Cumulative Produce (for 1-d array)
     self.mean(dim,..)    Mean
     self.stddev(dim,..)  Standard deviation
     self.rms(dim,..)     Root mean square
@@ -212,9 +215,9 @@ Iteration
 Byte swap
     self.swap_byte	swap byte order
     self.hton		convert to network byte order
-    self.ntoh		
+    self.ntoh
     self.htov		convert to VAX byte order
-    self.vtoh		
+    self.vtoh
 
 Boolean / mask related
     self.count_false	count # of elements whose value == 0 (only for

data/src/SPEC.ja

@@ -1,5 +1,5 @@
 
-	Ruby/NArray  ver 0.5.9p8 (2010-12-06)	by Masahiro TANAKA
+	Ruby/NArray  ver 0.6.0.0 (2011-08-27)	by Masahiro TANAKA
 
 
 クラスメソッド:
@@ -48,10 +48,10 @@
     a[ 0, true ]	a[0, 0..-1] と同じ。
     a[ 0, false ]	aが3次元のとき、a[0,true,true] と同じ。
 			省略された次元すべてにtrueを指定したのと同じ。
-    a[ mask ]		マスキング. mask は長さが a と等しい byte 型 
+    a[ mask ]		マスキング. mask は長さが a と等しい byte 型
 			NArray. mask の各要素の値に応じて、a のそれぞ
 			れは落される(0の場合)か、保持される(0以外の場合)。
-			例: 
+			例:
 				a=NArray.float(2,2).indgen!
 				p a[ a.lt 3 ]
 				--> [ 0.0, 1.0, 2.0 ]
@@ -69,7 +69,7 @@
     a[ 0..3, 1..4, 2..5 ] = 2
     a[ [1,3,2,4], true ] = 3
     a[] = 4			a.fill!(4) と同じ。
-  
+
     a[0..2]  = b[1..5]		--> 要素数が異なるのでエラー。
     a[1,2]   = b[0..2,1..3]	[1,2]を始点として代入。
     a[0..2,0..3]  = b[0..2,1]	繰り返し代入。
@@ -129,7 +129,7 @@
     self.ge other
     self >= other
     self.lt other
-    self <  other 
+    self <  other
     self.le other
     self <= other
 
@@ -147,7 +147,10 @@
 	例: idx_t,idx_f = (a>12).where2
 
 統計
-    self.sum(dim,..)	    指定した次元の和。
+    self.sum(dim,..)	    指定した次元の和
+    self.cumsum	            累積和(1次元配列のみ)
+    self.prod(dim,..)	    指定した次元の積
+    self.cumprod	    累積積(1次元配列のみ)
     self.mean(dim,..)       指定した次元の平均。
     self.stddev(dim,..)     指定した次元の標準偏差(標本標準偏差)。
     self.rms(dim,..)        指定した次元のroot mean square。
@@ -183,7 +186,7 @@
     self.ceil  selfより大きい最小の整数を返す。
     self.round selfにもっとも近い整数を返す。
     self.to_f  値を浮動小数点数に変換する。
-    self.to_i  値を整数に変換する。 
+    self.to_i  値を整数に変換する。
     self.to_a  値をRubyの配列に変換する。
     self.to_s  バイナリデータをそのままRubyの文字列データに変換する。
     self.to_string  各要素を文字列に変換する。
@@ -196,9 +199,9 @@
 バイトスワップ
     self.swap_byte	バイトスワップ
     self.hton		ネットワークバイトオーダーに変換
-    self.ntoh		
+    self.ntoh
     self.htov		VAXバイトオーダーに変換
-    self.vtoh		
+    self.vtoh
 
 Boolean / マスク関係
     self.count_false	値 == 0 の要素数 (byte型のみ)

data/src/depend

@@ -11,4 +11,4 @@ na_math.o: na_math.c narray.h $(hdrdir)/ruby.h
 
 
 cleanall:  clean
-	@$(RM)  na_op.c na_math.c
+	@$(RM) -r na_op.c na_math.c src pkg

data/src/extconf.rb

@@ -46,14 +46,16 @@ if RUBY_VERSION < '1.8'
     end
   end
 else
-  $INSTALLFILES = [['narray.h', '$(archdir)'], ['narray_config.h', '$(archdir)']] 
+  $INSTALLFILES = [['narray.h', '$(archdir)'], ['narray_config.h', '$(archdir)']]
   if /cygwin|mingw/ =~ RUBY_PLATFORM
 	 $INSTALLFILES << ['libnarray.a', '$(archdir)']
   end
 end
 
 if /cygwin|mingw/ =~ RUBY_PLATFORM
-  if RUBY_VERSION > '1.8.0'
+  if RUBY_VERSION >= '1.9.0'
+    $DLDFLAGS << " -Wl,--export-all,--out-implib=libnarray.a"
+  elsif RUBY_VERSION > '1.8.0'
     $DLDFLAGS << ",--out-implib=libnarray.a"
   elsif RUBY_VERSION > '1.8'
     CONFIG["DLDFLAGS"] << ",--out-implib=libnarray.a"
@@ -66,12 +68,6 @@ end
 #$DEBUG = true
 #$CFLAGS = ["-Wall",$CFLAGS].join(" ")
 
-# configure options:
-#  --with-fftw-dir=path
-#  --with-fftw-include=path
-#  --with-fftw-lib=path
-#dir_config("fftw")
-
 srcs = %w(
 narray
 na_array
@@ -97,17 +93,6 @@ have_type("int16_t", header)
 have_type("int32_t", header)
 have_type("u_int32_t", header)
 have_type("uint32_t", header)
-#have_library("m")
-#have_func("sincos")
-#have_func("asinh")
-
-#if have_header("fftw.h")
-#  if have_library("fftw", "fftwnd_create_plan")
-#    srcs.push "na_fftw"
-#  else
-#    $defs.delete "-DHAVE_FFTW_H"
-#  end
-#end
 
 $objs = srcs.collect{|i| i+".o"}
 

data/src/lib/narray_ext.rb

@@ -52,6 +52,47 @@ class NArray
     end
   end
 
+  # delete rows/columns
+  def delete_at(*args)
+    if args.size > self.rank
+      raise ArgumentError, "too many arguments"
+    end
+    shp = self.shape
+    ind = []
+    self.rank.times do |i|
+      n = shp[i]
+      case a=args[i]
+      when Integer
+        a = n+a if a<0
+        raise IndexError, "index(%d) out of range"%[a] if a<0
+        x = [0...a,a+1...n]
+      when Range
+        b = a.first
+        b = n+b if b<0
+        raise IndexError, "index(%s) out of range"%[a] if b<0
+        e = a.last
+        e = n+e if e<0
+        e -= 1 if a.exclude_end?
+        raise IndexError, "index(%s) out of range"%[a] if e<0
+        x = [0...b,e+1...n]
+      when Array
+        x = (0...n).to_a
+        x -= a.map do |j|
+          raise IndexError, "contains non-integer" unless Interger===j
+          (j<0) ? n+j : j
+        end
+      else
+        if a
+          raise ArgumentError, "invalid argument"
+        else
+          x = true
+        end
+      end
+      ind << x
+    end
+    self[*ind]
+  end
+
 # Statistics
   def mean(*ranks)
     if integer?
@@ -163,7 +204,7 @@ class NArray
   #alias randomn! randomn
 
   def randomn!
-    self[]= random
+    self[]= randomn
     self
   end
 
@@ -241,7 +282,7 @@ module FFTW
   def convol(a1,a2)
     n1x,n1y = a1.shape
     n2x,n2y = a2.shape
-    raise "arrays must have same shape" if n1x!=n2x || n1y!=n2y 
+    raise "arrays must have same shape" if n1x!=n2x || n1y!=n2y
     (FFTW.fftw( FFTW.fftw(a1,-1) * FFTW.fftw(a2,-1), 1).real) / (n1x*n1y)
   end
   module_function :convol

data/src/mkop.rb

@@ -186,6 +186,15 @@ mkfuncs('DivU', $data_types, $data_types,
  ["*p1 = rb_funcall(*p1,'/',1,*p2);"]
 )
 
+mkfuncs('ModU', $data_types, $data_types,
+ [nil] +
+ ["if (*p2==0) {na_zerodiv();}
+    *p1 %= *p2;"]*3 +
+ ["*p1 = fmod(*p1, *p2);"]*2 +
+ [nil]*2 +
+ ["*p1 = rb_funcall(*p1,'%',1,*p2);"]
+)
+
 
 # method: imag=
 mkfuncs('ImgSet',$data_types,$real_types,
@@ -506,7 +515,8 @@ mkfuncs('DivB', $data_types, $data_types,
 
 mkfuncs('ModB', $data_types, $data_types,
  [nil] +
- ["*p1 = *p2 % *p3;"]*3 + 
+ ["if (*p3==0) {na_zerodiv();};
+    *p1 = *p2 % *p3;"]*3 +
  ["*p1 = fmod(*p2, *p3);"]*2 + 
  [nil]*2 +
  ["*p1 = rb_funcall(*p2,'%',1,*p3);"]

data/src/na_func.c

@@ -41,7 +41,7 @@ void
 /* initialize slice structure */
 void na_init_slice( struct slice *s, int rank, int *shape, int elmsz )
 {
-  int r, i, b; 
+  int r, i, b;
   na_index_t *idx;
 
   /*
@@ -79,7 +79,7 @@ void na_init_slice( struct slice *s, int rank, int *shape, int elmsz )
     /* set beginning pointers */
     if ( s[r].idx == NULL )
       s[r].pbeg = s[r].stride * s[r].beg * elmsz;
-    else 
+    else
       s[r].pbeg = s[r].idx[0];
   }
 }
@@ -169,7 +169,7 @@ void na_loop_index_ref( struct NARRAY *a1, struct NARRAY *a2,
   int ps2 = s2[0].pstep;
   int *si;
   na_index_t *idx;
-  
+
   /*
   int copy;
   if (a1->type==a2->type && s1[0].step==1 && s2[0].step==1)
@@ -220,7 +220,7 @@ void na_loop_index_ref( struct NARRAY *a1, struct NARRAY *a2,
     /* array2 may have index */
     if ( s2[i].idx == NULL )
       s2[i].p += s2[i].pstep;
-    else 
+    else
       s2[i].p = s2[i+1].p + s2[i].idx[si[i]]; /* * s2[i].pstep; */
   }
 }
@@ -292,12 +292,12 @@ void na_loop_general( struct NARRAY *a1, struct NARRAY *a2,
     /* next point for a1 */
     if ( s1[i].idx == NULL )
       s1[i].p += s1[i].pstep;
-    else 
+    else
       s1[i].p = s1[i+1].p + s1[i].idx[si[i]];
     /* next point for a2 */
     if ( s2[i].idx == NULL )
       s2[i].p += s2[i].pstep;
-    else 
+    else
       s2[i].p = s2[i+1].p + s2[i].idx[si[i]];
   }
 }
@@ -392,7 +392,7 @@ static int
     return 1;
   else if ( ary_sz == 1 )
     return 0;
-  else 
+  else
     rb_raise(rb_eRuntimeError, "Array size mismatch: %i != %i at %i-th dim",
 	     ary_sz, itr_sz, i);
 }
@@ -435,7 +435,7 @@ int
     }
 
     s1[j].n   =
-    s2[j].n   = 
+    s2[j].n   =
     s3[j].n   = shape[i];
 
     s1[j].beg =
@@ -641,7 +641,7 @@ static VALUE
   if (a2->type==NA_ROBJ && a1->type!=NA_ROBJ) {
     obj1 = na_change_type(obj1,NA_ROBJ);
     GetNArray(obj1,a1);
-  } else 
+  } else
   if (!NA_IsCOMPLEX(a1) && NA_IsCOMPLEX(a2)) {
     obj1 = na_upcast_type(obj1,a2->type);
     GetNArray(obj1,a1);
@@ -819,6 +819,10 @@ static VALUE na_div_bang(VALUE obj1, VALUE obj2)
 static VALUE na_mul_bang(VALUE obj1, VALUE obj2)
 { return na_set_func( obj1, obj2, MulUFuncs ); }
 
+/* method: self.mod!(other) */
+static VALUE na_mod_bang(VALUE obj1, VALUE obj2)
+{ return na_set_func( obj1, obj2, ModUFuncs ); }
+
 /* method: self.conj! */
 static VALUE na_conj_bang(VALUE self)
 { return na_set_func( self, self, ConjFuncs ); }
@@ -1230,12 +1234,54 @@ static VALUE
  na_sum(int argc, VALUE *argv, VALUE self)
 { return na_sum_body(argc,argv,self,0); }
 
-/* method: sum( rank, ... ) */
+/* method: accum( rank, ... ) */
 static VALUE
  na_accum(int argc, VALUE *argv, VALUE self)
 { return na_sum_body(argc,argv,self,1); }
 
 
+
+static VALUE
+ na_prod_body(int argc, VALUE *argv, VALUE self, int flag)
+{
+  int *shape, rankc, *rankv, cl_dim;
+  struct NARRAY *a1, *a2;
+  VALUE obj, klass;
+  int32_t one = 1;
+
+  GetNArray(self,a1);
+
+  rankv = ALLOC_N(int,a1->rank*2);
+  rankc = na_arg_to_rank( argc, argv, a1->rank, rankv, 0 );
+
+  shape = &rankv[a1->rank];
+  na_accum_set_shape( shape, a1->rank, a1->shape, rankc, rankv );
+
+  klass  = CLASS_OF(self);
+  cl_dim = na_class_dim(klass);
+  if (flag==0 && cl_dim>0 && na_shrink_class(cl_dim,rankv))
+    klass = cNArray;
+
+  obj = na_make_object(a1->type,a1->rank,shape,klass);
+  GetNArray(obj,a2);
+
+  SetFuncs[a2->type][NA_LINT](a2->total, a2->ptr, na_sizeof[a2->type], &one, 0);
+
+  na_exec_unary( a2, a1, MulUFuncs[a1->type] );
+
+  if (flag==0)
+    obj = na_shrink_rank(obj,cl_dim,rankv);
+
+  xfree(rankv);
+  return obj;
+}
+
+/* method: prod( rank, ... ) */
+static VALUE
+ na_prod(int argc, VALUE *argv, VALUE self)
+{ return na_prod_body(argc,argv,self,0); }
+
+
 static VALUE
  na_mul_add_body(int argc, VALUE *argv, volatile VALUE self, volatile VALUE other,
 		 VALUE wrap_klass, int flag)
@@ -1290,7 +1336,7 @@ static VALUE
 /* method: mul_add( other, rank, ... ) */
 static VALUE
  na_mul_add(int argc, VALUE *argv, VALUE self)
-{ 
+{
   if (argc<2)
     rb_raise(rb_eArgError, "wrong # of arguments (%d for >=2)", argc);
   return na_mul_add_body(argc-1,argv+1,self,argv[0],Qnil,0);
@@ -1345,6 +1391,36 @@ static VALUE
 }
 
 
+/* cumprod!
+ [1 2 3 4 5] -> [1 3 6 10 15]
+*/
+static VALUE
+  na_cumprod_bang(VALUE self)
+{
+  struct NARRAY *a;
+  int step;
+
+  GetNArray(self,a);
+
+  if ( a->rank != 1 )
+    rb_raise( rb_eTypeError, "only for 1-dimensional array" );
+  if ( a->total < 2 )
+    return self; /* do nothing */
+
+  step = na_sizeof[a->type];
+  MulUFuncs[a->type](a->total-1, a->ptr+step,step, a->ptr,step);
+
+  return self;
+}
+
+/* cumprod */
+static VALUE
+  na_cumprod(VALUE self)
+{
+  return na_cumprod_bang(na_clone(self));
+}
+
+
 /*  Copy element of idx=0  from a2 to a1, as start of accumulation */
 /*   a1->rank <= a2->rank is assumed  */
 static void
@@ -1552,6 +1628,7 @@ void Init_na_funcs(void)
   rb_define_method(cNArray, "*",  na_mul, 1);
   rb_define_method(cNArray, "/",  na_div, 1);
   rb_define_method(cNArray, "%",  na_mod, 1);
+  rb_define_alias (cNArray, "mod", "%");
   rb_define_method(cNArray, "&",  na_bit_and, 1);
   rb_define_method(cNArray, "|",  na_bit_or, 1);
   rb_define_method(cNArray, "^",  na_bit_xor, 1);
@@ -1561,6 +1638,7 @@ void Init_na_funcs(void)
   rb_define_method(cNArray, "sbt!", na_sbt_bang, 1);
   rb_define_method(cNArray, "mul!", na_mul_bang, 1);
   rb_define_method(cNArray, "div!", na_div_bang, 1);
+  rb_define_method(cNArray, "mod!", na_mod_bang, 1);
   rb_define_method(cNArray, "imag=",na_imag_set, 1);
 
   rb_define_method(cNArray, "swap_byte", na_swap_byte, 0);
@@ -1607,10 +1685,13 @@ void Init_na_funcs(void)
 
   rb_define_method(cNArray, "sum", na_sum, -1);
   rb_define_method(cNArray, "accum", na_accum, -1);
+  rb_define_method(cNArray, "prod", na_prod, -1);
   rb_define_method(cNArray, "min", na_min, -1);
   rb_define_method(cNArray, "max", na_max, -1);
   rb_define_method(cNArray, "cumsum!", na_cumsum_bang, 0);
   rb_define_method(cNArray, "cumsum", na_cumsum, 0);
+  rb_define_method(cNArray, "cumprod!", na_cumprod_bang, 0);
+  rb_define_method(cNArray, "cumprod", na_cumprod, 0);
   rb_define_method(cNArray, "sort", na_sort, -1);
   rb_define_method(cNArray, "sort!", na_sort_bang, -1);
   rb_define_method(cNArray, "sort_index", na_sort_index, -1);