Changeset 850 for trunk/src/STSelector.h

Timestamp:

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

Author:

mar637

Message:

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

File:

• trunk/src/STSelector.h (modified) (3 diffs)

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_;
 };