Changeset 690741 for src/UIElements

Timestamp:

Sep 19, 2013, 8:23:52 PM (12 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:

a6ceab

Parents:

1d3563

git-author:

Frederik Heber <heber@…> (08/16/13 11:47:48)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:23:52)

Message:

Added getListOfActions() and getActionsTrait() to completely wrap ActionRegistry.

Location:

src/UIElements

Files:

• CommandLineUI/CommandLineParser.cpp (modified) (3 diffs)
• CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.cpp (modified) (3 diffs)
• CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.hpp (modified) (2 diffs)
• Menu/Menu.cpp (modified) (1 diff)
• Menu/MenuDescription.cpp (modified) (1 diff)
• Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp (modified) (3 diffs)
• Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp (modified) (2 diffs)

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -112 +112 @@
   std::set<std::string> AlreadyAddedOptionNames;
 
-  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
   bool ActionAlreadyAdded_flag = false;
-  for (ActionRegistry::const_iterator actioniter = AR.getBeginIter(); actioniter != AR.getEndIter(); ++actioniter) {
+  ActionQueue &AQ = ActionQueue::getInstance();
+  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
+  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
+      iter != tokens.end(); ++iter) {
+    const ActionTrait &CurrentTrait = AQ.getActionsTrait(*iter);
     ActionAlreadyAdded_flag = false;
-    Action* const currentAction = actioniter->second;
     //std::cout << "Current Action to initialize is: " << actioniter->first << std::endl;
 
-    for (ActionTrait::options_const_iterator optioniter = currentAction->Traits.getBeginIter();
-        optioniter != currentAction->Traits.getEndIter();
+    for (ActionTrait::options_const_iterator optioniter = CurrentTrait.getBeginIter();
+        optioniter != CurrentTrait.getEndIter();
         ++optioniter) {
-      if (optioniter->first == actioniter->first)
+      if (optioniter->first == *iter)
         ActionAlreadyAdded_flag = true;
       ASSERT( OptionRegistry::getInstance().isOptionPresentByName(optioniter->first),
@@ -169 +171 @@
 //      std::cout  << std::endl;
 
-      ASSERT(CmdParserLookup.find(currentAction->Traits.getMenuName()) != CmdParserLookup.end(),
+      ASSERT(CmdParserLookup.find(CurrentTrait.getMenuName()) != CmdParserLookup.end(),
           "CommandLineParser: boost::program_options::options_description for this Action not present.");
-      AddOptionToParser(dynamic_cast<const OptionTrait * const>(&(currentAction->Traits)),(CmdParserLookup[currentAction->Traits.getMenuName()]));
+      AddOptionToParser(dynamic_cast<const OptionTrait * const>(&CurrentTrait),(CmdParserLookup[CurrentTrait.getMenuName()]));
     }
   }
@@ -482 +484 @@
   std::map <std::string, std::string> result;
 
-  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
-  for (ActionRegistry::const_iterator iter = AR.getBeginIter(); iter != AR.getEndIter(); ++iter)
-    if ((iter->second)->Traits.hasShortForm()) {
-      ASSERT(result.find((iter->second)->Traits.getShortForm()) == result.end(),
-          "Short form "+toString((iter->second)->Traits.getShortForm())+
-          " for action "+toString(iter->first)+" already present from "+
-          std::string(result[(iter->second)->Traits.getShortForm()])+"!");
-      result[(iter->second)->Traits.getShortForm()] = (iter->second)->getName();
+  ActionQueue &AQ = ActionQueue::getInstance();
+  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
+  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
+      iter != tokens.end(); ++iter) {
+    const ActionTrait &CurrentTrait = AQ.getActionsTrait(*iter);
+    if (CurrentTrait.hasShortForm()) {
+      ASSERT(result.find(CurrentTrait.getShortForm()) == result.end(),
+          "Short form "+toString(CurrentTrait.getShortForm())+
+          " for action "+toString(*iter)+" already present from "+
+          std::string(result[CurrentTrait.getShortForm()])+"!");
+      result[CurrentTrait.getShortForm()] = *iter;
     }
+  }
 
   return result;

src/UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.cpp

@@ -62 +62 @@
 void CommandLineParser_ActionRegistry_ConsistencyTest::setUp()
 {
-  AR = &ActionQueue::getInstance().getActionRegistry();
   CLP = CommandLineParser::getPointer();
 };
@@ -90 +89 @@
 
   // go through all Actions and gather menu names
-  for (ActionRegistry::const_iterator iter = AR->getBeginIter();
-      iter != AR->getEndIter();
-      ++iter) {
-    const std::string &MenuName = (iter->second)->Traits.getMenuName();
+  ActionQueue &AQ = ActionQueue::getInstance();
+  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
+  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
+      iter != tokens.end(); ++iter) {
+    const ActionTrait &CurrentTrait = AQ.getActionsTrait(*iter);
+    const std::string &MenuName = CurrentTrait.getMenuName();
     MenuNames_from_ActionRegistry.insert(MenuName);
   }
@@ -105 +106 @@
   }
 
-
   for (std::set <std::string>::const_iterator ARiter = MenuNames_from_ActionRegistry.begin();
       ARiter != MenuNames_from_ActionRegistry.end();

src/UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.hpp

@@ -19 +19 @@
 class CommandLineParser;
 
-namespace MoleCuilder {
-  class ActionRegistry;
-}
-
 /********************************************** Test classes **************************************/
 
@@ -37 +33 @@
 
 private:
-      MoleCuilder::ActionRegistry *AR;
       CommandLineParser *CLP;
 };

src/UIElements/Menu/Menu.cpp

@@ -122 +122 @@
 {
   // go through all actions and add those belonging to this menu
-  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
-  for (ActionRegistry::const_iterator iter = AR.getBeginIter();
-      iter != AR.getEndIter();
-      ++iter) {
-    const std::string &MenuName = iter->second->Traits.getMenuName();
+  ActionQueue &AQ = ActionQueue::getInstance();
+  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
+  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
+      iter != tokens.end(); ++iter) {
+    const ActionTrait &CurrentTrait = AQ.getActionsTrait(*iter);
+    const std::string &MenuName = CurrentTrait.getMenuName();
     if (MenuName == name) {
-      const std::string &ActionName = iter->first;
+      const std::string &ActionName = *iter;
       Menu::addAction(ActionName);
     }

src/UIElements/Menu/MenuDescription.cpp

@@ -158 +158 @@
 //  std::multimap <std::string, std::string> result;
 //
-//  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry()();
-//  for (ActionRegistry::const_iterator iter = AR.getBeginIter();iter != AR.getEndIter();++iter) {
-//    std::cout << "Inserting " << (iter->second)->getName() << " into menu " << (iter->second)->Traits.getMenuName() << std::endl;
-//    result.insert( std::pair<std::string, std::string> ((iter->second)->Traits.getMenuName(), (iter->second)->getName()));
+//  ActionQueue &AQ = ActionQueue::getInstance();
+//  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
+//  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
+//      iter != tokens.end(); ++iter) {
+//    const ActionTrait &CurrentTrait = AQ.getActionsTrait(*iter);
+//    std::cout << "Inserting " << *iter << " into menu " << CurrentTrait.getMenuName() << std::endl;
+//    result.insert( std::pair<std::string, std::string> (CurrentTrait.getMenuName(), *iter));
 //  }
 //  // TODO: MenuPosition is not yet realized.

src/UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp

@@ -60 +60 @@
 void MenuDescription_ActionRegistry_ConsistencyTest::setUp()
 {
-  AR = &ActionQueue::getInstance().getActionRegistry();
-};
+}
 
 
@@ -72 +71 @@
   World::purgeInstance();
   WorldTime::purgeInstance();
-};
+}
 
 /** UnitTest for consistency.
@@ -82 +81 @@
 
   // go through all Actions and gather menu names
-  for (ActionRegistry::const_iterator iter = AR->getBeginIter();
-      iter != AR->getEndIter();
-      ++iter) {
-    const std::string &MenuName = (iter->second)->Traits.getMenuName();
+  ActionQueue &AQ = ActionQueue::getInstance();
+  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
+  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
+      iter != tokens.end(); ++iter) {
+    const ActionTrait &CurrentTrait = AQ.getActionsTrait(*iter);
+    const std::string &MenuName = CurrentTrait.getMenuName();
     MenuNames_from_ActionRegistry.insert(MenuName);
   }

src/UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp

@@ -19 +19 @@
 #include "UIElements/Menu/MenuDescription.hpp"
 
-namespace MoleCuilder {
-  class ActionRegistry;
-}
-
 /********************************************** Test classes **************************************/
 
@@ -38 +34 @@
 private:
       MenuDescription md;
-      MoleCuilder::ActionRegistry *AR;
 };