narray 0.5.9.5 → 0.5.9.6

data/src/ChangeLog

@@ -1,3 +1,16 @@
+2008-11-05  Masahiro TANAKA  <masa16.tanaka at gmail.com>
+
+	* work with ruby 1.9.1 preview1
+	  - use RARRAY_*** macros instead of struct RArray.
+	  - follow changes in Complex feature.
+	  - change oprator arg of coerce_rev func : id -> symbol
+	  - modify test scripts.
+
+	* na_array.c (na_do_mdai):
+	  - bug fix in counting narray's rank.
+
+	* ver 0.5.9p6
+
 2008-06-10  Masahiro TANAKA  <masa16.tanaka at gmail.com>
 
 	* bench/: new sophisticated benchmark script.

data/src/README.ja

@@ -51,12 +51,3 @@
 
   $BEDCf>;9((B
   $B$40U8+!$%P%0%l%]!<%H$=$NB>$O(B masa16.tanaka@gmail.com $B$^$G$*4j$$$7$^$9!#(B
-
-* $B<U<-(B
-
-  $B$^$D$b$H$f$-$R$m(B $B$5$s(B $B$r$O$8$a$H$9$k(BRuby$B3+H/<T$N$_$J$5$^(B for Ruby
-
-  $B0KF#(B $B>4B'(B $B$5$s(B for MDArray
-	$B3HD%%i%$%V%i%j$N:n$jJ}$d!"(BArray$B$+$iB?<!85G[Ns$KJQ49$9$kItJ,$r(B
-	$B;29M$K$5$;$F$$$?$@$-$^$7$?!#(B
-

data/src/lib/nmatrix.rb

@@ -14,7 +14,7 @@ class NMatrix < NArray
       return super(NArray.refer(other))
     when NArray
       unless other.instance_of?(NArray)
-        return other.coerce_rev( self, :+.to_i )
+        return other.coerce_rev( self, :+ )
       end
     end
     raise TypeError,"Illegal operation: NMatrix + %s" % other.class
@@ -26,7 +26,7 @@ class NMatrix < NArray
       return super(NArray.refer(other))
     when NArray
       unless other.instance_of?(NArray)
-        return other.coerce_rev( self, :-.to_i )
+        return other.coerce_rev( self, :- )
       end
     end
     raise TypeError,"Illegal operation: NMatrix - %s" % other.class
@@ -44,7 +44,7 @@ class NMatrix < NArray
       if other.instance_of?(NArray)
 	NMatrix.mul( NArray.refer(self), other.newdim(0,0) )
       else
-	other.coerce_rev( self, :*.to_i )
+	other.coerce_rev( self, :* )
       end
     when Numeric
       super
@@ -66,7 +66,7 @@ class NMatrix < NArray
       if other.instance_of?(NArray)
 	NMatrix.div( NArray.refer(self), other.newdim(0,0) )
       else
-	other.coerce_rev( self, :/.to_i )
+	other.coerce_rev( self, :/ )
       end
     when Numeric
       NMatrix.div( NArray.refer(self), other )
@@ -97,14 +97,14 @@ class NMatrix < NArray
 
   def coerce_rev(other,id)
     case id
-    when :*.to_i
+    when :*
 	if other.instance_of?(NArray)
 	  return NMatrix.mul( other.newdim(0,0), self )
 	end
 	if other.instance_of?(NArrayScalar)
 	  return NMatrix.mul( other.newdim(0), self )
 	end
-    when :/.to_i
+    when :/
 	if other.instance_of?(NArray)
 	  return NMatrix.mul( other.newdim(0,0), self.inverse )
 	end
@@ -163,7 +163,7 @@ class NVector < NArray
       return super(NArray.refer(other))
     when NArray
       unless other.instance_of?(NArray)
-        return other.coerce_rev( self, :+.to_i )
+        return other.coerce_rev( self, :+ )
       end
     end
     raise TypeError,"Illegal operation: NVector + %s" % other.class
@@ -175,7 +175,7 @@ class NVector < NArray
       return super(NArray.refer(other))
     when NArray
       unless other.instance_of?(NArray)
-        return other.coerce_rev( self, :-.to_i )
+        return other.coerce_rev( self, :- )
       end
     end
     raise TypeError,"Illegal operation: NVector - %s" % other.class
@@ -191,7 +191,7 @@ class NVector < NArray
       if other.instance_of?(NArray)
 	NVector.mul( NArray.refer(self), other.newdim(0) )
       else
-	other.coerce_rev( self, :*.to_i )
+	other.coerce_rev( self, :* )
       end
     when Numeric
       NVector.mul( NArray.refer(self), other )
@@ -210,7 +210,7 @@ class NVector < NArray
       if other.instance_of?(NArray)
 	NVector.div( NArray.refer(self), other.newdim(0) )
       else
-	other.coerce_rev( self, :/.to_i )
+	other.coerce_rev( self, :/ )
       end
     when Numeric
       NVector.div( NArray.refer(self), other )
@@ -229,7 +229,7 @@ class NVector < NArray
 
   def coerce_rev(other,id)
     case id
-    when :*.to_i
+    when :*
 	if other.instance_of?(NArray)
 	  return NVector.mul( other.newdim(0), self )
 	end

data/src/na_array.c

@@ -152,14 +152,14 @@ static int
 {
   int i, j, len, length, start, dir;
   VALUE v;
-  struct RArray *ary;
+  VALUE ary;
 
-  ary = RARRAY(mdai->item[rank-1].val);
-  len = ary->len;
+  ary = mdai->item[rank-1].val;
+  len = RARRAY_LEN(ary);
 
-  for (i=0; i < ary->len; ++i) {
+  for (i=0; i < RARRAY_LEN(ary); ++i) {
 
-    v = ary->ptr[i];
+    v = RARRAY_PTR(ary)[i];
 
     if (TYPE(v) == T_ARRAY) {
       /* check recursive array */
@@ -196,7 +196,7 @@ static int
 	  if ( rank+na->rank > mdai->n ) {
 	    na_realloc_mdai(mdai,((na->rank-1)/4+1)*4);
 	  }
-	  for ( j=na->rank, r=rank; --j > 0  ; ++r ) {
+	  for ( j=na->rank, r=rank; j-- > 0  ; ++r ) {
 	    if ( mdai->item[r].shape < na->shape[j] )
 	      mdai->item[r].shape = na->shape[j];
 	  }
@@ -269,15 +269,15 @@ static void
 
 /* copy Array to NArray */
 static void
- na_copy_ary_to_nary( struct RArray *ary, struct NARRAY *na,
+ na_copy_ary_to_nary( VALUE ary, struct NARRAY *na,
 		      int thisrank, int *idx, int type )
 {
   int i, j, pos, len, start, step, dir;
   VALUE v;
 
   if (thisrank==0) {
-    for (i = idx[0] = 0; i < ary->len; ++i) {
-      v = ary->ptr[i];
+    for (i = idx[0] = 0; i < RARRAY_LEN(ary); ++i) {
+      v = RARRAY_PTR(ary)[i];
       if (rb_obj_is_kind_of(v, rb_cRange)) {
 	na_range_to_sequence(v,&len,&start,&dir);
 	if (len>0) {
@@ -299,10 +299,10 @@ static void
   }
   else /* thisrank > 0 */
   { 
-    for (i = idx[thisrank] = 0; i < ary->len; ++i) {
-      v = ary->ptr[i];
+    for (i = idx[thisrank] = 0; i < RARRAY_LEN(ary); ++i) {
+      v = RARRAY_PTR(ary)[i];
       if (TYPE(v) == T_ARRAY) {
-	na_copy_ary_to_nary(RARRAY(v),na,thisrank-1,idx,type);
+	na_copy_ary_to_nary(v,na,thisrank-1,idx,type);
 	if (idx[thisrank-1]>0) ++idx[thisrank];
       }
       else if (IsNArray(v)) {
@@ -325,7 +325,7 @@ static void
 	}
 	else {
 	  pos = na_index_pos(na,idx);
-	  SetFuncs[type][NA_ROBJ]( 1, NA_PTR(na,pos), 0, ary->ptr+i, 0 );
+	  SetFuncs[type][NA_ROBJ]( 1, NA_PTR(na,pos), 0, &(RARRAY_PTR(ary)[i]), 0 );
 	  ++idx[thisrank];
 	}
 	/* copy here */
@@ -346,7 +346,7 @@ static VALUE
   VALUE v;
 
   /* empty array */
-  if (RARRAY(ary)->len < 1) {
+  if (RARRAY_LEN(ary) < 1) {
     return na_make_empty( type, klass );
   }
 
@@ -380,7 +380,7 @@ static VALUE
   idx = ALLOCA_N(int,rank);
   for (i=0; i<rank; ++i) idx[i]=0;
 
-  na_copy_ary_to_nary( RARRAY(ary), na, rank-1, idx, type );
+  na_copy_ary_to_nary( ary, na, rank-1, idx, type );
 
   return v;
 }

data/src/na_func.c

@@ -607,7 +607,7 @@ static VALUE
 
     if (klass==Qnil) { /* coerce_rev */
       if ((id=na_bifunc_to_id(funcs))!=0)
-	return rb_funcall( obj2, na_id_coerce_rev, 2, obj1, INT2FIX(id) );
+	return rb_funcall( obj2, na_id_coerce_rev, 2, obj1, ID2SYM(id) );
       else
 	klass = cNArray;
     }
@@ -1047,7 +1047,7 @@ static int
       r = NUM2INT(v);
       if (r<0) r += rankc;     /* negative for from end */
       if (r<0 || r>=rankc)
-        rb_raise(rb_eArgError, "rank %d out of range", r);
+        rb_raise(rb_eArgError, "rank %ld out of range", r);
       if (flag)
 	rankv[c] = r;
       else

data/src/na_linalg.c

@@ -266,11 +266,14 @@ static int
   int status, size, n=shape[0];
 
   if (type==NA_ROBJ) {
+    VALUE *mem;
+    int i;
     size = n*2+1;
-    val = rb_ary_new2(size);
-    rb_mem_clear(RARRAY(val)->ptr,size);
-    RARRAY(val)->len = size;
-    buf = (char*)((RARRAY(val))->ptr);
+    mem = ALLOC_N(VALUE, size);
+    for (i=0; i<size; i++) mem[i] = Qnil;
+    val = rb_ary_new4(size, mem);
+    xfree(mem);
+    buf = (char*)((RARRAY_PTR(val)));
     status = na_lu_fact_func_body( ni, a, idx, shape, type, buf );
   } else {
     size = na_sizeof[type]*n + na_sizeof[na_cast_real[type]]*(n+1);
@@ -427,11 +430,14 @@ na_lu_solve_func( int ni,
   int size;
 
   if (type==NA_ROBJ) {
+    VALUE *mem;
+    int i;
     size = shape[1];
-    val = rb_ary_new2(size);
-    rb_mem_clear(RARRAY(val)->ptr,size);
-    RARRAY(val)->len = size;
-    buf = (char*)((RARRAY(val))->ptr);
+    mem = ALLOC_N(VALUE, size);
+    for (i=0; i<size; i++) mem[i] = Qnil;
+    val = rb_ary_new4(size, mem);
+    xfree(mem);
+    buf = (char*)((RARRAY_PTR(val)));
     na_lu_solve_func_body( ni, x, ps1, a, ps2, shape, type, buf );
   } else {
     size = shape[1] * na_sizeof[type];

data/src/narray.c

@@ -24,6 +24,7 @@ ID na_id_add, na_id_sbt, na_id_mul, na_id_div, na_id_mod;
 ID na_id_real, na_id_imag;
 ID na_id_coerce_rev;
 ID na_id_new;
+ID na_id_Complex;
 static ID na_id_to_i, na_id_usec, na_id_now;
 
 const int na_sizeof[NA_NTYPES+1] = {
@@ -775,7 +776,7 @@ static VALUE
   struct NARRAY *ary;
   int i;
   char buf[256];
-  char *classname;
+  const char *classname;
   char *ref = "%s(ref).%s(%i";
   char *org = "%s.%s(%i";
 
@@ -1061,7 +1062,7 @@ static VALUE
 static VALUE
  na_where(VALUE self)
 {
-  return RARRAY( na_where2(self) )->ptr[0];
+  return RARRAY_PTR( na_where2(self) )[0];
 }
 
 
@@ -1271,7 +1272,7 @@ void
     na_id_end  	= rb_intern("end");
     na_id_exclude_end	= rb_intern("exclude_end?");
     na_id_real 	= rb_intern("real");
-    na_id_imag	= rb_intern("image");
+    na_id_imag	= rb_intern("imag");
     na_id_new  	= rb_intern("new");
     na_id_to_i 	= rb_intern("to_i");
     na_id_usec 	= rb_intern("usec");
@@ -1288,6 +1289,7 @@ void
     na_id_div   = rb_intern("/");
     na_id_mod   = rb_intern("%");
     na_id_coerce_rev = rb_intern("coerce_rev");
+    na_id_Complex = rb_intern("Complex");
 
     na_id_class_dim = rb_intern("CLASS_DIMENSION");
 

data/src/narray.h

@@ -19,8 +19,8 @@
 # include <sys/types.h>
 #endif
 
-#define NARRAY_VERSION "0.5.9p5"
-#define NARRAY_VERSION_CODE 595
+#define NARRAY_VERSION "0.5.9p6"
+#define NARRAY_VERSION_CODE 596
 
 /*
   Data types used in NArray :

data/src/narray_local.h

@@ -92,6 +92,7 @@ extern ID na_id_add, na_id_sbt, na_id_mul, na_id_div, na_id_mod;
 extern ID na_id_real, na_id_imag;
 extern ID na_id_coerce_rev;
 extern ID na_id_new;
+extern ID na_id_Complex;
 
 extern const int na_upcast[NA_NTYPES][NA_NTYPES];
 extern const int na_no_cast[NA_NTYPES];
@@ -128,7 +129,7 @@ int   na_shrink_class(int class_dim, int *shrink);
 VALUE na_shrink_rank(VALUE obj, int class_dim, int *shrink);
 
 #define rb_complex_new(r,i) \
-  rb_funcall(cComplex, na_id_new, 2, rb_float_new(r), rb_float_new(i))
+  rb_funcall(rb_mKernel, na_id_Complex, 2, rb_float_new(r), rb_float_new(i))
 
 
 typedef union {
@@ -208,3 +209,9 @@ typedef union {
 #if !defined RSTRING_PTR
 #define RSTRING_PTR(a) RSTRING(a)->ptr
 #endif
+#if !defined RARRAY_LEN
+#define RARRAY_LEN(a) RARRAY(a)->len
+#endif
+#if !defined RARRAY_PTR
+#define RARRAY_PTR(a) RARRAY(a)->ptr
+#endif

data/src/test/testmask.rb

@@ -2,14 +2,14 @@ require "narray"
 
 a = NArray.byte(10)
 a[2..4] = 1
-p a.type, a.count_true, a.count_false
+p a.class, a.count_true, a.count_false
 
 begin
    a = NArray.float(10)
    a[2..4] = 1
-   p a.type, a.count_true, a.count_false
+   p a.class, a.count_true, a.count_false
 rescue
-   print a.type," -- Exception raised as expected. The message was: ", $!,"\n"
+   print a.class," -- Exception raised as expected. The message was: ", $!,"\n"
 end
 
 #-------------------

data/src/test/testmatrix2.rb

@@ -1,33 +1,42 @@
 require 'narray'
-require 'irb/xmp'
+#require 'irb/xmp'
 # xmp :: http://www.ruby-lang.org/en/raa-list.rhtml?name=xmp
+def xp(s)
+  begin
+    puts s+" #=>"
+    p eval(s)
+  rescue
+    puts $!
+  end
+  puts
+end
 
-m1 = NMatrix.float(2,2).indgen!
-m2 = NMatrix[[0,1.2],[1.5,0]]
+$m1 = NMatrix.float(2,2).indgen!
+$m2 = NMatrix[[0,1.2],[1.5,0]]
 
-v1 = NVector[0.5,1.5]
-v2 = NVector.float(2,2).indgen!
+$v1 = NVector[0.5,1.5]
+$v2 = NVector.float(2,2).indgen!
 
-a  = NArray.float(2,2).indgen!
+$a  = NArray.float(2,2).indgen!
 
-xmp 'm1'
-xmp 'm1.inverse'
-xmp 'm2'
-xmp 'm1*m2'
-xmp 'm2*m1'
-xmp 'm1+m2'
-xmp '3.14*m1'
-xmp 'm2*1.25'
-xmp 'v1'
-xmp 'v2'
-xmp '1.25*v1'
-xmp 'NMath.sqrt(v2**2)'
-xmp 'v1*v2'
-xmp 'm1*v1'
-xmp 'v2*m2'
-xmp 'm1.diagonal([98,99])'
-xmp 'NMatrix.float(4,3).unit'
+xp '$m1'
+xp '$m1.inverse'
+xp '$m2'
+xp '$m1*$m2'
+xp '$m2*$m1'
+xp '$m1+$m2'
+xp '3.14*$m1'
+xp '$m2*1.25'
+xp '$v1'
+xp '$v2'
+xp '1.25*$v1'
+xp 'NMath.sqrt($v2**2)'
+xp '$v1*$v2'
+xp '$m1*$v1'
+xp '$v2*$m2'
+xp '$m1.diagonal([98,99])'
+xp 'NMatrix.float(4,3).unit'
 
 puts "\n=== following will fail ...\n"
-xmp 'm1+v1'
-xmp 'm1+1'
+xp '$m1+$v1'
+xp '$m1+1'

data/src/test/testmatrix3.rb

@@ -1,11 +1,11 @@
 require 'narray'
 require 'rational'
 
-class Rational
-  def inspect
-    @numerator.to_s+"/"+@denominator.to_s
-  end
-end
+#class Rational
+#  def inspect
+#    @numerator.to_s+"/"+@denominator.to_s
+#  end
+#end
 
 srand(1)
 n=5

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: narray
 version: !ruby/object:Gem::Version 
-  version: 0.5.9.5
-date: 2008-06-10 00:00:00 +09:00
+  version: 0.5.9.6
+date: 2008-11-05 00:00:00 +09:00
 summary: N-dimensional Numerical Array class for Ruby
 require_paths: 
 - .