Changeset 2559 for branches

Timestamp:

06/11/12 18:42:43 (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...

Minor speed-up of STMath::almacal

File:

• branches/hpc33/src/STMath.cpp (modified) (1 diff)

branches/hpc33/src/STMath.cpp

@@ -3964 +3964 @@
     Vector<Double> interval = out->integrCol_.getColumn() ;
     interval /= 86400.0 ;
-    Block<uInt> gaplist( 100 ) ;
-    uInt glidx = 0 ;
-    uInt glsize = gaplist.size() ;
+    uInt *newscan = new uInt[nrow] ;
+    Vector<uInt> newscanno( IPosition(1,nrow), newscan, TAKE_OVER ) ; 
+    uInt *p = newscan ;
+    uInt newid = 0 ;
     for ( uInt i = 0 ; i < nrow - 1 ; i++ ) {
+      *p = newid ;
       double gap = 2.0 * timeSep[i+1] / ( interval[i] + interval[i+1] ) ;
       //cout << "gap[" << i << "]=" << setw(5) << gap << endl ;
       if ( gap > 1.1 ) {
 //         cout << "detected gap between " << i << " and " << i+1 << endl ;
-        gaplist[glidx] = i ;
-        glidx++ ;
-      }
-      if ( glidx >= glsize ) {
-//         cout << "resize gaplist" << endl ;
-        glsize += 100 ;
-        gaplist.resize( glsize ) ;
-      }
-    }
-    gaplist[glidx] = nrow - 1 ;
-    glidx++ ;
-//     cout << "gaplist = " << Vector<uInt>(IPosition(1,glidx),gaplist.storage()) << endl ;
-    uInt newid = 0 ;
-    Vector<uInt> newscanno( nrow, 0 ) ;
-    uInt *p = newscanno.data() ;
-    IPosition pos( 1 ) ;
-    for ( uInt i = 1 ; i < glidx  ; i++ ) {
-      pos[0] = gaplist[i] - gaplist[i-1] ;
-      Vector<uInt> scnslice( pos, p+gaplist[i-1]+1, SHARE ) ;
-      scnslice = i ;
-    }
+        newid++ ;
+      }
+      p++ ;
+    }
+    *p = newid ;
     out->scanCol_.putColumn( newscanno ) ;
 //     double t2 = mathutil::gettimeofday_sec() ;