Changeset 2547

Timestamp:

05/25/12 19:00:18 (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 an order of iteration for STIdxIter. Now the order is same as
TableIterator (in specified column list for iteration, iterate subsequent
column first).

Location:

branches/hpc33/src

Files:

• STIdxIter.cpp (modified) (13 diffs)
• STIdxIter.h (modified) (1 diff)

branches/hpc33/src/STIdxIter.cpp

@@ -16 +16 @@
   prod_m.resize( nfield_m ) ;
   idx_m.resize( nfield_m ) ;
-  prod_m[0] = 1 ;
-  idx_m[0] = 0 ;
-  for ( uInt i = 1 ; i < nfield_m ; i++ ) {
-    prod_m[i] = shape[i-1] * prod_m[i-1] ;
+//   prod_m[0] = 1 ;
+//   idx_m[0] = 0 ;
+//   for ( uInt i = 1 ; i < nfield_m ; i++ ) {
+//     prod_m[i] = shape[i-1] * prod_m[i-1] ;
+//     idx_m[i] = 0 ;
+//   }
+//   maxiter_m = prod_m[nfield_m-1] * shape[nfield_m-1] ;
+  prod_m[nfield_m-1] = 1 ;
+  idx_m[nfield_m-1] = 0 ;
+  for ( Int i = nfield_m-2 ; i >= 0 ; i-- ) {
+    prod_m[i] = shape[i+1] * prod_m[i+1] ;
     idx_m[i] = 0 ;
   }
-  maxiter_m = prod_m[nfield_m-1] * shape[nfield_m-1] ;
+  maxiter_m = prod_m[0] * shape[0] ;
 //   cout << "maxiter_m=" << maxiter_m << endl ;
 }
@@ -35 +42 @@
   niter_m++ ;
   uInt x = niter_m ;
-  for ( Int i = nfield_m-1 ; i >= 0 ; i-- ) {
+//   for ( Int i = nfield_m-1 ; i >= 0 ; i-- ) {
+  for ( Int i = 0 ; i < nfield_m ; i++ ) {
     idx_m[i] = x / prod_m[i] ;
     //cout << "i=" << i << ": prod=" << prod_m[i] 
@@ -121 +129 @@
   : ArrayIndexIterator( arr, idlist )
 {
+  // storage_m layout
+  // length: ncol_m * (nrow_m + 1)
+  // 0~nrow_m-1: constant temporary storage that indicates whole rows
+  // nrow_m~2*nrow_m-1: temporary storage for column 0
+  // 2*nrow_m~3*nrow_m-1: temporary storage for column 1
+  // ...
   storage_m.resize( arr_m.nelements()+nrow_m ) ;
-  uInt *p = storage_m.storage() + arr_m.nelements() ;
+//   uInt *p = storage_m.storage() + arr_m.nelements() ;
+  uInt *p = storage_m.storage() ;
   for ( uInt i = 0 ; i < nrow_m ; i++ ) {
     *p = i ;
@@ -158 +173 @@
   Block<uInt> v = iter_m->current() ;
   Int c = isChanged( v ) ;
-//   cout << "c=" << c << endl ;
-  if ( c < 0 ) {
-    pos_m[0] = len_m[0] ;
-    uInt offset = 0 ;
-    while( offset < ncol_m && skip_m[offset] )
-      offset++ ;
+  cout << "v=" << Vector<uInt>(IPosition(1,v.nelements()),v.storage(),SHARE) << endl ;
+  cout << "c=" << c << endl ;
+//   if ( c < 0 ) {
+  if ( c > ncol_m-1 ) {
+//     pos_m[0] = len_m[0] ;
+//     uInt offset = 0 ;
+//     while( offset < ncol_m && skip_m[offset] )
+//       offset++ ;
+    pos_m[0] = len_m[ncol_m] ;
+    Int offset = ncol_m - 1 ;
+    while( offset >= 0 && skip_m[offset] )
+      offset-- ;
+    offset++ ;
 //     cout << "offset=" << offset << endl ;
     return Vector<uInt>( pos_m, storage_m.storage()+offset*nrow_m, policy ) ;
   }
-  Int offset = c + 1 ;
-  while( offset < ncol_m && skip_m[offset] ) 
-    offset++ ;
-//   cout << "offset = " << offset << endl ;
+//   Int offset = c + 1 ;
+//   while( offset < ncol_m && skip_m[offset] ) 
+//     offset++ ;
+  Int offset = c - 1 ;
+  while( offset >= 0 && skip_m[offset] )
+    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 ;
-  for ( Int i = c ; i >= 0 ; i-- ) {
-    base = updateStorage( i, base, idxlist_m[i][v[i]] ) ;
-//     cout << "len_m[" << i << "]=" << len_m[i] << endl ;
+//   for ( Int i = c ; i >= 0 ; i-- ) {
+//     base = updateStorage( i, base, idxlist_m[i][v[i]] ) ;
+  for ( Int i = c+1 ; i <= ncol_m ; i++ ) {
+    base = updateStorage( i, base, idxlist_m[i-1][v[i-1]] ) ;
+    cout << "len_m[" << i << "]=" << len_m[i] << endl ;
 //     cout << "base=" << Vector<uInt>(IPosition(1,len_m[i]),base,SHARE) << endl ;
   }
-  pos_m[0] = len_m[0] ;
+//   pos_m[0] = len_m[0] ;
+  pos_m[0] = len_m[ncol_m] ;
 //   cout << "pos_m=" << pos_m << endl ;
+  cout << "ret=" << Vector<uInt>( pos_m, base, policy ) << endl ;
   return Vector<uInt>( pos_m, base, policy ) ;
 }
@@ -186 +216 @@
 Int ArrayIndexIteratorAcc::isChanged( Block<uInt> &idx )
 {
-  Int i = ncol_m - 1 ;
-  while( i >= 0 && idx[i] == prev_m[i] )
-    i-- ;
+//   Int i = ncol_m - 1 ;
+//   while( i >= 0 && idx[i] == prev_m[i] )
+//     i-- ;
+  Int i = 0 ;
+  while( i < ncol_m && idx[i] == prev_m[i] )
+    i++ ;
   return i ;
 }
@@ -197 +230 @@
 {
   uInt *p ;
-  if ( skip_m[icol] ) {
+//   if ( skip_m[icol] ) {
+  if ( skip_m[icol-1] ) {
     // skip update, just update len_m[icol] and pass appropriate pointer
 //     cout << "skip " << icol << endl ;
     p = base ;
-    len_m[icol] = len_m[icol+1] ;
+//     len_m[icol] = len_m[icol+1] ;
+    len_m[icol] = len_m[icol-1] ;
   }
   else {
@@ -212 +247 @@
     long offset = 0 ;
     // warr_p points a first element of (icol)-th column
-    const uInt *warr_p = arr_p + icol * nrow_m ;
-    for ( uInt i = 0 ; i < len_m[icol+1] ; i++ ) {
+//     const uInt *warr_p = arr_p + icol * nrow_m ;
+    const uInt *warr_p = arr_p + (icol-1) * nrow_m ;
+//     for ( uInt i = 0 ; i < len_m[icol+1] ; i++ ) {
+    for ( uInt i = 0 ; i < len_m[icol-1] ; i++ ) {
       // increment warr_p by (*(base)-*(base-1))
       warr_p += *base - offset ;
@@ -355 +392 @@
 
 STIdxIterExAcc::STIdxIterExAcc()
-  : STIdxIter()
+  : STIdxIter(),
+    srctypeid_m( -1 ),
+    srcnameid_m( -1 )
 { 
 }
@@ -361 +400 @@
 STIdxIterExAcc::STIdxIterExAcc( const string &name,
                                 const vector<string> &cols ) 
-  : STIdxIter( name, cols )
+  : STIdxIter( name, cols ),
+    srctypeid_m( -1 ),
+    srcnameid_m( -1 )
 {
   Table t( name, Table::Old ) ;
@@ -369 +410 @@
 STIdxIterExAcc::STIdxIterExAcc( const CountedPtr<Scantable> &s,
                                 const vector<string> &cols )
-  : STIdxIter( s, cols )
+  : STIdxIter( s, cols ),
+    srctypeid_m( -1 ),
+    srcnameid_m( -1 )
 {
   init( s->table(), cols ) ;
@@ -420 +463 @@
                                     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] ;
+  convertArray( out, in ) ;
+  //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 ;
-      }
-    }
-  }
+  //}
+  //out.resize( len ) ;
+  //uInt idx = -1 ;
+  //cout << "idx=" << idx << endl ;
+  //int idx2 = (Int)idx ;
+  //cout << "idx2=" << idx2 << endl ;
+  //idx = (uInt) idx2 ;
+  //cout << "idx=" << idx << endl ;
+  //if ( n == 1 ) {
+  //  cout << "n=1" << endl ;
+  //  out = 0 ;
+  //}
+  //else if ( n == 2 ) {
+  //  cout << "n=2" << endl ;
+  //  for ( uInt i = 0 ; i < len ; i++ ) {
+  //    out[i] = (in[i] == val[0]) ? 0 : 1 ;
+  //  }
+  //}
+  //else {
+  //  cout << "n=" << n << endl ;
+  //  map<Int,uInt> m ;
+  // for( uInt i = 0 ; i < n ; i++ )
+  //    m[val[i]] = i ;
+  // for ( uInt i = 0 ; i < len ; i++ ) {
+     //for ( uInt j = 0 ; j < n ; j++ ) {
+      //  if ( in[i] == val[j] ) {
+      //    out[i] = j ;
+      //    break ;
+      //  }
+      //}
+  //    out[i] = m[in[i]] ;
+  //  }
+  // }
 } 
 
@@ -451 +518 @@
 //     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 ;
-      }
+  //out.resize( len ) ;
+  if ( n == 1 ) {
+    //cout << "n=1" << endl ;
+    out = 0 ;
+  }
+  else if ( n == 2 ) {
+    //cout << "n=2" << endl ;
+    for ( uInt i = 0 ; i < len ; i++ ) {
+      out[i] = (in[i] == val[0]) ? 0 : 1 ;
+    }
+  }
+  else {
+    //cout << "n=" << n << endl ;
+    map<String,uInt> m ;
+    for ( uInt i = 0 ; i < n ; i++ )
+      m[val[i]] = i ;
+    for ( uInt i = 0 ; i < len ; i++ ) {
+      //for ( uInt j = 0 ; j < n ; j++ ) {
+      //  if ( in[i] == val[j] ) {
+      //    out[i] = j ;
+      //    break ;
+      //  }
+      //}
+      out[i] = m[in[i]] ;
     }
   }
@@ -464 +548 @@
 Int STIdxIterExAcc::getSrcType()
 {
-  if ( srctype_m.nelements() > 0 ) 
-    return srctype_m[iter_m->current()[srctypeid_m]] ;
+  //if ( srctype_m.nelements() > 0 ) 
+  if ( srctypeid_m >= 0 ) 
+    //return srctype_m[iter_m->current()[srctypeid_m]] ;
+    return (Int)(iter_m->current()[srctypeid_m]) ;
   else
     return -999 ;

branches/hpc33/src/STIdxIter.h

@@ -151 +151 @@
   Block<Int> srctype_m ;
   Block<String> srcname_m ;
-  uInt srctypeid_m ;
-  uInt srcnameid_m ;
+  Int srctypeid_m ;
+  Int srcnameid_m ;
 } ;