Changeset 850 for trunk/src

Timestamp:

02/28/06 10:49:29 (19 years ago)

Author:

mar637

Message:

added string map, moved map to int map added pattern based name search

Location:

trunk/src

Files:

• STSelector.cpp (modified) (10 diffs)
• STSelector.h (modified) (3 diffs)

trunk/src/STSelector.cpp

@@ -12 +12 @@
 #include <tables/Tables/ExprNode.h>
 #include <tables/Tables/TableParse.h>
+#include <tables/Tables/ExprNode.h>
 #include <casa/BasicSL/String.h>
 #include <casa/iostream.h>
 #include <casa/iomanip.h>
 
+#include "MathUtils.h"
 #include "STSelector.h"
 
@@ -26 +28 @@
 }
 
-STSelector::STSelector( const STSelector & other ) :
-  selections_(other.selections_),
+STSelector::STSelector( const STSelector&  other ) :
+  intselections_(other.intselections_),
+  stringselections_(other.stringselections_),
   taql_(other.taql_) {
 }
@@ -34 +37 @@
 {
   if (&other != this) {
-    this->selections_ = other.selections_;
+    this->intselections_ = other.intselections_;
+    this->stringselections_ = other.stringselections_;
     this->taql_ = other.taql_;
   }
@@ -46 +50 @@
 void STSelector::setScans( const std::vector< int >& scans )
 {
-  set("SCANNO", scans);
+  setint("SCANNO", scans);
 }
 
 void STSelector::setBeams( const std::vector< int >& beams )
 {
-  set("BEAMNO", beams);
+  setint("BEAMNO", beams);
 }
 
 void STSelector::setIFs( const std::vector< int >& ifs )
 {
-  set("IFNO", ifs);
+  setint("IFNO", ifs);
 }
 
 void STSelector::setPolarizations( const std::vector< int >& pols )
 {
-  set("POLNO", pols);
+  setint("POLNO", pols);
 }
 
 void asap::STSelector::setCycles( const std::vector< int >& cycs )
 {
-  set("CYCLENO", cycs);
-}
-
-void STSelector::set(const std::string& key, const std::vector< int >& val)
+  setint("CYCLENO", cycs);
+}
+
+void asap::STSelector::setName( const std::string& sname )
+{
+  std::string sql = "SELECT from $1 WHERE SRCNAME == pattern('"+sname+"')";
+  setTaQL(sql);
+}
+
+void STSelector::setint(const std::string& key, const std::vector< int >& val)
 {
   if ( val.size() > 0 ) {
-    selections_[key] = val;
+    intselections_[key] = val;
+  }
+}
+
+void STSelector::setstring( const std::string& key,
+                            const std::vector<std::string>& val )
+{
+  if ( val.size() > 0 ) {
+    stringselections_[key] = val;
   }
 }
@@ -87 +105 @@
   }
   TableExprNode query;
-  idmap::const_iterator it = selections_.begin();
-  for (it; it != selections_.end(); ++it) {
+  intidmap::const_iterator it = intselections_.begin();
+  for (it; it != intselections_.end(); ++it) {
     TableExprNode theset(Vector<Int>( (*it).second ));
     if ( query.isNull() ) {
@@ -96 +114 @@
     }
   }
+  stringidmap::const_iterator it1 = stringselections_.begin();
+  for (it1; 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 ) {
@@ -105 +132 @@
       tmpt = tableCommand(taql_, tab);
     }
-    return tmpt.copyToMemoryTable("dummy");
+    return tmpt;
   } else {
-    return tab(query).copyToMemoryTable("dummy");
-  }
-}
-
-std::vector< int > STSelector::get( const std::string& key)
-{
-  if (selections_.count(key) > 0) {
-    return  std::vector<int>();//selections_[key];
+    return tab(query);
+  }
+}
+
+std::vector< int > STSelector::getint( const std::string& key )
+{
+  if (intselections_.count(key) > 0) {
+    return  std::vector<int>();//intselections_[key];
   }
 }
@@ -120 +147 @@
 std::vector< int > STSelector::getScans( )
 {
-  return get("SCANNO");
+  return getint("SCANNO");
 }
 
 std::vector< int > STSelector::getBeams( )
 {
-  return get("BEAMNO");
+  return getint("BEAMNO");
 }
 
 std::vector< int > STSelector::getIFs( )
 {
-  return get("IFNO");
+  return getint("IFNO");
 }
 
 std::vector< int > STSelector::getPols( )
 {
-  return get("POLNO");
+  return getint("POLNO");
 }
 
 std::vector< int > asap::STSelector::getCycles( )
 {
-  return get("CYCLENO");
+  return getint("CYCLENO");
 }
 
@@ -153 +180 @@
   }
 
-  idmap::const_iterator it = selections_.begin();
-  while (it != selections_.end()) {
-    if ( it != selections_.begin() )
+  intidmap::const_iterator it = intselections_.begin();
+  while (it != intselections_.end()) {
+    if ( it != intselections_.begin() )
       oss << setw(15) << " ";
     oss << it->first << ": " << Vector<Int>(it->second);
     ++it;
-    if ( it != selections_.end() ) oss << endl;
+    if ( it != intselections_.end() ) oss << endl;
+  }
+  stringidmap::const_iterator it1 = stringselections_.begin();
+  while (it1 != stringselections_.end()) {
+    if ( it1 != stringselections_.begin() )
+      oss << setw(15) << " ";
+    oss << it1->first << ": " << mathutil::toVectorString(it1->second);
+    ++it1;
+    if ( it1 != stringselections_.end() ) oss << endl;
   }
   if ( taql_.size() > 0 ) {
@@ -169 +204 @@
 bool asap::STSelector::empty( ) const
 {
-  return (selections_.empty() && taql_.size() == 0 );
-}
+  return (intselections_.empty() && taql_.size() == 0 );
+}

trunk/src/STSelector.h

@@ -41 +41 @@
   void setPolarizations(const std::vector<int>& pols);
   void setCycles(const std::vector<int>& cycs);
-  void setTaQL(const std::string& taql);
+  void setName(const std::string&);
+  virtual void setTaQL(const std::string& taql);
 
   std::vector<int> getScans();
@@ -52 +53 @@
   casa::Table operator()(const casa::Table& tab) { return apply(tab); };
 
-  void reset() { selections_.clear(); taql_ = "";};
+  void reset() { intselections_.clear();stringselections_.clear(); taql_ = "";};
 
   bool empty() const;
@@ -58 +59 @@
   std::string print();
 
+protected:
+  std::vector< int > getint( const std::string& key);
+  std::vector< std::string > getstring( const std::string& key);
+
+  void setint(const std::string& key, const std::vector< int >& val);
+  void setstring(const std::string& key, const std::vector< std::string >& val);
+
 private:
-  //
-  std::vector< int > get( const std::string& key);
-  void set(const std::string& key, const std::vector< int >& val);
-
-  typedef std::map<std::string, std::vector<int> > idmap;
+  typedef std::map<std::string, std::vector<int> > intidmap;
+  typedef std::map<std::string, std::vector<std::string> > stringidmap;
   // has to be mutable, as to stl limitations
-  mutable idmap selections_;
+  mutable intidmap intselections_;
+  mutable stringidmap stringselections_;
   std::string taql_;
 };