Changeset 13669 for trunk/FACT++/src

Timestamp:

05/12/12 12:36:50 (12 years ago)

Author:

tbretz

Message:

Added GetWildcardOptions and GetOptions to be able to access all available wildcard options of one kind at once; replaced some iterator defintions with the auto keyword for conevenience

Location:

trunk/FACT++/src

Files:

• Configuration.cc (modified) (1 diff)
• Configuration.h (modified) (1 diff)

trunk/FACT++/src/Configuration.cc

@@ -1367 +1367 @@
 
     size_t max = 0;
-    for (map<string,string>::const_iterator it=fWildcardOptions.begin(); it!=fWildcardOptions.end(); it++)
+    for (auto it=fWildcardOptions.begin(); it!=fWildcardOptions.end(); it++)
         if (it->second.length()>max)
             max = it->second.length();
 
     cout.setf(ios_base::left);
-    for (map<string,string>::const_iterator it=fWildcardOptions.begin(); it!=fWildcardOptions.end(); it++)
+    for (auto it=fWildcardOptions.begin(); it!=fWildcardOptions.end(); it++)
         cout << setw(max+1) << it->second << " : " << it->first <<endl;
+}
+
+const vector<string> Configuration::GetWildcardOptions(const std::string &opt) const
+{
+    vector<string> rc;
+
+    for (auto it=fWildcardOptions.begin(); it!=fWildcardOptions.end(); it++)
+    {
+        if (it->second == opt)
+            rc.push_back(it->first);
+    }
+
+    return rc;
 }
 

trunk/FACT++/src/Configuration.h

@@ -120 +120 @@
 
     const std::map<std::string,std::string> &GetWildcardOptions() const { return fWildcardOptions; }
+    const std::vector<std::string> GetWildcardOptions(const std::string &opt) const;
+
+    template<class T>
+    const std::map<std::string,T> GetOptions(const std::string &opt)
+    {
+        const std::vector<std::string> rc = GetWildcardOptions(opt+'*');
+
+        std::map<std::string,T> map;
+        for (auto it=rc.begin(); it!=rc.end(); it++)
+            map[it->substr(opt.length())] = Get<T>(*it);
+
+        return map;
+    }
 
     std::multimap<std::string, std::string> GetOptions() const;