Changeset 15d21e

Timestamp:

Jun 20, 2017, 8:02:18 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChangeBugEmailaddress, ChemicalSpaceEvaluator, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_oldresults, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps

Children:

137845

Parents:

da7ef9

git-author:

Frederik Heber <heber@…> (03/23/17 17:38:46)

git-committer:

Frederik Heber <frederik.heber@…> (06/20/17 20:02:18)

Message:

CommandLineParser is now able to parse negative numbers.

• before they were recognized as shortforms of arguments. Now, we found a nice solution on stackoverflow that preparses all options and checks whether the shortform is actually convertible to a number and skips it then.

File:

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

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -36 +36 @@
 
 #include <boost/filesystem.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/program_options/option.hpp>
+#include <boost/program_options/value_semantic.hpp>
 #include <boost/program_options.hpp>
 #include <fstream>
@@ -461 +464 @@
 }
 
+/** This is due to the answer by Aleksey Vitebskiy
+ * in http://stackoverflow.com/questions/4107087/accepting-negative-doubles-with-boostprogram-options
+ *
+ */
+std::vector<po::option> ignore_numbers(std::vector<std::string>& args)
+{
+    std::vector<po::option> result;
+    int pos = 0;
+    while(!args.empty()) {
+        const std::string& arg = args[0];
+        bool isNumber = true;
+        try {
+          boost::lexical_cast<double>(arg);
+        } catch(boost::bad_lexical_cast) {
+          isNumber = false;
+        }
+        if (isNumber) {
+            result.push_back(po::option());
+            po::option& opt = result.back();
+
+            opt.position_key = pos++;
+            opt.value.push_back(arg);
+            opt.original_tokens.push_back(arg);
+
+            args.erase(args.begin());
+        } else {
+            break;
+        }
+    }
+
+    return result;
+}
+
 /** Parses the command line arguments.
  * Calls program_options::store() and program_options::notify()
@@ -471 +507 @@
   bool status = true;
   try {
-    po::store(po::command_line_parser(argc,argv).options(cmdline_options).run(), vm);
+    po::store(po::command_line_parser(argc,argv).extra_style_parser(&ignore_numbers).options(cmdline_options).run(), vm);
   } catch (std::exception &e) {
     std::cerr << "Something went wrong with parsing the command-line arguments: "