Changeset 2918 for trunk

Timestamp:

04/04/14 16:14:00 (11 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: test_tsdaverage etc.

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Replaced STIdxIterExAcc with STIdxIter2.

Location:

trunk/src

Files:

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

trunk/src/STIdxIter.cpp

@@ -515 +515 @@
     index_(),
     unique_(),
-    pointer_()
+    pointer_(),
+    string_storage_()
 {
 }
@@ -529 +530 @@
     index_(),
     unique_(),
-    pointer_()
+    pointer_(),
+    string_storage_()
 {
   init();
@@ -544 +546 @@
     index_(),
     unique_(),
-    pointer_()
+    pointer_(),
+    string_storage_()
 {
   init();
@@ -640 +643 @@
     addColumnToKey<Complex, TpComplex>(name);
     break;
-  // case TpString:
-  //   addColumnToKey<String, TpString>(name);
-  //   break;
+  case TpString:
+    addColumnToKeyTpString(name);
+    break;
   default:
     deallocate();
@@ -662 +665 @@
   pointer_.push_back(raw_storage);
 }
+
+void STIdxIter2::addColumnToKeyTpString(const string &name)
+{
+  ROScalarColumn<String> col(table_, name);
+  String *storage = new String[num_row_];
+  Vector<String> array(IPosition(1, num_row_), storage, TAKE_OVER);
+  col.getColumn(array);
+  sorter_.sortKey(storage, TpString, 0, Sort::Ascending);
+  string_storage_.push_back(array);
+}
+
 } // namespace
 

trunk/src/STIdxIter.h

@@ -176 +176 @@
   void addSortKey(const string &name);
   template<class T, DataType U> void addColumnToKey(const string &name);
+  void addColumnToKeyTpString(const string &name);
   void deallocate();
   vector<string> cols_;
@@ -186 +187 @@
   Vector<uInt> unique_;
   vector<void*> pointer_;
+  vector<Vector<String> > string_storage_;
 } ;
 

trunk/src/STMath.cpp

@@ -216 +216 @@
   }
   uInt outrowCount = 0;
-  // use STIdxIterExAcc instead of TableIterator
-  STIdxIterExAcc iter( in[0], cols ) ;
+  // use STIdxIter2 instead of TableIterator
+  STIdxIter2 iter( in[0], cols ) ;
 //   double t2 = 0 ;
 //   double t3 = 0 ;
@@ -230 +230 @@
       continue ;
     }
-    Vector<uInt> current = iter.current() ;
-    String srcname = iter.getSrcName() ;
+    Record current = iter.currentValue() ;
     //Table subt = iter.table();
     // copy the first row of this selection into the new table
@@ -336 +335 @@
       static char const*const colNames1[] = { "IFNO", "BEAMNO", "POLNO" };
       //uInt const values1[] = { rec.asuInt("IFNO"), rec.asuInt("BEAMNO"), rec.asuInt("POLNO") };
-      uInt const values1[] = { current[1], current[0], current[2] };
+      uInt const values1[] = { current.asuInt("IFNO"), current.asuInt("BEAMNO"), current.asuInt("POLNO") };
       SingleTypeEqPredicate<uInt, 3> myPred(tin, colNames1, values1);
       CustomTableExprNodeRep myNodeRep(tin, myPred);
@@ -346 +345 @@
 //                          && tin.col("IFNO") == Int(rec.asuInt("IFNO"))
 //                          && tin.col("POLNO") == Int(rec.asuInt("POLNO")) );
-      Table basesubt = tin( tin.col("BEAMNO") == current[0]
-                         && tin.col("IFNO") == current[1]
-                         && tin.col("POLNO") == current[2] );
+      Table basesubt = tin( tin.col("BEAMNO") == current.asuInt("BEAMNO")
+                            && tin.col("IFNO") == current.asuInt("IFNO")
+                            && tin.col("POLNO") == current.asuInt("POLNO") );
 #endif
       Table subt;
       if ( avmode == "SOURCE") {
 //         subt = basesubt( basesubt.col("SRCNAME") == rec.asString("SRCNAME"));
-        subt = basesubt( basesubt.col("SRCNAME") == srcname );
+        subt = basesubt( basesubt.col("SRCNAME") == current.asString("SRCNAME") );
 
       } else if (avmode == "SCAN") {
 //         subt = basesubt( basesubt.col("SRCNAME") == rec.asString("SRCNAME") 
 //                    && basesubt.col("SCANNO") == Int(rec.asuInt("SCANNO")) );
-        subt = basesubt( basesubt.col("SRCNAME") == srcname 
-                      && basesubt.col("SCANNO") == current[4] );
+        subt = basesubt( basesubt.col("SRCNAME") == current.asString("SRCNAME")
+                         && basesubt.col("SCANNO") == current.asuInt("SCANNO") );
       } else {
         subt = basesubt;