Changeset 1639 for branches/alma/src

Timestamp:

09/30/09 17:56:00 (15 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-1429)

Ready to Release: Yes

Interface Changes: Yes

What Interface Changed:
A new python method, selector.set_rows(rownrs=[]),
and a cpp function,
STSelector::setRows( const std::vector< int >& rows ),
are added.
The cpp function can be called with selector._setrows()
from python scripts.

Test Programs:

# @casa
s=sd.scantable('ORIGINAL_TABLE_NAME', False)
sel=sd.selector()
rownrs=[1,3,5,7]
sel.set_rows(rownrs)
s.set_selection(sel)
s2=s.copy()
s2.save(name='NEW_TABLE_NAME',format='ASAP',overwrite=True)

Put in Release Notes: Yes

Module(s):

Description:

Data selection by a list of row numbers can be done by
the new method selector.set_rows.

Location:

branches/alma/src

Files:

• STSelector.cpp (modified) (4 diffs)
• STSelector.h (modified) (2 diffs)
• python_STSelector.cpp (modified) (1 diff)

branches/alma/src/STSelector.cpp

@@ -116 +116 @@
 }
 
+void STSelector::setRows( const std::vector< int >& rows )
+{
+  rowselection_ = rows;
+}
+
+// Table STSelector::apply( const Table& tab )
+// {
+//   if ( empty() ) {
+//     return sort(tab);
+//   }
+//   TableExprNode query;
+//   intidmap::const_iterator it;
+//   for (it = intselections_.begin(); it != intselections_.end(); ++it) {
+//     TableExprNode theset(Vector<Int>( (*it).second ));
+//     if ( query.isNull() ) {
+//       query = tab.col((*it).first).in(theset);
+//     } else {
+//       query = tab.col((*it).first).in(theset) && query;
+//     }
+//   }
+//   stringidmap::const_iterator it1;
+//   for (it1 = stringselections_.begin(); it1 != stringselections_.end(); ++it1) {
+//     TableExprNode theset(mathutil::toVectorString( (*it1).second ));
+//     if ( query.isNull() ) {
+//       query = tab.col((*it1).first).in(theset);
+//     } else {
+//       query = tab.col((*it1).first).in(theset) && query;
+//     }
+//   }
+//   // add taql query
+//   if ( taql_.size() > 0 ) {
+//     Table tmpt = tab;
+//     std::string pytaql = "USING STYLE PYTHON " + taql_;
+
+//     if ( !query.isNull() ) { // taql and selection
+//       tmpt = tableCommand(pytaql, tab(query));
+//     } else { // taql only
+//       tmpt = tableCommand(pytaql, tab);
+//     }
+//     return sort(tmpt);
+//   } else {
+//     if ( query.isNull() ) {
+//       return sort(tab);
+//     } else {
+//       return sort(tab(query));
+//     }
+//   }
+// }
 Table STSelector::apply( const Table& tab )
 {
   if ( empty() ) {
     return sort(tab);
+  }
+  Table basetab = tab;
+  // Important!! Be sure to apply row selection first. 
+  if (rowselection_.size() > 0){
+    //Vector<Int> intrownrs(rowselection_);
+    Vector<uInt> rownrs( rowselection_.size() );
+    convertArray(rownrs, Vector<Int> ( rowselection_ ));
+    basetab = tab( rownrs );
+    ///TableExprNode theset(Vector<Int>( rowselection_ ));
+    ///query = tab.nodeRownr().in(theset);
   }
   TableExprNode query;
@@ -126 +184 @@
     TableExprNode theset(Vector<Int>( (*it).second ));
     if ( query.isNull() ) {
-      query = tab.col((*it).first).in(theset);
+      //query = tab.col((*it).first).in(theset);
+      query = basetab.col((*it).first).in(theset);
     } else {
-      query = tab.col((*it).first).in(theset) && query;
+      //query = tab.col((*it).first).in(theset) && query;
+      query = basetab.col((*it).first).in(theset) && query;
     }
   }
@@ -135 +195 @@
     TableExprNode theset(mathutil::toVectorString( (*it1).second ));
     if ( query.isNull() ) {
-      query = tab.col((*it1).first).in(theset);
+      //query = tab.col((*it1).first).in(theset);
+      query = basetab.col((*it1).first).in(theset);
     } else {
-      query = tab.col((*it1).first).in(theset) && query;
+      //query = tab.col((*it1).first).in(theset) && query;
+      query = basetab.col((*it1).first).in(theset) && query;
     }
   }
   // add taql query
   if ( taql_.size() > 0 ) {
-    Table tmpt = tab;
+    //Table tmpt = tab;
+    Table tmpt = basetab;
     std::string pytaql = "USING STYLE PYTHON " + taql_;
 
     if ( !query.isNull() ) { // taql and selection
-      tmpt = tableCommand(pytaql, tab(query));
+      //tmpt = tableCommand(pytaql, tab(query));
+      tmpt = tableCommand(pytaql, basetab(query));
     } else { // taql only
-      tmpt = tableCommand(pytaql, tab);
+      //tmpt = tableCommand(pytaql, tab);
+      tmpt = tableCommand(pytaql, basetab);
     }
     return sort(tmpt);
   } else {
     if ( query.isNull() ) {
-      return sort(tab);
+      //return sort(tab);
+      return sort(basetab);
     } else {
-      return sort(tab(query));
+      //return sort(tab(query));
+      return sort(basetab(query));
     }
   }
@@ -227 +294 @@
 bool asap::STSelector::empty( ) const
 {
-  return (intselections_.empty() && taql_.size() == 0 );
+  //return (intselections_.empty() && taql_.size() == 0 );
+  return (intselections_.empty() && taql_.size() == 0 && rowselection_.size() == 0);
 }
 

branches/alma/src/STSelector.h

@@ -48 +48 @@
 
   void setSortOrder(const std::vector<std::string>& order);
+  void setRows(const std::vector<int>& rows);
 
   std::vector<int> getScans() const;
@@ -86 +87 @@
   casa::Block<casa::String> order_;
   std::string taql_;
+  std::vector<int> rowselection_;
 };
 

branches/alma/src/python_STSelector.cpp

@@ -41 +41 @@
         .def("_settaql", &STSelector::setTaQL)
         .def("_setorder", &STSelector::setSortOrder)
+        .def("_setrows", &STSelector::setRows)
         .def("_empty", &STSelector::empty)
       ;