narray 0.5.9.4 → 0.5.9.5

data/src/na_linalg.c

@@ -1,7 +1,7 @@
 /*
  * na_linalg.c
  * Numerical Array Extention for Ruby
- *   (C) Copyright 2000-2002 by Masahiro TANAKA
+ *   (C) Copyright 2000-2008 by Masahiro TANAKA
  */
 #include <ruby.h>
 #include "narray.h"
@@ -70,7 +70,7 @@ na_loop_linalg( int nd, char *p1, char *p2, char *p3,
   for(;;) {
     /* set pointers */
     while (i > 0) {
-      i--;
+      --i;
       s3[i].p = s3[i].pbeg + s3[i+1].p;
       s2[i].p = s2[i].pbeg + s2[i+1].p;
       s1[i].p = s1[i].pbeg + s1[i+1].p;
@@ -94,7 +94,7 @@ na_shape_total( int n, int *shape )
 {
   int total=1;
 
-  for (; n>0; n--)
+  for (; n>0; --n)
     total *= *(shape++);
 
   return total;
@@ -173,12 +173,12 @@ na_lu_fact_func_body(int ni, char *a, char *idx, int *shape, int type, char *buf
     vi = v;
 
     /* v[j] = 1/max( abs( a[i,j] ) ) */
-    for (j=0;j<n;j++) {
+    for (j=0;j<n;++j) {
       f->abs(n, buf, relmsz, aa, felmsz);
 
       r->set(1, amax,0, r->zero,0);
       rtmp = buf;
-      for (i=0;i<n;i++) {
+      for (i=0;i<n;++i) {
 	if (r->sort(rtmp, amax) == 1)
 	  r->set(1, amax,0, rtmp,0);
 	rtmp += relmsz;
@@ -194,20 +194,20 @@ na_lu_fact_func_body(int ni, char *a, char *idx, int *shape, int type, char *buf
     ai0 = a0i = aii = a;
     vi  = v;
 
-    for (i=0;i<n;i++) {
+    for (i=0;i<n;++i) {
 
       f->set(n, buf, felmsz, ai0, rowsz);
 
       aij = buf;
       a0j = a;
       /* a[i,j(<i)]  -=  sum(k<j){ a[i,k]*a[k,j] } */
-      for (j=1;j<i;j++) {
+      for (j=1;j<i;++j) {
 	aij += felmsz;
 	a0j += rowsz;
 	f->mulsbt(j, aij, 0, buf, felmsz, a0j, felmsz);
       }
       /* a[i,j(>=i)]  -=  sum(k<i){ a[i,k]*a[k,j] } */
-      for (  ;j<n;j++) {
+      for (  ;j<n;++j) {
 	aij += felmsz;
 	a0j += rowsz;
 	f->mulsbt(i, aij, 0, buf, felmsz, a0j, felmsz);
@@ -222,7 +222,7 @@ na_lu_fact_func_body(int ni, char *a, char *idx, int *shape, int type, char *buf
       r->set(1, amax,0, r->zero,0);
       rtmp = buf;
       imax = 0;
-      for (j=i;j<n;j++) {
+      for (j=i;j<n;++j) {
 	if (r->sort(rtmp,amax) == 1) {
 	  r->set(1, amax,0, rtmp,0);
 	  imax = j;
@@ -272,7 +272,6 @@ static int
     RARRAY(val)->len = size;
     buf = (char*)((RARRAY(val))->ptr);
     status = na_lu_fact_func_body( ni, a, idx, shape, type, buf );
-    //na_touch_object(val);
   } else {
     size = na_sizeof[type]*n + na_sizeof[na_cast_real[type]]*(n+1);
     buf = ALLOC_N(char, size);
@@ -303,7 +302,7 @@ static VALUE
     rb_raise(rb_eTypeError,"not square matrix");
 
   total=1;
-  for (i=2; i<ary->rank; i++)
+  for (i=2; i<ary->rank; ++i)
     total *= ary->shape[i];
 
   piv = na_make_object(NA_LINT, ary->rank-1, ary->shape+1, cNVector);
@@ -312,7 +311,7 @@ static VALUE
   func = IndGenFuncs[NA_LINT];
   sz   = na_sizeof[NA_LINT];
   ptr  = idx = ((struct NARRAY *)DATA_PTR(piv))->ptr;
-  for (i=0; i<total; i++) {
+  for (i=0; i<total; ++i) {
     func(n,ptr,sz,0,1);
     ptr += n*sz;
   }
@@ -345,9 +344,9 @@ na_lu_pivot_func( int ni,
   n = shape[1];
   sz = f->elmsz * shape[0];
 
-  for (; ni>0; ni--) {
+  for (; ni>0; --ni) {
     xi = x;
-    for (i=0; i<n; i++) {
+    for (i=0; i<n; ++i) {
       memcpy(xi, y+((int32_t*)idx)[i]*sz, sz);
       xi += sz;
     }
@@ -374,11 +373,11 @@ na_lu_solve_func_body( int ni,
   int matsz = rowsz * n;
   int diagsz = rowsz + sz;
 
-  for (; ni>0; ni--) {
+  for (; ni>0; --ni) {
 
     xx = x;
 
-    for (k=shape[0]; k>0; k--) { /* once if x is vector */
+    for (k=shape[0]; k>0; --k) { /* once if x is vector */
 
       f->set(n, buf,sz, xx,xsz);
 
@@ -386,7 +385,7 @@ na_lu_solve_func_body( int ni,
       a0i = a;
 
       /* solve Lx' = y' */
-      for (i=1; i<n; i++) {
+      for (i=1; i<n; ++i) {
 	/* x[i] -= a[j(<i),i] * x[j(<i)] */
 	xi  += sz;
 	a0i += rowsz;
@@ -398,7 +397,7 @@ na_lu_solve_func_body( int ni,
 
       /* solve Ux = x' */
       f->div(1, xi,0, aii,0);
-      for (i=n-1; i>0; i--) {
+      for (i=n-1; i>0; --i) {
 	xi  -= sz;
 	aii -= diagsz;
 	/* x[i] -= a[j(>i),i] * x[j(>i)] */
@@ -434,7 +433,6 @@ na_lu_solve_func( int ni,
     RARRAY(val)->len = size;
     buf = (char*)((RARRAY(val))->ptr);
     na_lu_solve_func_body( ni, x, ps1, a, ps2, shape, type, buf );
-    //na_touch_object(val);
   } else {
     size = shape[1] * na_sizeof[type];
     buf = ALLOC_N(char, size);
@@ -454,13 +452,13 @@ na_shape_max2(int ndim, int *shape, int n1, int *shape1, int n2, int *shape2)
     NA_SWAP(shape1,shape2,tmp);
   }
 
-  for (i=0; i<n2; i++) {
+  for (i=0; i<n2; ++i) {
     shape[i] = NA_MAX(shape1[i],shape2[i]);
   }
-  for (   ; i<n1; i++) {
+  for (   ; i<n1; ++i) {
     shape[i] = shape1[i];
   }
-  for (   ; i<ndim; i++) {
+  for (   ; i<ndim; ++i) {
     shape[i] = 1;
   }
 }
@@ -515,9 +513,8 @@ na_lu_solve(VALUE self, volatile VALUE other)
     memcpy(shape,a2->shape+1,sizeof(int)*(ndim-1));
     xfree(a2->shape);
     a2->shape = shape;
-    a2->rank--;
+    --(a2->rank);
   }
-  //na_touch_object(other,lu);
   return obj;
 }
 
@@ -547,7 +544,7 @@ na_lu_init(VALUE self, VALUE lu, VALUE piv)
     rb_raise(rb_eRuntimeError,"LU matrix (%i,%i) is not square",
 	     l->shape[0], l->shape[1]);
 
-  for (i=1; i<l->rank; i++)
+  for (i=1; i<l->rank; ++i)
     if (l->shape[i] != p->shape[i-1])
       rb_raise(rb_eRuntimeError,"array size mismatch %i!=%i at %i",
 	       l->shape[i], p->shape[i-1], i);
@@ -569,7 +566,7 @@ void Init_na_linalg()
   static VALUE onev = INT2FIX(1);
   char *a = malloc(NA_NTYPES*sizeof(dcomplex)*2);
 
-  for (i=1;i<NA_NTYPES;i++) {
+  for (i=1;i<NA_NTYPES;++i) {
     sz = na_funcset[i].elmsz = na_sizeof[i];
     sz = (sz>sizeof(int)) ? sz : sizeof(int);
     SetFuncs[i][NA_LINT](1, a,0, &one, 0);

data/src/na_random.c

@@ -1,15 +1,12 @@
 /*
   na_random.c
   Numerical Array Extention for Ruby
-    (C) Copyright 2003 by Masahiro TANAKA
+    (C) Copyright 2003-2008 by Masahiro TANAKA
 
   This program is free software.
   You can distribute/modify this program
   under the same terms as Ruby itself.
   NO WARRANTY.
-
-  This is based on ruby/random.c
-    Copyright (C) 1993-2003 Yukihiro Matsumoto
 */
 
 /* 
@@ -85,7 +82,7 @@ static void
 {
     int j;
     state[0]= s & 0xffffffffUL;
-    for (j=1; j<N; j++) {
+    for (j=1; j<N; ++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   */
@@ -109,10 +106,10 @@ 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]);
@@ -204,7 +201,7 @@ static int n_bits(int32_t a)
   xu = 1<<(n+1);
   xl = 0;
 
-  for (i=n; i>=0; i--) {
+  for (i=n; i>=0; --i) {
     m = ~((1<<(x-1))-1);
 
     if (m & a) {
@@ -252,12 +249,12 @@ static void RndB(int n, char *p1, int i1, double rmax)
   shift = 32 - n_bits(max);
 
   if (max<1) {
-    for (; n; n--) {
+    for (; n; --n) {
       *(u_int8_t*)p1 = 0;
       p1+=i1;
     }
   } else {
-    for (; n; n--) {
+    for (; n; --n) {
       do {
 	genrand(y);
 	y >>= shift;
@@ -279,12 +276,12 @@ static void RndI(int n, char *p1, int i1, double rmax)
   shift = 32 - n_bits(max);
 
   if (max<1) {
-    for (; n; n--) {
+    for (; n; --n) {
       *(int16_t*)p1 = 0;
       p1+=i1;
     }
   } else {
-    for (; n; n--) {
+    for (; n; --n) {
       do {
 	genrand(y);
 	y >>= shift;
@@ -306,12 +303,12 @@ static void RndL(int n, char *p1, int i1, double rmax)
   shift = 32 - n_bits(max);
 
   if (max<1) {
-    for (; n; n--) {
+    for (; n; --n) {
       *(int32_t*)p1 = 0;
       p1+=i1;
     }
   } else {
-    for (; n; n--) {
+    for (; n; --n) {
       do {
 	genrand(y);
 	y >>= shift;
@@ -326,7 +323,7 @@ static void RndF(int n, char *p1, int i1, double rmax)
 {
   u_int32_t y;
 
-  for (; n; n--) {
+  for (; n; --n) {
     genrand(y);
     *(float*)p1 = rand_single(y) * rmax;
     p1+=i1;
@@ -337,7 +334,7 @@ static void RndD(int n, char *p1, int i1, double rmax)
 {
   u_int32_t x,y;
 
-  for (; n; n--) {
+  for (; n; --n) {
     genrand(x);
     genrand(y);
     *(double*)p1 = rand_double(x,y) * rmax;
@@ -349,7 +346,7 @@ static void RndX(int n, char *p1, int i1, double rmax)
 {
   u_int32_t y;
 
-  for (; n; n--) {
+  for (; n; --n) {
     genrand(y);
     ((scomplex*)p1)->r = rand_single(y) * rmax;
     ((scomplex*)p1)->i = 0;
@@ -361,7 +358,7 @@ static void RndC(int n, char *p1, int i1, double rmax)
 {
   u_int32_t x,y;
 
-  for (; n; n--) {
+  for (; n; --n) {
     genrand(x);
     genrand(y);
     ((dcomplex*)p1)->r = rand_double(x,y) * rmax;

data/src/narray.c

@@ -1,7 +1,7 @@
 /*
   narray.c
   Numerical Array Extention for Ruby
-    (C) Copyright 1999-2003 by Masahiro TANAKA
+    (C) Copyright 1999-2008 by Masahiro TANAKA
 
   This program is free software.
   You can distribute/modify this program
@@ -79,7 +79,7 @@ static void
   VALUE *ptr;
 
   ptr = (VALUE*) ary->ptr;
-  for (i=ary->total; i>0; i--)
+  for (i=ary->total; i>0; --i)
     rb_gc_mark(*ptr++);
 }
 
@@ -120,7 +120,7 @@ struct NARRAY*
   int i, memsz;
   struct NARRAY *ary;
 
-  for (i=0; i<rank; i++)
+  for (i=0; i<rank; ++i)
     total *= shape[i];
 
   if (rank<=0 || total<=0) {
@@ -148,7 +148,7 @@ struct NARRAY*
     ary->rank  = rank;
     ary->total = total;
     ary->type  = type;
-    for (i=0; i<rank; i++)
+    for (i=0; i<rank; ++i)
       ary->shape[i] = shape[i];
   }
   ary->ref = Qtrue;
@@ -278,7 +278,7 @@ struct NARRAY*
   ary->rank  = orig->rank;
   ary->total = orig->total;
   ary->type  = orig->type;
-  for (i=0; i<orig->rank; i++)
+  for (i=0; i<orig->rank; ++i)
     ary->shape[i] = orig->shape[i];
   ary->ref   = obj;
 
@@ -310,14 +310,6 @@ static VALUE
 }
 
 
-/*
-void
- na_touch_object(VALUE val, ...)
-{
-  return;
-}
-*/
-
 void
  na_clear_data(struct NARRAY *ary)
 {
@@ -340,7 +332,7 @@ static VALUE
     rb_raise(rb_eArgError, "Argument required");
 
   shape = ALLOCA_N(int,argc);
-  for (i=0; i<argc; i++) shape[i]=NUM2INT(argv[i]);
+  for (i=0; i<argc; ++i) shape[i]=NUM2INT(argv[i]);
 
   v = na_make_object(type,argc,shape,klass);
   GetNArray(v,ary);
@@ -375,7 +367,7 @@ int
     return na->type;
   }
   if (TYPE(v)==T_STRING) {
-    for (i=1; i<NA_NTYPES; i++) {
+    for (i=1; i<NA_NTYPES; ++i) {
       if ( !strncmp( RSTRING_PTR(v), na_typestring[i], RSTRING_LEN(v)) )
 	return i;
     }
@@ -530,7 +522,7 @@ static VALUE
 
   GetNArray(self,ary);
   shape = ALLOCA_N(VALUE,ary->rank);
-  for (i = 0; i < ary->rank; i++)
+  for (i = 0; i < ary->rank; ++i)
     shape[i] = INT2FIX(ary->shape[i]);
   return rb_ary_new4(ary->rank,shape);
 }
@@ -611,7 +603,7 @@ static VALUE
   }
   else {
     shape = ALLOCA_N(int,rank);
-    for (i=0; i<rank; i++)
+    for (i=0; i<rank; ++i)
       len *= shape[i] = NUM2INT(argv[i+1]);
     len *= na_sizeof[type];
     if ( len != str_len )
@@ -651,7 +643,7 @@ static VALUE
   rank = a1->rank+1;
   shape = ALLOCA_N(int,rank);
   shape[0] = na_sizeof[a1->type];
-  for (i=1; i<rank; i++)
+  for (i=1; i<rank; ++i)
     shape[i] = a1->shape[i-1];
 
   v = na_make_object( NA_BYTE, rank, shape, cNArray );
@@ -689,7 +681,7 @@ static VALUE
 static void
  na_to_string_binary(int n, char *p1, int i1, char *p2, int i2)
 {
-  for (; n>0; n--) {
+  for (; n>0; --n) {
     *(VALUE*)p1 = rb_str_new(p2,i2);
     p1+=i1; p2+=i2;
   }
@@ -799,7 +791,7 @@ static VALUE
     sprintf(buf, (ary->ref==Qnil) ? org:ref,
 	    classname, na_typestring[ary->type], ary->shape[0]);
     rb_str_cat(str,buf,strlen(buf));
-    for (i=1; i<ary->rank; i++) {
+    for (i=1; i<ary->rank; ++i) {
       sprintf(buf,",%i",ary->shape[i]);
       rb_str_cat(str,buf,strlen(buf));
     }
@@ -827,8 +819,8 @@ static void
 
   if (argc == 0) {  /* trim ranks of size=1 */
     shape = ALLOCA_N(int,ary->rank+1);
-    for (i=0; i<class_dim; i++) shape[i]=0;
-    for (   ; i<ary->rank; i++) shape[i]=1;
+    for (i=0; i<class_dim; ++i) shape[i]=0;
+    for (   ; i<ary->rank; ++i) shape[i]=1;
     na_shrink_rank( self, class_dim, shape );
     if (ary->rank==0) ary->rank=1;
     return;
@@ -836,7 +828,7 @@ static void
 
   /* get shape from argument */
   shape = ALLOC_N(int,argc);
-  for (i=0; i<argc; i++)
+  for (i=0; i<argc; ++i)
     switch(TYPE(argv[i])) {
     case T_FIXNUM:
       total *= shape[i] = NUM2INT(argv[i]);
@@ -927,19 +919,19 @@ static void
 
   /* count new rank */
   count = ALLOCA_N(int,ary->rank+1);
-  for (i=0; i<=ary->rank; i++)
+  for (i=0; i<=ary->rank; ++i)
     count[i]=0;
-  for (i=0; i<argc; i++) {
+  for (i=0; i<argc; ++i) {
     j = NUM2INT(argv[i]);
     if (j<0)	/* negative rank : -1=>append after last rank */
       j += ary->rank+1;
     if (j<0 || j>ary->rank)  /* range check */
       rb_raise(rb_eArgError, "rank out of range");
-    count[j]++;
+    ++count[j];
   }
   /* extend shape shape */
   shape = ALLOC_N(int,ary->rank+argc);
-  for (j=i=0; i<ary->rank; i++) {
+  for (j=i=0; i<ary->rank; ++i) {
     while (count[i]-->0) shape[j++] = 1;
     shape[j++] = ary->shape[i];
   }
@@ -992,7 +984,6 @@ VALUE na_fill(VALUE self, volatile VALUE val)
   SetFuncs[a1->type][a2->type]( a1->total, 
 				a1->ptr, na_sizeof[a1->type],
 				a2->ptr, 0 );
-  //na_touch_object(val);
   return self;
 }
 
@@ -1039,8 +1030,8 @@ static VALUE
   /* Count true */
   c = ary->ptr;
   n1 = 0;
-  for (i=0; i<n; i++)
-    if (*(c++)) n1++;
+  for (i=0; i<n; ++i)
+    if (*(c++)) ++n1;
 
   n0 = n-n1;
 
@@ -1054,14 +1045,13 @@ static VALUE
 
   /* Get Indices */
   c = ary->ptr;
-  for ( i=0; i<n; i++ ) {
+  for ( i=0; i<n; ++i ) {
     if (*(c++))
       *(idx1++) = i;
     else
       *(idx0++) = i;
   }
 
-  //na_touch_object(obj);
   return rb_assoc_new( v1, v0 );
 }