Changeset 2545 for branches

Timestamp:

05/22/12 18:03:02 (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...

Do not resize Vector everytime when new element is added.
Instead, we can allocate enough memory first.

File:

• branches/hpc33/src/STMath.cpp (modified) (3 diffs)

branches/hpc33/src/STMath.cpp

@@ -143 +143 @@
   ROScalarColumn<Int> scanIDCol;
 
-  Vector<uInt> rowstodelete;
+  //Vector<uInt> rowstodelete;
+  Block<uInt> rowstodelB( in[0]->nrow() ) ;
+  uInt nrowdel = 0 ;
 
 //   Block<String> cols(3);
@@ -360 +362 @@
     const Vector<Bool>& msk = acc.getMask();
     if ( allEQ(msk, False) ) {
-      uint n = rowstodelete.nelements();
-      rowstodelete.resize(n+1, True);
-      rowstodelete[n] = i;
+      //uint n = rowstodelete.nelements();
+      //rowstodelete.resize(n+1, True);
+      //rowstodelete[n] = i;
+      rowstodelB[nrowdel] = i ;
+      nrowdel++ ;
       continue;
     }
@@ -404 +408 @@
   }
 
-  if (rowstodelete.nelements() > 0) {
+  //if (rowstodelete.nelements() > 0) {
+  if ( nrowdel > 0 ) {
+    Vector<uInt> rowstodelete( IPosition(1,nrowdel), rowstodelB.storage(), SHARE ) ;
     os << rowstodelete << LogIO::POST ;
     tout.removeRow(rowstodelete);