Changeset 2537 for branches

Timestamp:

05/18/12 19:16:51 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: see below

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Defined STIdxIterExAcc class that is able to handle Int and String scalar
columns. Also, fixed a bug in ArrayIndexIterartorAcc.

Location:

branches/hpc33/src

Files:

• STIdxIter.cpp (modified) (4 diffs)
• STIdxIter.h (modified) (2 diffs)

branches/hpc33/src/STIdxIter.cpp

@@ -162 +162 @@
     pos_m[0] = len_m[0] ;
     uInt offset = 0 ;
-    while( offset <= ncol_m && !(skip_m[offset]) )
+    while( offset < ncol_m && skip_m[offset] )
       offset++ ;
 //     cout << "offset=" << offset << endl ;
     return Vector<uInt>( pos_m, storage_m.storage()+offset*nrow_m, policy ) ;
   }
-  uInt *base = storage_m.storage() + (c+1) * nrow_m ;
+  Int offset = c + 1 ;
+  while( offset < ncol_m && skip_m[offset] ) 
+    offset++ ;
+//   cout << "offset = " << offset << endl ;
+  uInt *base = storage_m.storage() + offset * nrow_m ;
 //   cout << "len_m[c+1]=" << len_m[c+1] << endl ;
 //   cout << "base=" << Vector<uInt>(IPosition(1,len_m[c+1]),base,SHARE) << endl ;
@@ -176 +180 @@
   }
   pos_m[0] = len_m[0] ;
+//   cout << "pos_m=" << pos_m << endl ;
   return Vector<uInt>( pos_m, base, policy ) ;
 }
@@ -199 +204 @@
   }
   else {
+//     cout << "update " << icol << endl ;
     uInt len = 0 ;
     p = storage_m.storage() + icol * nrow_m ;
@@ -348 +354 @@
 }
 
+STIdxIterExAcc::STIdxIterExAcc()
+  : STIdxIter()
+{ 
+}
+
+STIdxIterExAcc::STIdxIterExAcc( const string &name,
+                                const vector<string> &cols ) 
+  : STIdxIter( name, cols )
+{
+  Table t( name, Table::Old ) ;
+  init( t, cols ) ;
+}
+
+STIdxIterExAcc::STIdxIterExAcc( const CountedPtr<Scantable> &s,
+                                const vector<string> &cols )
+  : STIdxIter( s, cols )
+{
+  init( s->table(), cols ) ;
+}
+
+STIdxIterExAcc::~STIdxIterExAcc()
+{
+}
+
+void STIdxIterExAcc::init( Table &t, 
+                         const vector<string> &cols )
+{
+  uInt ncol = cols.size() ;
+  uInt nrow = t.nrow() ;
+  // array shape here is as follows if cols=["BEAMNO","POLNO","IFNO"]:
+  // [[B0,B1,B2,...,BN],
+  //  [P0,P1,P2,...,PN],
+  //  [I0,I1,I2,...,IN]]
+  // order of internal storage is
+  // [B0,B1,B2,..,BN,P0,P1,P2,...,PN,I0,I1,I2,...,IN] 
+  Matrix<uInt> arr( nrow, ncol ) ;
+  Vector<uInt> v ;
+  ROScalarColumn<uInt> col ;
+  ROScalarColumn<String> strCol ;
+  ROScalarColumn<Int> intCol ;
+  for ( uInt i = 0 ; i < ncol ; i++ ) {
+    v.reference( arr.column( i ) ) ;
+    if ( cols[i] == "SRCTYPE" ) {
+      intCol.attach( t, cols[i] ) ;
+      Vector<Int> srctype = intCol.getColumn() ;
+      processIntCol( srctype, v, srctype_m ) ;
+      srctypeid_m = i ;
+    }
+    else if ( cols[i] == "SRCNAME" ) {
+      strCol.attach( t, cols[i] ) ;
+      Vector<String> srcname = strCol.getColumn() ;
+      processStrCol( srcname, v, srcname_m ) ;
+      srcnameid_m = i ;
+    }
+    else {
+      col.attach( t, cols[i] ) ;
+      col.getColumn( v ) ;
+    }
+  }
+  iter_m = new ArrayIndexIteratorAcc( arr ) ;
+}
+
+void STIdxIterExAcc::processIntCol( Vector<Int> &in,
+                                    Vector<uInt> &out,
+                                    Block<Int> &val )
+{
+  uInt len = in.nelements() ;
+  Vector<Int> tmp = in.copy() ;
+  uInt n = genSort( tmp, Sort::Ascending, Sort::QuickSort|Sort::NoDuplicates ) ;
+  val.resize( n ) ;
+  for ( uInt i = 0 ; i < n ; i++ ) {
+    val[i] = tmp[i] ;
+//     cout << "val[" << i << "]=" << val[i] << endl ;
+  }
+  out.resize( len ) ;
+  for ( uInt i = 0 ; i < len ; i++ ) {
+    for ( uInt j = 0 ; j < n ; j++ ) {
+      if ( in[i] == val[j] ) {
+        out[i] = j ;
+        break ;
+      }
+    }
+  }
+} 
+
+void STIdxIterExAcc::processStrCol( Vector<String> &in,
+                                    Vector<uInt> &out,
+                                    Block<String> &val )
+{
+  uInt len = in.nelements() ;
+  Vector<String> tmp = in.copy() ;
+  uInt n = genSort( tmp, Sort::Ascending, Sort::QuickSort|Sort::NoDuplicates ) ;
+  val.resize( n ) ;
+  for ( uInt i = 0 ; i < n ; i++ ) {
+    val[i] = tmp[i] ;
+//     cout << "val[" << i << "]=" << val[i] << endl ;
+  }
+  out.resize( len ) ;
+  for ( uInt i = 0 ; i < len ; i++ ) {
+    for ( uInt j = 0 ; j < n ; j++ ) {
+      if ( in[i] == val[j] ) {
+        out[i] = j ;
+        break ;
+      }
+    }
+  }
+} 
+
+Int STIdxIterExAcc::getSrcType()
+{
+  if ( srctype_m.nelements() > 0 ) 
+    return srctype_m[iter_m->current()[srctypeid_m]] ;
+  else
+    return -999 ;
+}
+
+String STIdxIterExAcc::getSrcName()
+{
+  if ( srcname_m.nelements() > 0 )
+    return srcname_m[iter_m->current()[srcnameid_m]] ;
+  else
+    return "" ;
+}
+
 } // namespace

branches/hpc33/src/STIdxIter.h

@@ -7 +7 @@
 #include <casa/Arrays/Matrix.h>
 #include <casa/Arrays/IPosition.h>
+#include <casa/BasicSL/String.h>
 
 #include "Scantable.h"
@@ -127 +128 @@
 } ;
 
-// class STIdxIterExAcc : public STIdxIterAcc
-// {
-//   STIdxIterExAcc() ;
-//   STIdxIterExAcc( const string &name,
-//                   const vector<string> &cols ) ;
-//   STIdxIterExAcc( const CountedPtr<Scantable> &s,
-//                   const vector<string> &cols ) ;
-//   ~STIdxIterExAcc() ;
-// protected:
-//   virtual void init( Table &t,
-//                      const vector<string> &cols ) ;
-// } ;
+class STIdxIterExAcc : public STIdxIter
+{
+public:
+  STIdxIterExAcc() ;
+  STIdxIterExAcc( const string &name,
+                  const vector<string> &cols ) ;
+  STIdxIterExAcc( const CountedPtr<Scantable> &s,
+                  const vector<string> &cols ) ;
+  ~STIdxIterExAcc() ;
+  Int getSrcType() ;
+  String getSrcName() ;
+protected:
+  virtual void init( Table &t,
+                     const vector<string> &cols ) ;
+private:
+  void processIntCol( Vector<Int> &in,
+                      Vector<uInt> &out,
+                      Block<Int> &val ) ;
+  void processStrCol( Vector<String> &in,
+                      Vector<uInt> &out,
+                      Block<String> &val ) ;
+  Block<Int> srctype_m ;
+  Block<String> srcname_m ;
+  uInt srctypeid_m ;
+  uInt srcnameid_m ;
+} ;
 
 } // namespace