Changes in src/UIElements/CommandLineUI/CommandLineParser.cpp [7912e9:33e801]

File:

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

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -52 +52 @@
 #include "CommandLineParser.hpp"
 #include "CommandLineParser_validate.hpp"
+#include "Parameters/Specifics/KeyValuePair.hpp"
 #include "World.hpp"
 
@@ -402 +403 @@
         ;
       break;
-    case TypeEnumContainer::RandomNumberDistribution_ParametersType:
-      OptionList->add_options()
-        (currentOption->getKeyAndShortForm().c_str(),
-            currentOption->hasDefaultValue() ?
-                  (_DefaultAsImplicit ? 
-                      po::value < std::string >()->implicit_value(boost::lexical_cast< std::string >(currentOption->getDefaultValue().c_str())) :
-                      po::value < std::string >()->default_value(boost::lexical_cast< std::string >(currentOption->getDefaultValue().c_str()))) :
-                  po::value < std::string >(),
-                  currentOption->getDescription().c_str())
-        ;
-      break;
     case TypeEnumContainer::RealSpaceMatrixType:
       OptionList->add_options()
@@ -419 +409 @@
 //                  po::value < RealSpaceMatrixValue >()->default_value(boost::lexical_cast<BoxValue>(currentOption->getDefaultValue().c_str())) :
                   po::value < RealSpaceMatrixValue >(),
+                  currentOption->getDescription().c_str())
+        ;
+      break;
+    case TypeEnumContainer::KeyValueType:
+      OptionList->add_options()
+        (currentOption->getKeyAndShortForm().c_str(),
+            currentOption->hasDefaultValue() ?
+                  (_DefaultAsImplicit ?
+                      po::value < KeyValuePair >()->implicit_value(boost::lexical_cast< KeyValuePair >(currentOption->getDefaultValue().c_str())) :
+                      po::value < KeyValuePair >()->default_value(boost::lexical_cast< KeyValuePair >(currentOption->getDefaultValue().c_str()))) :
+                  po::value < KeyValuePair >(),
+                  currentOption->getDescription().c_str())
+        ;
+      break;
+    case TypeEnumContainer::ListOfKeyValuesType:
+      OptionList->add_options()
+        (currentOption->getKeyAndShortForm().c_str(),
+//            currentOption->hasDefaultValue() ?
+//                  po::value < std::vector<KeyValuePair> >()->default_value(boost::lexical_cast< std::vector<KeyValuePair> >(currentOption->getDefaultValue().c_str())) :
+                  po::value < std::vector<KeyValuePair> >()->multitoken(),
                   currentOption->getDescription().c_str())
         ;