Changeset 2918 for trunk/src/STIdxIter.cpp

Timestamp:

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

File:

• trunk/src/STIdxIter.cpp (modified) (5 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