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
Last change
on this file since d55743e was 1e6913, checked in by Frederik Heber <heber@…>, 15 years ago |
Order of actions called did not conincide with order on command line.
CommandLineWindow::display()
- Actions were called by going through the repository and checking whether present on CommandLine, this causes different sequence of actions to be called.
- Now, we go through all command lind parameters and check whether they correspond to an action in the registry which we call.
ActionRegistry:
- new function: ActionRegistry::isActionByNamePresent() checks whether action is present in registry
- TESTFIX: MaxOrder now failws if not another action is called before (here now, -v 1). Otherwise, return code only occurs on third call not on second
|
-
Property mode
set to
100644
|
File size:
1.5 KB
|
Rev | Line | |
---|
[cc04b7] | 1 | /*
|
---|
| 2 | * ActionRegistry.cpp
|
---|
| 3 | *
|
---|
| 4 | * Created on: Jan 7, 2010
|
---|
| 5 | * Author: crueger
|
---|
| 6 | */
|
---|
| 7 |
|
---|
| 8 | #include "Actions/ActionRegistry.hpp"
|
---|
| 9 | #include "Actions/Action.hpp"
|
---|
| 10 |
|
---|
[e73a8a2] | 11 | #include "Patterns/Singleton_impl.hpp"
|
---|
| 12 |
|
---|
[cc04b7] | 13 | #include <string>
|
---|
[d56640] | 14 | #include "Helpers/Assert.hpp"
|
---|
[cc04b7] | 15 | #include <iostream>
|
---|
| 16 |
|
---|
| 17 | using namespace std;
|
---|
| 18 |
|
---|
| 19 | ActionRegistry::ActionRegistry()
|
---|
| 20 | {
|
---|
| 21 | }
|
---|
| 22 |
|
---|
| 23 | ActionRegistry::~ActionRegistry()
|
---|
| 24 | {
|
---|
[12b845] | 25 | map<const string,Action*>::iterator iter;
|
---|
[cf1a07] | 26 | for(iter=actionMap.begin();iter!=actionMap.end();++iter) {
|
---|
[12b845] | 27 | delete iter->second;
|
---|
| 28 | }
|
---|
[cf1a07] | 29 | actionMap.clear();
|
---|
[cc04b7] | 30 | }
|
---|
| 31 |
|
---|
| 32 | Action* ActionRegistry::getActionByName(const std::string name){
|
---|
| 33 | map<const string,Action*>::iterator iter;
|
---|
| 34 | iter = actionMap.find(name);
|
---|
[d56640] | 35 | ASSERT(iter!=actionMap.end(),"Query for an action not stored in registry");
|
---|
[cc04b7] | 36 | return iter->second;
|
---|
| 37 | }
|
---|
| 38 |
|
---|
[1e6913] | 39 | bool ActionRegistry::isActionByNamePresent(const std::string name){
|
---|
| 40 | map<const string,Action*>::iterator iter;
|
---|
| 41 | iter = actionMap.find(name);
|
---|
| 42 | return iter!=actionMap.end();
|
---|
| 43 | }
|
---|
| 44 |
|
---|
[cc04b7] | 45 | void ActionRegistry::registerAction(Action* action){
|
---|
| 46 | pair<map<const string,Action*>::iterator,bool> ret;
|
---|
| 47 | ret = actionMap.insert(pair<const string,Action*>(action->getName(),action));
|
---|
[d56640] | 48 | ASSERT(ret.second,"Two actions with the same name added to registry");
|
---|
[cc04b7] | 49 | }
|
---|
| 50 |
|
---|
[97ebf8] | 51 | void ActionRegistry::unregisterAction(Action* action){
|
---|
| 52 | actionMap.erase(action->getName());
|
---|
| 53 | }
|
---|
| 54 |
|
---|
[fa56f0] | 55 | std::map<const std::string,Action*>::iterator ActionRegistry::getBeginIter()
|
---|
| 56 | {
|
---|
| 57 | return actionMap.begin();
|
---|
| 58 | }
|
---|
| 59 |
|
---|
| 60 | std::map<const std::string,Action*>::iterator ActionRegistry::getEndIter()
|
---|
| 61 | {
|
---|
| 62 | return actionMap.end();
|
---|
| 63 | }
|
---|
| 64 |
|
---|
[e73a8a2] | 65 | CONSTRUCT_SINGLETON(ActionRegistry)
|
---|
Note:
See
TracBrowser
for help on using the repository browser.