Mercurial > hg > octave-lyh

changeset 5523:451ad352b288

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2005-10-31 03:18:21 by jwe]
author jwe
date Mon, 31 Oct 2005 03:18:22 +0000
parents 98691610b386
children 79d833090bdc
files liboctave/CNDArray.h liboctave/ChangeLog liboctave/boolNDArray.h liboctave/chNDArray.h liboctave/dNDArray.h liboctave/mx-inlines.cc
diffstat 6 files changed, 111 insertions(+), 108 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/CNDArray.h
+++ b/liboctave/CNDArray.h
@@ -34,7 +34,7 @@
 ComplexNDArray : public MArrayN<Complex>
 {
 public:
-  
+
   ComplexNDArray (void) : MArrayN<Complex> () { }
 
   ComplexNDArray (const dim_vector& dv) : MArrayN<Complex> (dv) { }
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-30  John W. Eaton  <jwe@octave.org>
+
+	* mx-inlines.cc (MX_ND_REDUCTION): Iterate in direction of DIM.
+	(MX_ND_CUMULATIVE_OP): Likewise.
+
 2005-10-29  John W. Eaton  <jwe@octave.org>
 
 	* mx-inlines.cc (MX_ND_REDUCTION): Avoid increment_index to speed
--- a/liboctave/boolNDArray.h
+++ b/liboctave/boolNDArray.h
@@ -36,7 +36,7 @@
 boolNDArray : public ArrayN<bool>
 {
 public:
-  
+
   boolNDArray (void) : ArrayN<bool> () { }
 
   boolNDArray (const dim_vector& dv) : ArrayN<bool> (dv) { }
--- a/liboctave/chNDArray.h
+++ b/liboctave/chNDArray.h
@@ -34,7 +34,7 @@
 charNDArray : public MArrayN<char>
 {
 public:
-  
+
   charNDArray (void) : MArrayN<char> () { }
 
   charNDArray (dim_vector& dv) : MArrayN<char> (dv) { }
--- a/liboctave/dNDArray.h
+++ b/liboctave/dNDArray.h
@@ -35,7 +35,7 @@
 NDArray : public MArrayN<double>
 {
 public:
-  
+
   NDArray (void) : MArrayN<double> () { }
 
   NDArray (const dim_vector& dv) : MArrayN<double> (dv) { }
--- a/liboctave/mx-inlines.cc
+++ b/liboctave/mx-inlines.cc
@@ -405,68 +405,62 @@
     } \
   else if (dim >= nd) \
     { \
-      /* One more than the number of dimensions will yield the same \
-	 result as N more, so there is no point in creating an \
-	 unnecesarily large dimension vector padded with ones. \
-	 Remember that dim is in the range of 0:nd-1.  */ \
- \
       dim = nd++; \
       dv.resize (nd, 1); \
     } \
  \
-  /* The strategy here is to loop over all the elements once, \
-     adjusting the index into the result array so that we do the right \
-     thing with respect to the DIM argument.  */ \
+  /* R = op (A, DIM) \
  \
-  octave_idx_type result_offset = 0; \
- \
-  Array<octave_idx_type> tsz (nd, 1); \
-  for (int i = 1; i < nd; i++) \
-    tsz(i) = tsz(i-1)*dv(i-1); \
+     The strategy here is to access the elements of A along the \
+     dimension  specified by DIM.  This means that we loop over each \
+     element of R and adjust the index into A as needed.  */ \
  \
-  octave_idx_type reset_at = tsz(dim); \
-  octave_idx_type offset_increment_ctr = 1; \
-  octave_idx_type result_ctr = 1; \
+  Array<octave_idx_type> cp_sz (nd, 1); \
+  for (int i = 1; i < nd; i++) \
+    cp_sz(i) = cp_sz(i-1)*dv(i-1); \
  \
-  octave_idx_type result_offset_increment_point = 1; \
-  for (int i = 0; i <= dim; i++) \
-     result_offset_increment_point *= dv(i); \
- \
-  octave_idx_type result_offset_increment_amount = 1; \
-  for (int i = 0; i <= dim-1; i++) \
-     result_offset_increment_amount *= dv(i); \
+  octave_idx_type reset_at = cp_sz(dim); \
+  octave_idx_type base_incr = cp_sz(dim+1); \
+  octave_idx_type incr = cp_sz(dim); \
+  octave_idx_type base = 0; \
+  octave_idx_type next_base = base + base_incr; \
+  octave_idx_type iter_idx = base; \
+  octave_idx_type n_elts = dv(dim); \
  \
   dv(dim) = 1; \
  \
   retval.resize (dv, INIT_VAL); \
  \
-  octave_idx_type result_idx = 0; \
+  octave_idx_type nel = dv.numel (); \
  \
-  octave_idx_type num_iter = this->numel (); \
+  octave_idx_type k = 1; \
  \
-  for (octave_idx_type iter_idx = 0; iter_idx < num_iter; iter_idx++) \
+  for (octave_idx_type result_idx = 0; result_idx < nel; result_idx++) \
     { \
-      EVAL_EXPR; \
+      OCTAVE_QUIT;
+ \
+      for (octave_idx_type j = 0; j < n_elts; j++) \
+	{ \
+          OCTAVE_QUIT;
+ \
+	  EVAL_EXPR; \
  \
-      if (result_ctr == reset_at) \
+	  iter_idx += incr; \
+	} \
+ \
+      if (k == reset_at) \
         { \
-	  result_idx = result_offset; \
-	  result_ctr = 1; \
+	  base = next_base; \
+	  next_base += base_incr; \
+	  iter_idx = base; \
+	  k = 1; \
         } \
       else \
 	{ \
-	  result_ctr++; \
-	  result_idx++; \
+	  base++; \
+	  iter_idx = base; \
+	  k++; \
          } \
- \
-      if (offset_increment_ctr == result_offset_increment_point) \
-        { \
-	  result_offset += result_offset_increment_amount; \
-	  result_idx = result_offset; \
-	  offset_increment_ctr = 1; \
-	} \
-      else \
-	offset_increment_ctr++; \
     } \
  \
   retval.chop_trailing_singletons (); \
@@ -482,22 +476,16 @@
 #define MX_ND_ANY_ALL_REDUCTION(EVAL_EXPR, VAL) \
   MX_ND_REDUCTION (EVAL_EXPR, VAL, boolNDArray)
 
-#define MX_ND_CUMULATIVE_OP(RET_TYPE, ACC_TYPE, VAL, OP) \
+#define MX_ND_CUMULATIVE_OP(RET_TYPE, ACC_TYPE, INIT_VAL, OP) \
+ \
   RET_TYPE retval; \
  \
   dim_vector dv = this->dims (); \
+  int nd = this->ndims (); \
  \
   int empty = true; \
  \
-  /* If dim is larger then number of dims, return array as is */ \
-  if (dim >= dv.length ()) \
-    { \
-      retval = RET_TYPE (*this); \
-      return retval; \
-    } \
- \
-  /* Check if all dims are empty */ \
-  for (int i = 0; i < dv.length (); i++) \
+  for (int i = 0; i < nd; i++) \
     { \
       if (dv(i) > 0) \
         { \
@@ -508,87 +496,97 @@
  \
   if (empty) \
     { \
-      retval.resize (dv); \
+      dim_vector retval_dv (1, 1); \
+      retval.resize (retval_dv, INIT_VAL); \
       return retval; \
     } \
  \
-  /* We need to find first non-singleton dim */ \
+  /* We need to find first non-singleton dim.  */ \
+ \
   if (dim == -1) \
     { \
-      for (int i = 0; i < dv.length (); i++) \
+      dim = 0; \
+ \
+      for (int i = 0; i < nd; i++) \
         { \
-	  if (dv (i) != 1) \
+	  if (dv(i) != 1) \
 	    { \
 	      dim = i; \
 	      break; \
 	    } \
         } \
- \
-      if (dim == -1) \
-       	dim = 0; \
     } \
- \
-  /* Check to see if we have an empty array */ \
-  /* ie 1x2x0x3.                            */ \
-  int squeezed = 0; \
- \
-  for (int i = 0; i < dv.length (); i++) \
+  else if (dim >= nd) \
     { \
-      if (dv(i) == 0) \
-        { \
-          squeezed = 1; \
-	  break; \
-        } \
-    } \
- \
-  if (squeezed) \
-    {  \
-      retval.resize (dv); \
-      return retval; \
+      dim = nd++; \
+      dv.resize (nd, 1); \
     } \
  \
-  /* Make sure retval has correct dimensions */ \
-  retval.resize (dv, VAL); \
+  /* R = op (A, DIM) \
  \
-  /*  Length of Dimension */ \
-  octave_idx_type dim_length = 1; \
+     The strategy here is to access the elements of A along the \
+     dimension  specified by DIM.  This means that we loop over each \
+     element of R and adjust the index into A as needed.  */ \
  \
-  dim_length = dv (dim); \
- \
-  dv (dim) = 1; \
+  Array<octave_idx_type> cp_sz (nd, 1); \
+  for (int i = 1; i < nd; i++) \
+    cp_sz(i) = cp_sz(i-1)*dv(i-1); \
  \
-  /* This finds the number of elements in retval */ \
-  octave_idx_type num_iter = (this->numel () / dim_length); \
- \
-  Array<octave_idx_type> iter_idx (dv.length (), 0); \
+  octave_idx_type reset_at = cp_sz(dim); \
+  octave_idx_type base_incr = cp_sz(dim+1); \
+  octave_idx_type incr = cp_sz(dim); \
+  octave_idx_type base = 0; \
+  octave_idx_type next_base = base + base_incr; \
+  octave_idx_type iter_idx = base; \
+  octave_idx_type n_elts = dv(dim); \
  \
-  /* Filling in values.         */ \
-  /* First loop finds new index */ \
+  retval.resize (dv, INIT_VAL); \
+ \
+  octave_idx_type nel = dv.numel () / n_elts; \
+ \
+  octave_idx_type k = 1; \
  \
-  for (octave_idx_type j = 0; j < num_iter; j++) \
+  for (octave_idx_type i = 0; i < nel; i++) \
     { \
-      for (octave_idx_type i = 0; i < dim_length; i++) \
+      OCTAVE_QUIT; \
+ \
+      ACC_TYPE prev_val = INIT_VAL; \
+ \
+      for (octave_idx_type j = 0; j < n_elts; j++) \
 	{ \
-	  if (i > 0) \
-	    { \
-	      iter_idx (dim) = i - 1; \
+          OCTAVE_QUIT; \
  \
-	      ACC_TYPE prev_sum = retval (iter_idx); \
- \
-	      iter_idx (dim) = i; \
-	      \
-	      retval (iter_idx) = elem (iter_idx) OP prev_sum; \
+	  if (j == 0) \
+	    { \
+	      retval(iter_idx) = elem (iter_idx); \
+	      prev_val = retval(iter_idx); \
 	    } \
 	  else \
-	    retval (iter_idx) = elem (iter_idx); \
+	    { \
+	      prev_val = prev_val OP elem (iter_idx); \
+	      retval(iter_idx) = prev_val; \
+	    } \
+ \
+	  iter_idx += incr; \
 	} \
  \
-      if (dim > -1) \
-        iter_idx (dim) = 0; \
+      if (k == reset_at) \
+        { \
+	  base = next_base; \
+	  next_base += base_incr; \
+	  iter_idx = base; \
+	  k = 1; \
+        } \
+      else \
+	{ \
+	  base++; \
+	  iter_idx = base; \
+	  k++; \
+         } \
+    } \
  \
-      increment_index (iter_idx, dv); \
-    } \
-\
+  retval.chop_trailing_singletons (); \
+ \
   return retval
 
 #endif