Changeset 2533 for branches

Timestamp:

05/16/12 18:23:20 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Changed structure of ArrayIndexIterator.
Index list, which was the attribute of IndexIterator before, is now
belonging to ArrayIndexIterator.

Location:

branches/hpc33/src

Files:

• STIdxIter.cpp (modified) (9 diffs)
• STIdxIter.h (modified) (7 diffs)

branches/hpc33/src/STIdxIter.cpp

@@ -10 +10 @@
 namespace asap {
 
-IndexIterator::IndexIterator( vector< vector<uInt> > &idxlist ) 
-  : idxlist_m( idxlist ),
-    niter_m( 0 )
-{
-  nfield_m = idxlist_m.size() ;
-//   cout << "nfield_m=" << nfield_m << endl ;
-  Block<uInt> nidx( nfield_m ) ;
+IndexIterator::IndexIterator( IPosition &shape ) 
+  : niter_m( 0 )
+{
+  nfield_m = shape.nelements() ;
   prod_m = Block<uInt>( nfield_m, 1 ) ;
   idx_m = Block<uInt>( nfield_m, 0 ) ;
-  current_m = Vector<uInt>( nfield_m ) ;
-//   cout << "idx_m.size()=" << idx_m.size() << endl ;
-  for ( uInt i = 0 ; i < nfield_m ; i++ ) {
-//     cout << "idx_m[" << i << "]=" << idx_m[i] << endl ;
-    nidx[i] = idxlist_m[i].size() ;
-    current_m[i] = idxlist_m[i][idx_m[i]] ;
-  }
   for ( uInt i = 1 ; i < nfield_m ; i++ ) {
-    prod_m[i] = nidx[i-1] * prod_m[i-1] ;
-  }
-  maxiter_m =prod_m[nfield_m-1] * nidx[nfield_m-1] ;
+    prod_m[i] = shape[i-1] * prod_m[i-1] ;
+  }
+  maxiter_m = prod_m[nfield_m-1] * shape[nfield_m-1] ;
 //   cout << "maxiter_m=" << maxiter_m << endl ;
-}
-
-Vector<uInt> IndexIterator::current()
-{
-  uInt *v = current_m.data() ;
-  uInt *p = idx_m.storage() ;
-  for ( uInt i = 0 ; i < nfield_m ; i++ ) {
-    *v = idxlist_m[i][*p] ;
-    v++ ;
-    p++ ;
-  }
-  return current_m ;
 }
 
@@ -64 +42 @@
 ArrayIndexIterator::ArrayIndexIterator( Matrix<uInt> &arr,
                                         vector< vector<uInt> > idlist )
-  : arr_m( arr )//,
-                                      //    pos_m( IPosition(1,0) )
+  : arr_m( arr ),
+    pos_m( IPosition(1,0) )
 {
   ncol_m = arr_m.ncolumn() ;
   nrow_m = arr_m.nrow() ;
-  //storage_m.resize( nrow_m ) ;
   vector< vector<uInt> > l = idlist ;
   if ( l.size() != ncol_m ) {
@@ -80 +57 @@
     }
   }
-  iter_m = new IndexIterator( l ) ;
+  idxlist_m = l ;
+  IPosition shape( ncol_m ) ;
+  for ( uInt i = 0 ; i < ncol_m ; i++ ) {
+    shape[i] = idxlist_m[i].size() ;
+  }
+  iter_m = new IndexIterator( shape ) ;
+  current_m.resize( ncol_m ) ;
 }
 
@@ -90 +73 @@
 Vector<uInt> ArrayIndexIterator::current() 
 {
-  return iter_m->current() ;
+  Block<uInt> idx = iter_m->current() ;
+  for ( uInt i = 0 ; i < ncol_m ; i++ )
+    current_m[i] = idxlist_m[i][idx[i]] ;
+  return current_m ;
 }
 
@@ -97 +83 @@
   return iter_m->pastEnd() ;
 }
-
-// void ArrayIndexIterator::next() 
-// {
-//   iter_m->next() ;
-// }
 
 ArrayIndexIteratorNormal::ArrayIndexIteratorNormal( Matrix<uInt> &arr,
                                                     vector< vector<uInt> > idlist )
-  : ArrayIndexIterator( arr, idlist ),
-    pos_m( IPosition( 1, 0 ) ) 
+  : ArrayIndexIterator( arr, idlist )
 {
   storage_m.resize( nrow_m ) ;
@@ -135 +115 @@
 ArrayIndexIteratorAcc::ArrayIndexIteratorAcc( Matrix<uInt> &arr,
                                               vector< vector<uInt> > idlist )
-  : ArrayIndexIterator( arr, idlist ),
-    pos_m( IPosition(1) )
+  : ArrayIndexIterator( arr, idlist )
 {
   storage_m.resize( arr_m.nelements()+nrow_m ) ;
@@ -148 +127 @@
   }
   prev_m = current() - (uInt)1 ;
-
-  // test
-//   cout << "row 21, col 2 " << arr_m( 21, 2 ) << endl ;  
 }
 
@@ -166 +142 @@
   if ( c < 0 ) {
     pos_m[0] = len_m[0] ;
-    return Vector<uInt>( pos_m, storage_m.storage() ) ;
+    return Vector<uInt>( pos_m, storage_m.storage(), policy ) ;
   }
   uInt *base = storage_m.storage() + (c+1) * nrow_m ;
@@ -236 +212 @@
 }
 
+Vector<uInt> STIdxIter::getRows( StorageInitPolicy policy )
+{ 
+  return iter_m->getRows( policy ) ; 
+} 
+
 STIdxIterNormal::STIdxIterNormal()
   : STIdxIter()

branches/hpc33/src/STIdxIter.h

@@ -6 +6 @@
 #include <casa/Arrays/Vector.h>
 #include <casa/Arrays/Matrix.h>
+#include <casa/Arrays/IPosition.h>
 
 #include "Scantable.h"
@@ -16 +17 @@
 {
 public:
-  IndexIterator( vector< vector<uInt> > &idlist ) ;
-  Vector<uInt> current() ;
+  IndexIterator( IPosition &shape ) ;
+  Block<uInt> current() { return idx_m ; } ;
   Bool pastEnd() ;
   void next() ;
 private:
-  vector< vector<uInt> > idxlist_m ;
   uInt nfield_m ;
   Block<uInt> prod_m ;
@@ -27 +27 @@
   uInt niter_m ;
   uInt maxiter_m ;
-  Vector<uInt> current_m ;
 } ;
 
@@ -44 +43 @@
   uInt nrow_m ;
   uInt ncol_m ;
-  //Vector<uInt> storage_m ;
+  Block<uInt> storage_m ;
   Matrix<uInt> arr_m ;
-  //IPosition pos_m ;
+  IPosition pos_m ;
+  Vector<uInt> current_m ;
+  vector< vector<uInt> > idxlist_m ;
 } ;
 
@@ -56 +57 @@
   void next() ;
   Vector<uInt> getRows( StorageInitPolicy policy=COPY ) ;
-private:
-  Block<uInt> storage_m ;
-  IPosition pos_m ;
+// private:
+//   Block<uInt> storage_m ;
+//   IPosition pos_m ;
 } ;
 
@@ -73 +74 @@
 
   Vector<uInt> prev_m ;
-  Block<uInt> storage_m ;
-  IPosition pos_m ;
+//   Block<uInt> storage_m ;
+//   IPosition pos_m ;
   Block<uInt> len_m ;
 } ;
@@ -92 +93 @@
   void next() { iter_m->next() ; } ;
   vector<uInt> getRowsSTL() { return tovector( iter_m->getRows() ) ; } ;
-  Vector<uInt> getRows( StorageInitPolicy policy=COPY ) { return iter_m->getRows( policy ) ; } ;
+  Vector<uInt> getRows( StorageInitPolicy policy=COPY ) ;
 protected:
   ArrayIndexIterator *iter_m ;