Changeset 2536 for branches/hpc33/src/STIdxIter.h

Timestamp:

05/18/12 17:50:11 (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 speedup that STIdxIterAcc skips to update internal storage and
just update data length and pointer when specified column has only
one value.

File:

• branches/hpc33/src/STIdxIter.h (modified) (5 diffs)

branches/hpc33/src/STIdxIter.h

@@ -57 +57 @@
   void next() ;
   Vector<uInt> getRows( StorageInitPolicy policy=COPY ) ;
-// private:
-//   Block<uInt> storage_m ;
-//   IPosition pos_m ;
 } ;
 
@@ -70 +67 @@
   Vector<uInt> getRows( StorageInitPolicy policy=COPY ) ;
 private:
-  Int isChanged( Vector<uInt> &idx ) ;
+  Int isChanged( Block<uInt> &idx ) ;
   uInt *updateStorage( Int &icol, uInt *base, uInt &v ) ;
 
-  Vector<uInt> prev_m ;
-//   Block<uInt> storage_m ;
-//   IPosition pos_m ;
+  Block<uInt> prev_m ;
   Block<uInt> len_m ;
+  Block<Bool> skip_m ;
 } ;
 
@@ -93 +89 @@
   void next() { iter_m->next() ; } ;
   vector<uInt> getRowsSTL() { return tovector( iter_m->getRows() ) ; } ;
+  // !!!you should not use policy=TAKE_OVER since it causes problem!!!
   Vector<uInt> getRows( StorageInitPolicy policy=COPY ) ;
 protected:
@@ -107 +104 @@
   STIdxIterNormal() ;
   STIdxIterNormal( const string &name,
-                                const vector<string> &cols ) ;
+                   const vector<string> &cols ) ;
   STIdxIterNormal( const CountedPtr<Scantable> &s,
-                                const vector<string> &cols ) ;
+                   const vector<string> &cols ) ;
   ~STIdxIterNormal() ;
 protected:
@@ -121 +118 @@
   STIdxIterAcc() ;
   STIdxIterAcc( const string &name,
-                             const vector<string> &cols ) ;
+                const vector<string> &cols ) ;
   STIdxIterAcc( const CountedPtr<Scantable> &s,
-                             const vector<string> &cols ) ;
+                const vector<string> &cols ) ;
   ~STIdxIterAcc() ;
 protected:
-  void init( Table &t,
-             const vector<string> &cols ) ;
+  virtual void init( Table &t,
+                     const vector<string> &cols ) ;
 } ;
+
+// class STIdxIterExAcc : public STIdxIterAcc
+// {
+//   STIdxIterExAcc() ;
+//   STIdxIterExAcc( const string &name,
+//                   const vector<string> &cols ) ;
+//   STIdxIterExAcc( const CountedPtr<Scantable> &s,
+//                   const vector<string> &cols ) ;
+//   ~STIdxIterExAcc() ;
+// protected:
+//   virtual void init( Table &t,
+//                      const vector<string> &cols ) ;
+// } ;
 
 } // namespace