Changeset 2533 for branches/hpc33/src/STIdxIter.h

Timestamp:

05/16/12 18:23:20 (12 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?.

File:

• branches/hpc33/src/STIdxIter.h (modified) (7 diffs)

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 ;