narray 0.6.0.5 → 0.6.0.7

data/src/ChangeLog

@@ -1,3 +1,16 @@
+2013-02-01  Masahiro TANAKA  <masa16.tanaka@gmail.com>
+
+	* lib/narray_ext.rb: eql? hash methods implemented.
+	* ver 0.6.0.7
+
+2013-01-31  Masahiro TANAKA <masa16.tanaka@gmail.com>
+
+	* na_raondom.c: unuse u_int16_t
+	* mknafunc.rb, mkmath.rb, mkop.rb, na_linalg.c:
+	  bug: duplicated definition of asinh/acosh/atanh,
+	  typecast warning (mingw/mswin)
+	* ver 0.6.0.6
+
 2013-01-30  Masahiro TANAKA  <masa16.tanaka@gmail.com>
 
 	* narray.c (na_check_class_narray):

data/src/SPEC.en

@@ -1,5 +1,5 @@
 
-	Ruby/NArray  ver 0.6.0.0 (2011-08-27)	by Masahiro TANAKA
+	Ruby/NArray  ver 0.6.0.7 (2013-02-01)	by Masahiro TANAKA
 
 
 Class method:
@@ -136,7 +136,7 @@ Bitwise operator (only for integers)
 Comparison
   -- element-wise comparison, results in BYTE-type NArray;
      Note that not true nor false is returned.
-    self.eq other  ( == operator was obsolete after ver 0.5.4 )
+    self.eq other  (distinguish from == operator; see below )
     self.ne other
     self.gt other
     self >  other
@@ -161,6 +161,14 @@ Comparison
 
 	e.g.: idx_t,idx_f = (a>12).where2
 
+Equivalence
+    NArray[1] == NArray[1]      #=> true
+    NArray[1] == NArray[1.0]    #=> true
+    NArray[1].eql? NArray[1]    #=> true
+    NArray[1].eql? NArray[1.0]  #=> false
+    NArray[1].equal? NArray[1]  #=> false
+    a=b=NArray[1]; a.equal? b   #=> true
+
 Statistics
     self.sum(dim,..)     Summation
     self.cumsum          Cumulative Summation (for 1-d array)

data/src/SPEC.ja

@@ -1,5 +1,5 @@
 
-	Ruby/NArray  ver 0.6.0.0 (2011-08-27)	by Masahiro TANAKA
+	Ruby/NArray  ver 0.6.0.7 (2013-02-01)	by Masahiro TANAKA
 
 
 クラスメソッド:
@@ -127,7 +127,7 @@
 比較
   -- 要素ごとに値を比較し、結果をBYTE型 NArrayを返す。
      true/falseでないことに注意。
-    self.eq other  ( ver 0.5.4 以降、== 演算子は廃止しました。)
+    self.eq other ( == とは異なることに注意)
     self.ne other
     self.gt other
     self >  other
@@ -151,6 +151,14 @@
 
 	例: idx_t,idx_f = (a>12).where2
 
+同値性
+    NArray[1] == NArray[1]      #=> true
+    NArray[1] == NArray[1.0]    #=> true
+    NArray[1].eql? NArray[1]    #=> true
+    NArray[1].eql? NArray[1.0]  #=> false
+    NArray[1].equal? NArray[1]  #=> false
+    a=b=NArray[1]; a.equal? b   #=> true
+
 統計
     self.sum(dim,..)	    指定した次元の和
     self.cumsum	            累積和(1次元配列のみ)

data/src/lib/narray_ext.rb

@@ -31,10 +31,29 @@ class NArray
   end
 
   def ==(other)
-    if other.kind_of?(NArray)
-      (shape == other.shape) && eq(other).all?
+    other.kind_of?(NArray) &&
+      shape == other.shape && 
+      eq(other).all?
+  end
+
+  def eql?(other)
+    self.class == other.class &&
+      typecode == other.typecode &&
+      shape == other.shape &&
+      case typecode
+      when NArray::OBJECT
+	to_a.eql? other.to_a
+      else
+	to_s.eql? other.to_s
+      end
+  end
+
+  def hash
+    case typecode
+    when NArray::OBJECT
+      [self.class, to_a].hash
     else
-      false
+      [self.class, typecode, shape, to_s].hash
     end
   end
 

data/src/mkmath.rb

@@ -38,7 +38,6 @@ void sincos(double x, double *s, double *c)
 {
   *s=sin(x); *c=cos(x);
 }
-#endif
 
 #ifndef HAVE_ACOSH
 static double rb_log1p (const double x)
@@ -108,6 +107,7 @@ static double atanh(double x)
    return a;
 }
 #endif
+#endif
 
 static void squareX(scomplex *x) {
   float r=x->r;
@@ -398,8 +398,8 @@ data = [
 ["{ *p1 = log10(*p2); }"]*2 +
 ["{
   log#code(p1,p2);
-  p1->r *= M_LOG10E;
-  p1->i *= M_LOG10E;
+  p1->r *= (typer)M_LOG10E;
+  p1->i *= (typer)M_LOG10E;
 }"]*2 +
 [nil] ],
 
@@ -409,8 +409,8 @@ data = [
 ["{ *p1 = log(*p2)*M_LOG2E; }"]*2 +
 ["{
   log#code(p1,p2);
-  p1->r *= M_LOG2E;
-  p1->i *= M_LOG2E;
+  p1->r *= (typer)M_LOG2E;
+  p1->i *= (typer)M_LOG2E;
 }"]*2 +
 [nil] ],
 

data/src/mknafunc.rb

@@ -61,6 +61,7 @@ def mksetfuncs(name,op,id,funcs)
 	    gsub(/p2->/,"((#{td[j]}*)p2)->").
 	    gsub(/\*p1/,"*(#{td[i]}*)p1").
 	    gsub(/\*p2/,"*(#{td[j]}*)p2").
+	    gsub(/ = /," = (#{tr[i]})").
             gsub(/#id/,id).
             gsub(/#op/,op).
 	    gsub(/typed/,td[i]).
@@ -118,6 +119,7 @@ def mkfuncs(name,t1,t2,func)
 	gsub(/\*p2/,"*(#{t2[i]}*)p2").
 	gsub(/\*p3/,"*(#{t2[i]}*)p3").
 	gsub(/type1/,td[i]).
+	gsub(/typec/,t1[i]).
 	gsub(/typef/,tr[i])
       puts $func_body.
 	gsub(/#name/,name).

data/src/mkop.rb

@@ -206,28 +206,28 @@ mkfuncs('ImgSet',$data_types,$real_types,
 
 mkfuncs('Floor',$int_types,$data_types,[nil] +
  ['copy']*3 + 
- ["*p1 = floor(*p2);"]*2 + 
+ ["*p1 = (typec)floor(*p2);"]*2 + 
  [nil]*3
 )
 
 mkfuncs('Ceil',$int_types,$data_types,[nil] +
  ['copy']*3 + 
- ["*p1 = ceil(*p2);"]*2 + 
+ ["*p1 = (typec)ceil(*p2);"]*2 + 
  [nil]*3
 )
 
 mkfuncs('Round',$int_types,$data_types,[nil] +
  ['copy']*3 + 
 # ["*p1 = floor(*p2+0.5);"]*2 + 
- ["if (*p2 >= 0) *p1 = floor(*p2+0.5);
-     else *p1 = ceil(*p2-0.5);"]*2 + 
+ ["if (*p2 >= 0) *p1 = (typec)floor(*p2+0.5);
+     else *p1 = (typec)ceil(*p2-0.5);"]*2 + 
  [nil]*3
 )
 
 mkfuncs('Abs',$real_types,$data_types,[nil] +
  ["*p1 = *p2;"] + 
  ["*p1 = (*p2<0) ? -*p2 : *p2;"]*4 + 
- ["*p1 = hypot(p2->r, p2->i);"]*2 +
+ ["*p1 = (typec)hypot(p2->r, p2->i);"]*2 +
  ["*p1 = rb_funcall(*p2,na_id_abs,0);"]
 )
 
@@ -324,8 +324,8 @@ $func_body =
 "
 mkfuncs('IndGen',$data_types,[$data_types[3]]*8,
  [nil] +
- ["*p1 = p2;"]*5 +
- ["p1->r = p2;
+ ["*p1 = (typef)p2;"]*5 +
+ ["p1->r = (typef)p2;
    p1->i = 0;"]*2 +
  ["*p1 = INT2FIX(p2);"]
 )

data/src/na_linalg.c

@@ -565,8 +565,8 @@ na_lu_init(VALUE self, VALUE lu, VALUE piv)
 
 void Init_na_linalg()
 {
-  static double tiny_d=1e-15;
-  static float  tiny_f=1e-7;
+  static double tiny_d = 1e-15;
+  static float  tiny_f = (float)1e-7;
   int i, sz;
   int32_t one=1, zero=0;
   static VALUE zerov = INT2FIX(0);

data/src/na_random.c

@@ -271,7 +271,7 @@ static void RndB(int n, char *p1, int i1, double rmax)
 static void RndI(int n, char *p1, int i1, double rmax)
 {
   u_int32_t y;
-  u_int16_t max;
+  u_int32_t max;
   int shift, sign=1;
 
   if ( rmax < 0 ) { rmax = -rmax; sign = -1; }

data/src/narray.h

@@ -23,8 +23,8 @@
 # include <sys/types.h>
 #endif
 
-#define NARRAY_VERSION "0.6.0.5"
-#define NARRAY_VERSION_CODE 605
+#define NARRAY_VERSION "0.6.0.7"
+#define NARRAY_VERSION_CODE 607
 
 /*
   Data types used in NArray :

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: narray
 version: !ruby/object:Gem::Version
-  version: 0.6.0.5
+  version: 0.6.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies: []
 description: Numerical N-dimensional Array class
 email: masa16.tanaka@gmail.com