Changeset 1d3563 for src


Ignore:
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:
690741
Parents:
628577
git-author:
Frederik Heber <heber@…> (08/16/13 11:15:29)
git-committer:
Frederik Heber <heber@…> (09/19/13 20:23:52)
Message:

Main functions of ActionRegistry are now tunneled through ActionQueue.

Location:
src
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/Action.cpp

    r628577 r1d3563  
    128128{
    129129  // unregister us if still registered
    130   if(ActionQueue::getInstance().getActionRegistry().isActionPresentByName(getName()))
    131     if (ActionQueue::getInstance().getActionRegistry().getActionByName(getName()) == this)
     130  if(ActionQueue::getInstance().isActionKnownByName(getName()))
     131    if (ActionQueue::getInstance().getActionByName(getName()) == this)
    132132      ActionQueue::getInstance().getActionRegistry().unregisterInstance(this);
    133133

  • src/Actions/ActionQueue.cpp

    r628577 r1d3563  
    3535#include "CodePatterns/MemDebug.hpp"
    3636
    37 #include "ActionQueue.hpp"
     37#include "Actions/ActionQueue.hpp"
    3838
    3939#include "CodePatterns/Singleton_impl.hpp"
    … …  
    4747{}
    4848
     49Action* ActionQueue::getActionByName(const std::string name)
     50{
     51  return AR.getActionByName(name);
     52}
     53
     54bool ActionQueue::isActionKnownByName(const std::string name) const
     55{
     56  return AR.isActionPresentByName(name);
     57}
     58
     59int ActionQueue::getLastPosition(const std::string &MenuName) const
     60{
     61  return AR.getLastPosition(MenuName);
     62}
     63
    4964CONSTRUCT_SINGLETON(ActionQueue)

  • src/Actions/ActionQueue.hpp

    r628577 r1d3563  
    1616#include "CodePatterns/Singleton.hpp"
    1717
     18#include <list>
     19
    1820#include "Actions/ActionRegistry.hpp"
    1921
    … …  
    2426/** This class combines the whole handling of Actions into a single class.
    2527 *
    26  * It spawns new Actions by its internal ActionRegistry.
     28 * It spawns new Actions by its internal ActionRegistry. Spawned Actions are
     29 * automatically queued and placed into a History after execution.
    2730 */
    2831class ActionQueue : public Singleton<ActionQueue>
    … …  
    3033  friend class Singleton<ActionQueue>;
    3134public:
     35  typedef std::list<Action *> ActionQueue_t;
     36
     37  /** Returns the spawned action by token \a name.
     38   *
     39   * Action is checked into internal queue.
     40   *
     41   * \return pointer to newly spawned action
     42   */
     43  Action* getActionByName(const std::string name);
     44
     45  /** Checks whether the Action is known by the given \a name.
     46   *
     47   * \param name token of action to check
     48   * \return true - token is known, false - else
     49   */
     50  bool isActionKnownByName(const std::string name) const;
     51
     52  /** Returns the last taken position for the Menu with \a MenuName.
     53   *
     54   * \param MenuName name of menu to check for last position
     55   * \return index of last position
     56   */
     57  int getLastPosition(const std::string &MenuName) const;
     58
    3259  /** Getter function for the ActionRegistry for transitional purpose.
    3360   *
    … …  
    3865  }
    3966
     67
    4068private:
     69  /** Private cstor for ActionQueue.
     70   *
     71   * Must be private as is singleton.
     72   *
     73   */
    4174  ActionQueue();
     75
     76  /** Dstor for ActionQueue.
     77   *
     78   */
    4279  ~ActionQueue();
    4380
    4481  //!> ActionRegistry to spawn new actions
    4582  ActionRegistry AR;
     83
     84  //!> internal queue of actions
     85  ActionQueue_t queue;
    4686};
    4787

  • src/Actions/Action_impl_pre.hpp

    r628577 r1d3563  
    290290)
    291291{
    292   ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN )); //->clone(params);
     292  ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionByName( TOKEN )); //->clone(params);
    293293  //ACTION::PARAMS params;
    294294#if defined paramreferences && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
    … …  
    307307#endif
    308308        ) {
    309   ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN )); //->clone(params);
     309  ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionByName( TOKEN )); //->clone(params);
    310310  //ACTION::PARAMS params;
    311311#if defined paramtypes && defined paramtypes && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)

  • src/Actions/CommandAction/HelpAction.cpp

    r628577 r1d3563  
    7878  std::cout << std::endl;
    7979  // print list of actions or its options
    80   ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
     80  ActionQueue &AQ = ActionQueue::getInstance();
     81  ActionRegistry &AR = AQ.getActionRegistry();
    8182  if (params.actionname.get() == std::string("none")) {
    8283    // print list of all Actions
    … …  
    9192  } else {
    9293    // retrieve command from Registry and print its help
    93     if (AR.isActionPresentByName(params.actionname.get())) {
    94       const Action *instance = AR.getActionByName(params.actionname.get());
     94    if (AQ.isActionKnownByName(params.actionname.get())) {
     95      const Action *instance = AQ.getActionByName(params.actionname.get());
    9596      // else give description of Action and its option value if present
    9697      std::cout << instance->help();

  • src/Actions/FragmentationAction/MolecularDynamicsAction.cpp

    r628577 r1d3563  
    7171Action::state_ptr FragmentationMolecularDynamicsAction::performCall(){
    7272  // now we can truely prepare
    73   ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
     73  ActionQueue &AQ = ActionQueue::getInstance();
    7474  // perform a verlet-integration first, if there are already forces or velocities
    7575  // present. If not, we still copy the position cleanly into a new step where then
    7676  // forces are set according to summed fragmentary contributions. This is much cleaner.
    77   actions.addAction(AR.getActionByName(std::string("verlet-integration")));
     77  actions.addAction(AQ.getActionByName(std::string("verlet-integration")));
    7878  if (params.DoOutput.get())
    79     actions.addAction(AR.getActionByName(std::string("output")));
    80   actions.addAction(AR.getActionByName(std::string("fragment-molecule")));
    81   actions.addAction(AR.getActionByName(std::string("fragment-automation")));
    82   actions.addAction(AR.getActionByName(std::string("analyse-fragment-results")));
     79    actions.addAction(AQ.getActionByName(std::string("output")));
     80  actions.addAction(AQ.getActionByName(std::string("fragment-molecule")));
     81  actions.addAction(AQ.getActionByName(std::string("fragment-automation")));
     82  actions.addAction(AQ.getActionByName(std::string("analyse-fragment-results")));
    8383  setLoop(params.steps.get());
    8484  isPrepared = true;

  • src/Actions/GraphAction/SubgraphDissectionAction.cpp

    r628577 r1d3563  
    151151)
    152152{
    153   ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN )); //->clone(params);
     153  ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionByName( TOKEN )); //->clone(params);
    154154  //ACTION::PARAMS params;
    155155#if defined paramreferences && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
    … …  
    168168#endif
    169169  ) {
    170   ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN )); //->clone(params);
     170  ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionByName( TOKEN )); //->clone(params);
    171171  //ACTION::PARAMS params;
    172172#if defined paramtypes && defined paramtypes && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)

  • src/Actions/MakroAction_impl_pre.hpp

    r628577 r1d3563  
    290290)
    291291{
    292   ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN )); //->clone(params);
     292  ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionByName( TOKEN )); //->clone(params);
    293293  //ACTION::PARAMS params;
    294294#if defined paramreferences && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
    … …  
    307307#endif
    308308        ) {
    309   ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN )); //->clone(params);
     309  ACTION *ToCall = dynamic_cast<ACTION*>(ActionQueue::getInstance().getActionByName( TOKEN )); //->clone(params);
    310310  //ACTION::PARAMS params;
    311311#if defined paramtypes && defined paramtypes && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)

  • src/Actions/Reaction_impl_pre.hpp

    r628577 r1d3563  
    194194)
    195195{
    196   Action *ToCall = ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN ); //->clone(params);
     196  Action *ToCall = ActionQueue::getInstance().getActionByName( TOKEN ); //->clone(params);
    197197  //REACTION::PARAMS params;
    198198#if BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
    … …  
    213213#endif
    214214        ) {
    215   Action *ToCall = ActionQueue::getInstance().getActionRegistry().getActionByName( TOKEN ); //->clone(params);
     215  Action *ToCall = ActionQueue::getInstance().getActionByName( TOKEN ); //->clone(params);
    216216  //REACTION::PARAMS params;
    217217#if BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)

  • src/Parameters/Validators/Specific/ActionNameValidator.cpp

    r628577 r1d3563  
    4343{
    4444  if (MoleCuilder::ActionRegistry::getCompletely_instatiated())
    45     return MoleCuilder::ActionQueue::getInstance().getActionRegistry().isActionPresentByName(_value);
     45    return MoleCuilder::ActionQueue::getInstance().isActionKnownByName(_value);
    4646  else
    4747    return false;

  • src/UIElements/CommandLineUI/CommandLineWindow.cpp

    r628577 r1d3563  
    6565
    6666void CommandLineWindow::display() {
    67   ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
     67  ActionQueue &AQ = ActionQueue::getInstance();
    6868  //cout << AR;
    6969
    … …  
    7171  LOG(0, "Calling Actions ... ");
    7272  for (std::list<std::string>::iterator CommandRunner = CommandLineParser::getInstance().SequenceOfActions.begin(); CommandRunner != CommandLineParser::getInstance().SequenceOfActions.end(); ++CommandRunner) {
    73     if (AR.isActionPresentByName(*CommandRunner)) {
     73    if (AQ.isActionKnownByName(*CommandRunner)) {
    7474//      LOG1, "INFO: Checking presence of " << *CommandRunner << ": " << "calling " << *CommandRunner);
    75       AR.getActionByName(*CommandRunner)->call();
     75      AQ.getActionByName(*CommandRunner)->call();
    7676    } else {
    7777//      LOG(1, "INFO: Checking presence of " << *CommandRunner << ": " << "absent.");

  • src/UIElements/Menu/Qt4/QtMenuPipe.cpp

    r628577 r1d3563  
    5555
    5656void QtMenuPipe::called() {
    57   Action* action = ActionQueue::getInstance().getActionRegistry().getActionByName(ActionName);
     57  Action* action = ActionQueue::getInstance().getActionByName(ActionName);
    5858  try{
    5959    action->call();

  • src/UIElements/Menu/TextMenu/ActionMenuItem.cpp

    r628577 r1d3563  
    5353
    5454void ActionMenuItem::doTrigger() {
    55   Action* action = ActionQueue::getInstance().getActionRegistry().getActionByName(ActionName);
     55  Action* action = ActionQueue::getInstance().getActionByName(ActionName);
    5656  action->call();
    5757}
    5858
    5959bool ActionMenuItem::isActive() {
    60   Action* action = ActionQueue::getInstance().getActionRegistry().getActionByName(ActionName);
     60  Action* action = ActionQueue::getInstance().getActionByName(ActionName);
    6161  return action->isActive();
    6262}

  • src/UIElements/Menu/TextMenu/TextMenu.hpp

    r628577 r1d3563  
    148148        MoleCuilder::OptionTrait("leave"+token, &typeid(void), "leave menu "+token),
    149149        token,
    150         MoleCuilder::ActionQueue::getInstance().getActionRegistry().getLastPosition(token)+2); // have a separator in between
     150        MoleCuilder::ActionQueue::getInstance().getLastPosition(token)+2); // have a separator in between
    151151    new TxMenu::LeaveAction(NewMenu->getMenuInstance(), leaveTrait);
    152152    NewMenu->init();

  • src/UIElements/Qt4/QtMainWindow.cpp

    r628577 r1d3563  
    172172          MoleCuilder::WorldOutput();
    173173        else{
    174           Action* action = ActionQueue::getInstance().getActionRegistry().getActionByName("output-as");
     174          Action* action = ActionQueue::getInstance().getActionByName("output-as");
    175175          try{
    176176            action->call();

  • src/UIElements/TextUI/TextWindow.cpp

    r628577 r1d3563  
    8686
    8787  // save has reserved key 's'
    88 //  Action *saveConfigAction = ActionQueue::getInstance().getActionRegistry().getActionByName("output");
     88//  Action *saveConfigAction = ActionQueue::getInstance().getActionByName("output");
    8989  new ActionMenuItem('s',"save current setup to config files",main_menu->getMenuInstance(),"output");
    9090
Note: See TracChangeset for help on using the changeset viewer.