Changes in src/UIElements/CommandLineUI/CommandLineParser.cpp [e4afb4:3a21a7]

File:

• src/UIElements/CommandLineUI/CommandLineParser.cpp (modified) (6 diffs)

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -21 +21 @@
 
 #include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
 #include <boost/program_options.hpp>
 #include <fstream>
 #include <iostream>
 #include <map>
-#include <vector>
 
 #include "Actions/Action.hpp"
@@ -34 +32 @@
 #include "Actions/OptionTrait.hpp"
 #include "Actions/Values.hpp"
-#include "Helpers/Assert.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
 #include "CommandLineParser.hpp"
+#include "CommandLineParser_validate.hpp"
 
 #include "Patterns/Singleton_impl.hpp"
 
 class element;
-
-using namespace std;
-
-/** boost::program_options validator specialization for VectorValue.
- * \param &v  reference for return value
- * \param &values string vector of scanned options
- * \param *
- * \param
- *
- */
-void validate(boost::any& v, const std::vector<std::string>& values, VectorValue *, int)
-{
-  VectorValue VV;
-  std::vector<std::string> components;
-
-  // split comma-separated values
-  if (values.size() != 1) {
-    cerr <<  "Not one vector but " << values.size() << " given " << endl;
-    throw boost::program_options::validation_error("Unequal to one vector given");
-  }
-  std::string argument(values.at(0));
-  std::string::iterator Aiter = argument.begin();
-  std::string::iterator Biter = argument.begin();
-  for (; Aiter != argument.end(); ++Aiter) {
-    if (*Aiter == ',') {
-      components.push_back(string(Biter,Aiter));
-      do {
-        Aiter++;
-      } while (*Aiter == ' ' || *Aiter == '\t');
-      Biter = Aiter;
-    }
-  }
-  components.push_back(string(Biter,argument.end()));
-
-  if (components.size() != 3) {
-    cerr <<  "Specified vector does not have three components but " << components.size() << endl;
-    throw boost::program_options::validation_error("Specified vector does not have three components");
-  }
-  VV.x = boost::lexical_cast<double>(components.at(0));
-  VV.y = boost::lexical_cast<double>(components.at(1));
-  VV.z = boost::lexical_cast<double>(components.at(2));
-  v = boost::any(VectorValue(VV));
-}
-
-void validate(boost::any& v, const std::vector<std::string>& values, BoxValue *, int)
-{
-  BoxValue BV;
-  std::vector<std::string> components;
-
-  // split comma-separated values
-  if (values.size() != 1) {
-    cerr <<  "Not one vector but " << values.size() << " given " << endl;
-    throw boost::program_options::validation_error("Unequal to one vector given");
-  }
-  std::string argument(values.at(0));
-  std::string::iterator Aiter = argument.begin();
-  std::string::iterator Biter = argument.begin();
-  for (; Aiter != argument.end(); ++Aiter) {
-    if (*Aiter == ',') {
-      components.push_back(string(Biter,Aiter));
-      do {
-        Aiter++;
-      } while (*Aiter == ' ' || *Aiter == '\t');
-      Biter = Aiter;
-    }
-  }
-  components.push_back(string(Biter,argument.end()));
-
-  if (components.size() != 6) {
-    cerr <<  "Specified vector does not have three components but " << components.size() << endl;
-    throw boost::program_options::validation_error("Specified symmetric box matrix does not have six components");
-  }
-  BV.xx = boost::lexical_cast<double>(components.at(0));
-  BV.yx = boost::lexical_cast<double>(components.at(1));
-  BV.yy = boost::lexical_cast<double>(components.at(2));
-  BV.zx = boost::lexical_cast<double>(components.at(3));
-  BV.zy = boost::lexical_cast<double>(components.at(4));
-  BV.zz = boost::lexical_cast<double>(components.at(5));
-  v = boost::any(BoxValue(BV));
-}
-
-/** boost::program_options validator specialization for boost::filesystem::path.
- * \param &v  reference for return value
- * \param &values string vector of scanned options
- * \param *
- * \param
- *
- */
-void validate(boost::any& v, const std::vector<std::string>& values, boost::filesystem::path *, int)
-{
-  boost::filesystem::path filename;
-
-  std::cout << "boost::filesystem::path validator used." << std::endl;
-
-  // split comma-separated values
-  if (values.size() != 1) {
-    cerr <<  "Not one file but " << values.size() << " given " << endl;
-    throw boost::program_options::validation_error("Unequal to one file given");
-  }
-  filename = values.at(0);
-  v = boost::any(boost::filesystem::path(filename));
-}
-
 
 /** Constructor of class CommandLineParser.
@@ -461 +356 @@
 {
   po::store(po::command_line_parser(argc,argv).options(cmdline_options).run(), vm);
-  ifstream input;
+  std::ifstream input;
   input.open("example.cfg");
   if (!input.fail())
@@ -473 +368 @@
 void CommandLineParser::scanforSequenceOfArguments()
 {
-  map <std::string, std::string> ShortFormToActionMap = getShortFormToActionMap();
+  std::map <std::string, std::string> ShortFormToActionMap = getShortFormToActionMap();
   // go through all arguments
   for (int i=1;i<argc;i++) {
-    (cout << Verbose(1) << "Checking on " << argv[i] << endl);
+    (std::cout << Verbose(1) << "Checking on " << argv[i] << std::endl);
     // check whether they
     if (argv[i][0] == '-') { // .. begin with -
@@ -485 +380 @@
         //  .. and check that next letter is not numeric, if so insert
       } else if (((argv[i][1] < '0') || (argv[i][1] > '9')) && ((argv[i][1] != '.'))) {
-        map <std::string, std::string>::iterator iter = ShortFormToActionMap.find(&(argv[i][1]));
+        std::map <std::string, std::string>::iterator iter = ShortFormToActionMap.find(&(argv[i][1]));
         if (iter != ShortFormToActionMap.end()) {
           (cout << Verbose(1) << "Putting " << iter->second << " for " << iter->first << " into the sequence." << endl);
@@ -511 +406 @@
 std::map <std::string, std::string> CommandLineParser::getShortFormToActionMap()
 {
-  map <std::string, std::string> result;
+  std::map <std::string, std::string> result;
 
   ActionRegistry &AR = ActionRegistry::getInstance();