Changeset 690741 for src


Ignore:
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.

Location:
src
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/ActionQueue.cpp

    r1d3563 r690741  
    3737#include "Actions/ActionQueue.hpp"
    3838
     39#include "CodePatterns/Assert.hpp"
     40#include "CodePatterns/IteratorAdaptors.hpp"
    3941#include "CodePatterns/Singleton_impl.hpp"
     42
     43#include <vector>
    4044
    4145using namespace MoleCuilder;
    … …  
    6266}
    6367
     68const ActionTrait& ActionQueue::getActionsTrait(const std::string name) const
     69{
     70  // this const_cast is just required as long as we have a non-const getActionByName
     71  const Action * const action = const_cast<ActionQueue *>(this)->getActionByName(name);
     72  return action->Traits;
     73}
     74
     75const ActionQueue::ActionTokens_t ActionQueue::getListOfActions() const
     76{
     77  ActionTokens_t returnlist;
     78
     79  returnlist.insert(
     80      returnlist.end(),
     81      MapKeyConstIterator<ActionRegistry::const_iterator>(AR.getBeginIter()),
     82      MapKeyConstIterator<ActionRegistry::const_iterator>(AR.getEndIter()));
     83
     84  return returnlist;
     85}
     86
    6487CONSTRUCT_SINGLETON(ActionQueue)

  • src/Actions/ActionQueue.hpp

    r1d3563 r690741  
    1717
    1818#include <list>
     19#include <vector>
    1920
    2021#include "Actions/ActionRegistry.hpp"
    … …  
    3334  friend class Singleton<ActionQueue>;
    3435public:
     36  typedef std::vector<std::string> ActionTokens_t;
    3537  typedef std::list<Action *> ActionQueue_t;
    3638
    … …  
    5759  int getLastPosition(const std::string &MenuName) const;
    5860
     61  /** Returns the vector with the tokens of all currently known Actions.
     62   *
     63   * \return list of all tokens
     64   */
     65  const ActionTokens_t getListOfActions() const;
     66
     67  /** Returns the trait to an Action.
     68   *
     69   * \param name name of Action
     70   * \return const ref to its default Trait.
     71   */
     72  const ActionTrait& getActionsTrait(const std::string name) const;
     73
    5974  /** Getter function for the ActionRegistry for transitional purpose.
    6075   *
    … …  
    6479    return AR;
    6580  }
    66 
    6781
    6882private:

  • src/Actions/CommandAction/HelpAction.cpp

    r1d3563 r690741  
    7979  // print list of actions or its options
    8080  ActionQueue &AQ = ActionQueue::getInstance();
    81   ActionRegistry &AR = AQ.getActionRegistry();
     81  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
    8282  if (params.actionname.get() == std::string("none")) {
    8383    // print list of all Actions
    8484    std::cout << "Here is a list of all available Actions:" << std::endl;
    85     for(ActionRegistry::const_iterator iter = AR.getBeginIter();
    86         iter != AR.getEndIter();
     85    for(ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
     86        iter != tokens.end();
    8787        ++iter) {
    88       const Action *instance = iter->second;
    89       std::cout << "'" << iter->first << "': \t "
    90           << instance->Traits.getDescription() << std::endl;
     88      std::cout << "'" << *iter << "': \t "
     89          << AQ.getActionsTrait(*iter).getDescription() << std::endl;
    9190    }
    9291  } else {

  • src/Actions/OptionRegistry.cpp

    r1d3563 r690741  
    7171//void OptionRegistry::Init()
    7272//{
    73 //  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
    74 //  for (ActionRegistry::const_iterator actioniter = AR.getBeginIter();
    75 //      actioniter != AR.getEndIter();
     73//  ActionQueue &AQ = ActionQueue::getInstance();
     74//  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
     75//  for (ActionQueue::ActionTokens_t::const_iterator actioniter = tokens.begin();
     76//      actioniter != tokens.end();
    7677//      ++actioniter) {
    77 //    Action* const currentAction = actioniter->second;
    78 //    for (ActionTrait::options_const_iterator optioniter = currentAction->Traits.getBeginIter();
    79 //        optioniter != currentAction->Traits.getEndIter();
     78//    const ActionTrait& currentTrait = AQ.getActionsTrait(*actioniter);
     79//    for (ActionTrait::options_const_iterator optioniter = currentTrait.getBeginIter();
     80//        optioniter != currentTrait.getEndIter();
    8081//        ++optioniter) {
    8182//      // wrap option in a shared_ptr to have it exist till and automatically removed at end of code
    8283//      std::string const &OptionName = optioniter->first;
    83 //      std::type_info const &typeDesired = *((actioniter->second)->Traits.getOptionType(OptionName));
     84//      std::type_info const &typeDesired = *(currentTrait.getOptionType(OptionName));
    8485//      if (isOptionPresentByName(OptionName)) {
    8586//        std::type_info const &typePresent = *(getOptionByName(OptionName)->getType());
    … …  
    9899void OptionRegistry::ConsistencyCheck()
    99100{
    100   ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
    101   for (ActionRegistry::const_iterator actioniter = AR.getBeginIter();
    102       actioniter != AR.getEndIter();
     101  ActionQueue &AQ = ActionQueue::getInstance();
     102  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
     103  for (ActionQueue::ActionTokens_t::const_iterator actioniter = tokens.begin();
     104      actioniter != tokens.end();
    103105      ++actioniter) {
    104     for (ActionTrait::options_const_iterator optioniter = (actioniter->second)->Traits.getBeginIter();
    105         optioniter != (actioniter->second)->Traits.getEndIter();
     106    const ActionTrait& currentTrait = AQ.getActionsTrait(*actioniter);
     107    for (ActionTrait::options_const_iterator optioniter = currentTrait.getBeginIter();
     108        optioniter != currentTrait.getEndIter();
    106109        ++optioniter) {
    107110#ifndef NDEBUG
    108111      std::string const &OptionName = optioniter->first;
    109       std::type_info const &typeDesired = *((actioniter->second)->Traits.getOption(OptionName).getType());
     112      std::type_info const &typeDesired = *(currentTrait.getOption(OptionName).getType());
    110113      std::type_info const &typePresent = *(getOptionByName(OptionName)->getType());
    111114#endif

  • src/Actions/unittests/ActionRegistryUnitTest.cpp

    r1d3563 r690741  
    6161void ActionRegistryTest::setUp()
    6262{
    63   AR = &ActionQueue::getInstance().getActionRegistry();
    6463};
    6564
    … …  
    7473  std::map <std::string, std::string> result;
    7574
    76   for (ActionRegistry::const_iterator iter = AR->getBeginIter(); iter != AR->getEndIter(); ++iter) {
    77     if ((iter->second)->Traits.hasShortForm()) {
    78       ASSERT(result.find((iter->second)->Traits.getShortForm()) == result.end(),
    79           "Short form "+toString((iter->second)->Traits.getShortForm())+
    80           " for action "+toString(iter->first)+" already present from "+
    81           std::string(result[(iter->second)->Traits.getShortForm()])+"!");
    82       result[(iter->second)->Traits.getShortForm()] = (iter->second)->getName();
     75  ActionQueue &AQ = ActionQueue::getInstance();
     76  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
     77  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
     78      iter != tokens.end(); ++iter) {
     79    const ActionTrait &CurrentTrait = AQ.getActionsTrait(*iter);
     80    if (CurrentTrait.hasShortForm()) {
     81      ASSERT(result.find(CurrentTrait.getShortForm()) == result.end(),
     82          "Short form "+toString(CurrentTrait.getShortForm())+
     83          " for action "+toString(*iter)+" already present from "+
     84          std::string(result[CurrentTrait.getShortForm()])+"!");
     85      result[CurrentTrait.getShortForm()] = *iter;
    8386    }
    8487  }

  • src/Actions/unittests/ActionRegistryUnitTest.hpp

    r1d3563 r690741  
    1717#include <cppunit/extensions/HelperMacros.h>
    1818
    19 namespace MoleCuilder {
    20 class ActionRegistry;
    21 };
    22 
    2319/********************************************** Test classes **************************************/
    2420
    … …  
    3329      void tearDown();
    3430      void CheckDoublyUsedShortforms();
    35 
    36 private:
    37       MoleCuilder::ActionRegistry *AR;
    3831};
    3932

  • src/UIElements/CommandLineUI/CommandLineParser.cpp

    r1d3563 r690741  
    112112  std::set<std::string> AlreadyAddedOptionNames;
    113113
    114   ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
    115114  bool ActionAlreadyAdded_flag = false;
    116   for (ActionRegistry::const_iterator actioniter = AR.getBeginIter(); actioniter != AR.getEndIter(); ++actioniter) {
     115  ActionQueue &AQ = ActionQueue::getInstance();
     116  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
     117  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
     118      iter != tokens.end(); ++iter) {
     119    const ActionTrait &CurrentTrait = AQ.getActionsTrait(*iter);
    117120    ActionAlreadyAdded_flag = false;
    118     Action* const currentAction = actioniter->second;
    119121    //std::cout << "Current Action to initialize is: " << actioniter->first << std::endl;
    120122
    121     for (ActionTrait::options_const_iterator optioniter = currentAction->Traits.getBeginIter();
    122         optioniter != currentAction->Traits.getEndIter();
     123    for (ActionTrait::options_const_iterator optioniter = CurrentTrait.getBeginIter();
     124        optioniter != CurrentTrait.getEndIter();
    123125        ++optioniter) {
    124       if (optioniter->first == actioniter->first)
     126      if (optioniter->first == *iter)
    125127        ActionAlreadyAdded_flag = true;
    126128      ASSERT( OptionRegistry::getInstance().isOptionPresentByName(optioniter->first),
    … …  
    169171//      std::cout  << std::endl;
    170172
    171       ASSERT(CmdParserLookup.find(currentAction->Traits.getMenuName()) != CmdParserLookup.end(),
     173      ASSERT(CmdParserLookup.find(CurrentTrait.getMenuName()) != CmdParserLookup.end(),
    172174          "CommandLineParser: boost::program_options::options_description for this Action not present.");
    173       AddOptionToParser(dynamic_cast<const OptionTrait * const>(&(currentAction->Traits)),(CmdParserLookup[currentAction->Traits.getMenuName()]));
     175      AddOptionToParser(dynamic_cast<const OptionTrait * const>(&CurrentTrait),(CmdParserLookup[CurrentTrait.getMenuName()]));
    174176    }
    175177  }
    … …  
    482484  std::map <std::string, std::string> result;
    483485
    484   ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
    485   for (ActionRegistry::const_iterator iter = AR.getBeginIter(); iter != AR.getEndIter(); ++iter)
    486     if ((iter->second)->Traits.hasShortForm()) {
    487       ASSERT(result.find((iter->second)->Traits.getShortForm()) == result.end(),
    488           "Short form "+toString((iter->second)->Traits.getShortForm())+
    489           " for action "+toString(iter->first)+" already present from "+
    490           std::string(result[(iter->second)->Traits.getShortForm()])+"!");
    491       result[(iter->second)->Traits.getShortForm()] = (iter->second)->getName();
     486  ActionQueue &AQ = ActionQueue::getInstance();
     487  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
     488  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
     489      iter != tokens.end(); ++iter) {
     490    const ActionTrait &CurrentTrait = AQ.getActionsTrait(*iter);
     491    if (CurrentTrait.hasShortForm()) {
     492      ASSERT(result.find(CurrentTrait.getShortForm()) == result.end(),
     493          "Short form "+toString(CurrentTrait.getShortForm())+
     494          " for action "+toString(*iter)+" already present from "+
     495          std::string(result[CurrentTrait.getShortForm()])+"!");
     496      result[CurrentTrait.getShortForm()] = *iter;
    492497    }
     498  }
    493499
    494500  return result;

  • src/UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.cpp

    r1d3563 r690741  
    6262void CommandLineParser_ActionRegistry_ConsistencyTest::setUp()
    6363{
    64   AR = &ActionQueue::getInstance().getActionRegistry();
    6564  CLP = CommandLineParser::getPointer();
    6665};
    … …  
    9089
    9190  // go through all Actions and gather menu names
    92   for (ActionRegistry::const_iterator iter = AR->getBeginIter();
    93       iter != AR->getEndIter();
    94       ++iter) {
    95     const std::string &MenuName = (iter->second)->Traits.getMenuName();
     91  ActionQueue &AQ = ActionQueue::getInstance();
     92  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
     93  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
     94      iter != tokens.end(); ++iter) {
     95    const ActionTrait &CurrentTrait = AQ.getActionsTrait(*iter);
     96    const std::string &MenuName = CurrentTrait.getMenuName();
    9697    MenuNames_from_ActionRegistry.insert(MenuName);
    9798  }
    … …  
    105106  }
    106107
    107 
    108108  for (std::set <std::string>::const_iterator ARiter = MenuNames_from_ActionRegistry.begin();
    109109      ARiter != MenuNames_from_ActionRegistry.end();

  • src/UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.hpp

    r1d3563 r690741  
    1919class CommandLineParser;
    2020
    21 namespace MoleCuilder {
    22   class ActionRegistry;
    23 }
    24 
    2521/********************************************** Test classes **************************************/
    2622
    … …  
    3733
    3834private:
    39       MoleCuilder::ActionRegistry *AR;
    4035      CommandLineParser *CLP;
    4136};

  • src/UIElements/Menu/Menu.cpp

    r1d3563 r690741  
    122122{
    123123  // go through all actions and add those belonging to this menu
    124   ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
    125   for (ActionRegistry::const_iterator iter = AR.getBeginIter();
    126       iter != AR.getEndIter();
    127       ++iter) {
    128     const std::string &MenuName = iter->second->Traits.getMenuName();
     124  ActionQueue &AQ = ActionQueue::getInstance();
     125  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
     126  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
     127      iter != tokens.end(); ++iter) {
     128    const ActionTrait &CurrentTrait = AQ.getActionsTrait(*iter);
     129    const std::string &MenuName = CurrentTrait.getMenuName();
    129130    if (MenuName == name) {
    130       const std::string &ActionName = iter->first;
     131      const std::string &ActionName = *iter;
    131132      Menu::addAction(ActionName);
    132133    }

  • src/UIElements/Menu/MenuDescription.cpp

    r1d3563 r690741  
    158158//  std::multimap <std::string, std::string> result;
    159159//
    160 //  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry()();
    161 //  for (ActionRegistry::const_iterator iter = AR.getBeginIter();iter != AR.getEndIter();++iter) {
    162 //    std::cout << "Inserting " << (iter->second)->getName() << " into menu " << (iter->second)->Traits.getMenuName() << std::endl;
    163 //    result.insert( std::pair<std::string, std::string> ((iter->second)->Traits.getMenuName(), (iter->second)->getName()));
     160//  ActionQueue &AQ = ActionQueue::getInstance();
     161//  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
     162//  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
     163//      iter != tokens.end(); ++iter) {
     164//    const ActionTrait &CurrentTrait = AQ.getActionsTrait(*iter);
     165//    std::cout << "Inserting " << *iter << " into menu " << CurrentTrait.getMenuName() << std::endl;
     166//    result.insert( std::pair<std::string, std::string> (CurrentTrait.getMenuName(), *iter));
    164167//  }
    165168//  // TODO: MenuPosition is not yet realized.

  • src/UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp

    r1d3563 r690741  
    6060void MenuDescription_ActionRegistry_ConsistencyTest::setUp()
    6161{
    62   AR = &ActionQueue::getInstance().getActionRegistry();
    63 };
     62}
    6463
    6564
    … …  
    7271  World::purgeInstance();
    7372  WorldTime::purgeInstance();
    74 };
     73}
    7574
    7675/** UnitTest for consistency.
    … …  
    8281
    8382  // go through all Actions and gather menu names
    84   for (ActionRegistry::const_iterator iter = AR->getBeginIter();
    85       iter != AR->getEndIter();
    86       ++iter) {
    87     const std::string &MenuName = (iter->second)->Traits.getMenuName();
     83  ActionQueue &AQ = ActionQueue::getInstance();
     84  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
     85  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
     86      iter != tokens.end(); ++iter) {
     87    const ActionTrait &CurrentTrait = AQ.getActionsTrait(*iter);
     88    const std::string &MenuName = CurrentTrait.getMenuName();
    8889    MenuNames_from_ActionRegistry.insert(MenuName);
    8990  }

  • src/UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp

    r1d3563 r690741  
    1919#include "UIElements/Menu/MenuDescription.hpp"
    2020
    21 namespace MoleCuilder {
    22   class ActionRegistry;
    23 }
    24 
    2521/********************************************** Test classes **************************************/
    2622
    … …  
    3834private:
    3935      MenuDescription md;
    40       MoleCuilder::ActionRegistry *AR;
    4136};
    4237

  • src/cleanUp.cpp

    r1d3563 r690741  
    143143void printTimings()
    144144{
    145   const MoleCuilder::ActionRegistry &AR = MoleCuilder::ActionQueue::getInstance().getActionRegistry();
     145  const MoleCuilder::ActionQueue::ActionTokens_t tokens = MoleCuilder::ActionQueue::getInstance().getListOfActions();
    146146  const Chronos &Chron = Chronos::getInstance();
    147147  if (!DoLog(2)) {
    148148    std::cout << "(Non-zero) Times used per Action [seconds]:" << std::endl;
    149     for (MoleCuilder::ActionRegistry::const_iterator iter = AR.getBeginIter(); iter != AR.getEndIter(); ++iter)
    150       if (Chron.getTime(iter->first) != 0.) { // dont give if action has not been used
    151         std::cout << "  " << setiosflags(ios::left) << setw(24) << setfill('.') << iter->first;
     149    for (MoleCuilder::ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
     150        iter != tokens.end(); ++iter)
     151      if (Chron.getTime(*iter) != 0.) { // dont give if action has not been used
     152        std::cout << "  " << setiosflags(ios::left) << setw(24) << setfill('.') << *iter;
    152153        std::cout << setiosflags(ios::left)
    153154#ifdef HAVE_SYS_TIMES_H
    … …  
    156157              << setprecision(9)
    157158#endif
    158               << fixed << Chron.getTime(iter->first) << std::endl;
     159              << fixed << Chron.getTime(*iter) << std::endl;
    159160      }
    160161  } else {
Note: See TracChangeset for help on using the changeset viewer.