Changeset 2242 for trunk/src

Timestamp:

07/22/11 15:34:15 (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...

Added maxRow=1 in table selection using TableExprNode when
finding at least one row is enough.

Location:

trunk/src

Files:

• FillerBase.cpp (modified) (2 diffs)
• STFocus.cpp (modified) (1 diff)
• STFrequencies.cpp (modified) (1 diff)
• STMolecules.cpp (modified) (1 diff)

trunk/src/FillerBase.cpp

@@ -193 +193 @@
                     && tab.col("HUMIDITY") == humidity \
                     && tab.col("WINDSPEED") == windspeed \
-                    && tab.col("WINDAZ") == windaz ) ;
+                    && tab.col("WINDAZ") == windaz, 1 ) ;
   Int nrow = tab.nrow() ;
   Int nrowSel = subt.nrow() ;
@@ -228 +228 @@
                           const Vector<Float>& tcal)
 {
-  uInt id ;
+  uInt id = 0 ;
   Table tab = table_->tcal().table() ;
-  Int nrow = tab.nrow() ;
-  Vector<uInt> rowList( 0 ) ;
-  ArrayColumn<Float> tcalCol( tab, "TCAL" ) ;
-  TableColumn timeCol( tab, "TIME" ) ;
-  TableColumn idCol( tab, "ID" ) ;
-  uInt nelem = tcal.nelements() ;
-  for ( Int irow = 0 ; irow < nrow ; irow++ ) {
-    if ( tcalCol.shape(irow)[0] == nelem ) {
-      rowList.resize( rowList.nelements()+1, True ) ;
-      rowList[rowList.nelements()-1] = irow ;
+  Table result =
+    //tab( nelements(tab.col("TCAL")) == uInt (tcal.size()) && 
+    //     all(tab.col("TCAL")== tcal) &&
+    //     tab.col("TIME") == tcaltime, 1 ) ;
+    tab( nelements(tab.col("TCAL")) == uInt (tcal.size()) && 
+         all(tab.col("TCAL")== tcal), 1 ) ;
+
+  if ( result.nrow() > 0 ) {
+    ROTableColumn tmpCol( result, "ID" ) ;
+    tmpCol.getScalar( 0, id ) ;
+  }
+  else {
+    uInt rno = tab.nrow();
+    tab.addRow();
+    TableColumn idCol( tab, "ID" ) ;
+    TableColumn tctimeCol( tab, "TIME" ) ;
+    ArrayColumn<Float> tcalCol( tab, "TCAL" ) ;
+    // get last assigned _id and increment
+    if ( rno > 0 ) {
+      idCol.getScalar(rno-1, id);
+      id++;
     }
-  }
-  
-  //cout << "rowList = " << rowList << endl ;
-
-  if ( rowList.nelements() == 0 ) {
-    // add new row
-    tab.addRow( 1 ) ;
-    //cout << "tab.nrow() = " << tab.nrow() << endl ;
-    tcalCol.put( nrow, tcal ) ;
-    timeCol.putScalar( nrow, tcaltime ) ; 
-    id = (uInt)nrow ;
-    idCol.putScalar( nrow, id ) ;
-  }
-  else {
-    uInt ichan = 0 ;
-    while ( rowList.nelements() > 1 && ichan < nelem ) {
-      Vector<uInt> tmp = rowList.copy() ;
-      rowList.resize( 0 ) ;
-      for ( uInt irow = 0 ; irow < tmp.nelements() ; irow++ ) {
-        Vector<Float> t = tcalCol( tmp[irow] ) ;
-        if ( t[ichan] == tcal[ichan] ) {
-          rowList.resize( rowList.nelements()+1, True ) ;
-          rowList[rowList.nelements()-1] = irow ;
-        }
-      }
-      ichan++ ;
-    }
-    
-    //cout << "updated rowList = " << rowList << endl ;
-
-    if ( rowList.nelements() == 0 ) {
-      // add new row
-      tab.addRow( 1, True ) ;
-      //cout << "tab.nrow() = " << tab.nrow() << endl ;
-      tcalCol.put( nrow, tcal ) ;
-      timeCol.putScalar( nrow, tcaltime ) ; 
-      id = (uInt)nrow ;
-      idCol.putScalar( nrow, id ) ;
-    }
-    else {
-      Vector<Float> t = tcalCol( rowList[0] ) ;
-      if ( allEQ( t, tcal ) ) {
-        ROTableColumn tc( tab, "ID" ) ;
-        id = tc.asuInt( rowList[0] ) ;
-      }
-      else {
-        // add new row
-        tab.addRow( 1, True ) ;
-        //cout << "tab.nrow() = " << tab.nrow() << endl ;
-        tcalCol.put( nrow, tcal ) ;
-        timeCol.putScalar( nrow, tcaltime ) ; 
-        id = (uInt)nrow ;
-        idCol.putScalar( nrow, id ) ;
-      }
-    }
-  }
-  
+    tctimeCol.putScalar(rno, tcaltime);
+    tcalCol.put(rno, tcal);
+    idCol.putScalar(rno, id);
+  }
+
   RecordFieldPtr<uInt> mcalidCol(row_.record(), "TCAL_ID");
   *mcalidCol = id;

trunk/src/STFocus.cpp

@@ -106 +106 @@
                           && near(table_.col("MOUNT"), mount)
                           && near(table_.col("XYPHASE"), xyphase)
-                          && near(table_.col("XYPHASEOFFSET"), xyphaseoffset)
+                          && near(table_.col("XYPHASEOFFSET"), xyphaseoffset), 1
                           );
   uInt resultid = 0;

trunk/src/STFrequencies.cpp

@@ -88 +88 @@
   // test if this already exists
   Table result = table_( near(table_.col("REFVAL"), refval)
-                    && near(table_.col("REFPIX"), refpix)
-                    && near(table_.col("INCREMENT"), inc) );
+                         && near(table_.col("REFPIX"), refpix)
+                         && near(table_.col("INCREMENT"), inc), 1 );
   uInt resultid = 0;
   if ( result.nrow() > 0) {

trunk/src/STMolecules.cpp

@@ -108 +108 @@
   Table result =
     table_( nelements(table_.col("RESTFREQUENCY")) == uInt (restfreq.size()) && 
-            all(table_.col("RESTFREQUENCY")== restfreq) );
+            all(table_.col("RESTFREQUENCY")== restfreq), 1 );
   uInt resultid = 0;
   if ( result.nrow() > 0) {