Changeset 7e6b00

Timestamp:

Jun 10, 2010, 4:13:23 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

61745cc

Parents:

623e89

Message:

FIX: Sequence of actions called from command line is now corrected.

• MapOfActions: new function getShortFormToActionMap() which gives the inverse of the ShortFormMap.
• CommandLineParser: new function scanforSequenceOfArguments() added to Run() which:
  • goes through the arguments
  • picks out the command
  • if prefixed by "-" uses the map to look up the actionname, for "--" the name is the command.
• main(): creates the map by calling getShortFormToActionMap() and handing over to CommandLineParser::Run()

Location:

src

Files:

• Actions/MapOfActions.cpp (modified) (1 diff)
• Actions/MapOfActions.hpp (modified) (1 diff)
• CommandLineParser.cpp (modified) (3 diffs)
• CommandLineParser.hpp (modified) (4 diffs)
• UIElements/CommandLineUI/CommandLineWindow.cpp (modified) (1 diff)
• builder.cpp (modified) (1 diff)

src/Actions/MapOfActions.cpp

@@ -545 +545 @@
 }
 
+/** Returns the inverse to MapOfActions::ShortFormMap, i.e. lookup actionname for its short form.
+ * \return map from short form of action to name of action
+ */
+map <std::string, std::string> MapOfActions::getShortFormToActionMap()
+{
+  map <std::string, std::string> result;
+
+  for (map<std::string, std::string>::iterator iter = ShortFormMap.begin(); iter != ShortFormMap.end();  ++iter)
+    result[iter->second] = iter->first;
+
+  return result;
+}
 
 

src/Actions/MapOfActions.hpp

@@ -30 +30 @@
   std::string getKeyAndShortForm(string actionname);
   std::string getShortForm(string actionname);
+  map <std::string, std::string> getShortFormToActionMap();
 
   void AddOptionsToParser();

src/CommandLineParser.cpp

@@ -9 +9 @@
 #include <fstream>
 #include <iostream>
+#include <map>
 
 #include "Patterns/Singleton_impl.hpp"
 #include "CommandLineParser.hpp"
+#include "log.hpp"
+#include "verbose.hpp"
 
 using namespace std;
@@ -45 +48 @@
 }
 
+/** Scan the argument list for -a or --arguments and store their order for later use.
+ * \param &ShortFormToActionMap e.g. gives "help" for "h"
+ */
+void CommandLineParser::scanforSequenceOfArguments(map <std::string, std::string> &ShortFormToActionMap)
+{
+  // go through all arguments
+  for (int i=1;i<argc;i++) {
+    (cout << Verbose(1) << "Checking on " << argv[i] << endl);
+    // check whether they begin with - or -- and check that next letter is not numeric, if so insert
+    if (argv[i][0] == '-') {
+      (cout << Verbose(1) << "Possible argument: " << argv[i] << endl);
+      if (argv[i][1] == '-') {
+        (cout << Verbose(1) << "Putting " << argv[i] << " into the sequence." << endl);
+        SequenceOfActions.push_back(&(argv[i][2]));
+      } 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]));
+        if (iter != ShortFormToActionMap.end()) {
+          (cout << Verbose(1) << "Putting " << iter->second << " for " << iter->first << " into the sequence." << endl);
+          SequenceOfActions.push_back(iter->second);
+        }
+      }
+    }
+  }
+}
 
 
@@ -72 +99 @@
  * \param **_argv argument array from main()
  */
-void CommandLineParser::Run(int _argc, char **_argv)
+void CommandLineParser::Run(int _argc, char **_argv, map <std::string, std::string> &ShortFormToActionMap)
 {
   setOptions(_argc,_argv);
   Parse();
+  scanforSequenceOfArguments(ShortFormToActionMap);
 }
 

src/CommandLineParser.hpp

@@ -15 +15 @@
 #include "Patterns/Singleton.hpp"
 
+#include <list>
 
 class CommandLineParser : public Singleton<CommandLineParser> {
@@ -21 +22 @@
 
   // Parses the command line arguments in CommandLineParser::**argv with currently known options.
-  void Run(int _argc, char **_argv);
+  void Run(int _argc, char **_argv, std::map <std::string, std::string> &ShortFormToActionMap);
 
   // Checks whether there have been any commands on the command line.
@@ -40 +41 @@
   po::variables_map vm;
 
+  // private sequence of actions as they appeared on the command line
+  std::list<std::string> SequenceOfActions;
+
 private:
   // private constructor and destructor
@@ -57 +61 @@
   void Parse();
 
+  // as boost's program_options does not care about of order of appearance but we do for actions,
+  // we have to have a list and a function to obtain it.
+  void scanforSequenceOfArguments(std::map <std::string, std::string> &ShortFormToActionMap);
+
   // argument counter and array passed on from main()
   int argc;

src/UIElements/CommandLineUI/CommandLineWindow.cpp

@@ -79 +79 @@
 void CommandLineWindow::display() {
   // go through all possible actions
-  for (po::variables_map::iterator CommandRunner = CommandLineParser::getInstance().vm.begin(); CommandRunner != CommandLineParser::getInstance().vm.end(); ++CommandRunner) {
-    cout << "Checking presence of " << CommandRunner->first << endl;
-    if (ActionRegistry::getInstance().isActionByNamePresent(CommandRunner->first))
-      ActionRegistry::getInstance().getActionByName(CommandRunner->first)->call();
+  for (std::list<std::string>::iterator CommandRunner = CommandLineParser::getInstance().SequenceOfActions.begin(); CommandRunner != CommandLineParser::getInstance().SequenceOfActions.end(); ++CommandRunner) {
+    cout << "Checking presence of " << *CommandRunner << endl;
+    if (ActionRegistry::getInstance().isActionByNamePresent(*CommandRunner))
+      ActionRegistry::getInstance().getActionByName(*CommandRunner)->call();
   }
 }

src/builder.cpp

@@ -2315 +2315 @@
       // handle remaining arguments by CommandLineParser
       MapOfActions::getInstance().AddOptionsToParser();
-      CommandLineParser::getInstance().Run(ArgcSize,Arguments);
+      map <std::string, std::string> ShortFormToActionMap = MapOfActions::getInstance().getShortFormToActionMap();
+      CommandLineParser::getInstance().Run(ArgcSize,Arguments, ShortFormToActionMap);
       if (!CommandLineParser::getInstance().isEmpty()) {
         DoLog(0) && (Log() << Verbose(0) << "Setting UI to CommandLine." << endl);