Changeset 690741 for src/Actions/OptionRegistry.cpp

Timestamp:

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

File:

• src/Actions/OptionRegistry.cpp (modified) (2 diffs)

src/Actions/OptionRegistry.cpp

@@ -71 +71 @@
 //void OptionRegistry::Init()
 //{
-//  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
-//  for (ActionRegistry::const_iterator actioniter = AR.getBeginIter();
-//      actioniter != AR.getEndIter();
+//  ActionQueue &AQ = ActionQueue::getInstance();
+//  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
+//  for (ActionQueue::ActionTokens_t::const_iterator actioniter = tokens.begin();
+//      actioniter != tokens.end();
 //      ++actioniter) {
-//    Action* const currentAction = actioniter->second;
-//    for (ActionTrait::options_const_iterator optioniter = currentAction->Traits.getBeginIter();
-//        optioniter != currentAction->Traits.getEndIter();
+//    const ActionTrait& currentTrait = AQ.getActionsTrait(*actioniter);
+//    for (ActionTrait::options_const_iterator optioniter = currentTrait.getBeginIter();
+//        optioniter != currentTrait.getEndIter();
 //        ++optioniter) {
 //      // wrap option in a shared_ptr to have it exist till and automatically removed at end of code
 //      std::string const &OptionName = optioniter->first;
-//      std::type_info const &typeDesired = *((actioniter->second)->Traits.getOptionType(OptionName));
+//      std::type_info const &typeDesired = *(currentTrait.getOptionType(OptionName));
 //      if (isOptionPresentByName(OptionName)) {
 //        std::type_info const &typePresent = *(getOptionByName(OptionName)->getType());
@@ -98 +99 @@
 void OptionRegistry::ConsistencyCheck()
 {
-  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
-  for (ActionRegistry::const_iterator actioniter = AR.getBeginIter();
-      actioniter != AR.getEndIter();
+  ActionQueue &AQ = ActionQueue::getInstance();
+  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
+  for (ActionQueue::ActionTokens_t::const_iterator actioniter = tokens.begin();
+      actioniter != tokens.end();
       ++actioniter) {
-    for (ActionTrait::options_const_iterator optioniter = (actioniter->second)->Traits.getBeginIter();
-        optioniter != (actioniter->second)->Traits.getEndIter();
+    const ActionTrait& currentTrait = AQ.getActionsTrait(*actioniter);
+    for (ActionTrait::options_const_iterator optioniter = currentTrait.getBeginIter();
+        optioniter != currentTrait.getEndIter();
         ++optioniter) {
 #ifndef NDEBUG
       std::string const &OptionName = optioniter->first;
-      std::type_info const &typeDesired = *((actioniter->second)->Traits.getOption(OptionName).getType());
+      std::type_info const &typeDesired = *(currentTrait.getOption(OptionName).getType());
       std::type_info const &typePresent = *(getOptionByName(OptionName)->getType());
 #endif