Changeset a7b777c

Timestamp:

Jul 28, 2010, 1:01:02 PM (14 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

2ad482, 4c9a97, 9106c6

Parents:

677e13 (diff), b2d8d0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'stable' into StructureRefactoring

Location:

src

Files:

• Actions/Action.cpp (modified) (1 diff)
• Actions/ActionRegistry.cpp (modified) (2 diffs)
• Actions/ActionRegistry.hpp (modified) (2 diffs)
• Descriptors/MoleculeNameDescriptor.cpp (modified) (1 diff)
• Descriptors/MoleculePtrDescriptor.cpp (modified) (1 diff)
• Patterns/ObservedContainer_impl.hpp (modified) (2 diffs)
• Patterns/Registry.hpp (added)
• Patterns/Registry_impl.hpp (added)
• UIElements/CommandLineUI/CommandLineWindow.cpp (modified) (1 diff)

src/Actions/Action.cpp

@@ -34 +34 @@
 {
   if(_doRegister){
-    ActionRegistry::getInstance().registerAction(this);
+    ActionRegistry::getInstance().registerInstance(this);
   }
 }

src/Actions/ActionRegistry.cpp

@@ -1 +1 @@
 /*
- * ActionRegistry.cpp
+ * Registry<Action>.cpp
  *
  *  Created on: Jan 7, 2010
@@ -9 +9 @@
 
 #include "Actions/ActionRegistry.hpp"
-#include "Actions/Action.hpp"
-
 #include "Patterns/Singleton_impl.hpp"
-
-#include <string>
-#include "Helpers/Assert.hpp"
-#include <iostream>
-
-using namespace std;
+#include "Patterns/Registry_impl.hpp"
 
 /** Constructor for class ActionRegistry.
  */
 ActionRegistry::ActionRegistry()
-{
-}
+{}
 
 /** Destructor for class ActionRegistry.
  */
 ActionRegistry::~ActionRegistry()
+{}
+
+/** Just passes on call to Registry<Action>::getByName().
+ * \param name name of Action
+ * \return pointer to Action
+ */
+Action* ActionRegistry::getActionByName(const std::string name)
 {
-  map<const string,Action*>::iterator iter;
-  for(iter=actionMap.begin();iter!=actionMap.end();++iter) {
-    delete iter->second;
-  }
-  actionMap.clear();
+  return getByName(name);
 }
 
-/** Returns pointer to an action named by \a name.
- * \param name name of action
- * \return pointer to Action
+/** Just passes on call to Registry<Action>::isPresentByName().
+ * \param name name of Action
+ * \return true - Action instance present, false - not
  */
-Action* ActionRegistry::getActionByName(const std::string name){
-  map<const string,Action*>::iterator iter;
-  iter = actionMap.find(name);
-  ASSERT(iter!=actionMap.end(),"Query for an action not stored in registry");
-  return iter->second;
+bool ActionRegistry::isActionPresentByName(const std::string name)
+{
+  return isPresentByName(name);
 }
 
-/** States whether action is present or not.
- * \note This iss needed as ActionRegistry::getActionByName() ASSERT()s that action is in map.
- * \param name name of action
- * \return true - Action present, false - Action absent
- */
-bool ActionRegistry::isActionByNamePresent(const std::string name){
-  map<const string,Action*>::iterator iter;
-  iter = actionMap.find(name);
-  return iter!=actionMap.end();
-}
-
-/** Registers an Action with the ActionRegistry.
- * \param *action pointer to Action.
- */
-void ActionRegistry::registerAction(Action* action){
-  pair<map<const string,Action*>::iterator,bool> ret;
-  //cout << "Trying to register action with name " << action->getName() << "." << endl;
-  ret = actionMap.insert(pair<const string,Action*>(action->getName(),action));
-  ASSERT(ret.second,"Two actions with the same name added to registry");
-}
-
-/** Unregisters an Action.
- * \param *action pointer to Action.
- */
-void ActionRegistry::unregisterAction(Action* action){
-  //cout << "Unregistering action with name " << action->getName() << "." << endl;
-  actionMap.erase(action->getName());
-}
-
-/** Returns an iterator pointing to the start of the map of Action's.
- * \return begin iterator
- */
-std::map<const std::string,Action*>::iterator ActionRegistry::getBeginIter()
-{
-  return actionMap.begin();
-}
-
-/** Returns an iterator pointing to the end of the map of Action's.
- * \return end iterator
- */
-std::map<const std::string,Action*>::iterator ActionRegistry::getEndIter()
-{
-  return actionMap.end();
-}
-
-/** Returns a const iterator pointing to the start of the map of Action's.
- * \return constant begin iterator
- */
-std::map<const std::string,Action*>::const_iterator ActionRegistry::getBeginIter() const
-{
-  return actionMap.begin();
-}
-
-/** Returns a const iterator pointing to the end of the map of Action's.
- * \return constant end iterator
- */
-std::map<const std::string,Action*>::const_iterator ActionRegistry::getEndIter() const
-{
-  return actionMap.end();
-}
-
-/** Prints the contents of the ActionRegistry \a &m to \a &ost.
- * \param &ost output stream
- * \param &m reference to ActionRegistry
- * \return reference to the above out stream for concatenation
- */
-ostream& operator<<(ostream& ost, const ActionRegistry& m)
-{
-  ost << "ActionRegistry contains:" << endl;
-  for (std::map<const std::string,Action*>::const_iterator iter = m.getBeginIter(); iter != m.getEndIter(); ++iter) {
-    ost << "\t" << iter->first << " with pointer " << iter->second << endl;
-  }
-  return ost;
-};
-
-
-
 CONSTRUCT_SINGLETON(ActionRegistry)
+CONSTRUCT_REGISTRY(Action)

src/Actions/ActionRegistry.hpp

@@ -1 +1 @@
 /*
- * ActionRegistry.hpp
+ * Registry<Action>.hpp
  *
  *  Created on: Jan 7, 2010
@@ -13 +13 @@
 #include <map>
 
+#include "Patterns/Registry.hpp"
 #include "Patterns/Singleton.hpp"
+#include "Actions/Action.hpp"
 
-class Action;
-
-class ActionRegistry : public Singleton<ActionRegistry>
+/** Action Registry.
+ *
+ * The Action registry is a storage for any Action instance to retrieved by name.
+ * It is a singleton and can be called from anywhere.
+ *
+ */
+class ActionRegistry : public Singleton<ActionRegistry>, public Registry<Action>
 {
   friend class Singleton<ActionRegistry>;
+  //friend class Registry<Action>;
+
 public:
-  Action* getActionByName(const std::string);
-  bool isActionByNamePresent(const std::string name);
-  void registerAction(Action*);
-  void unregisterAction(Action*);
-
-  std::map<const std::string,Action*>::iterator getBeginIter();
-  std::map<const std::string,Action*>::const_iterator getBeginIter() const;
-  std::map<const std::string,Action*>::iterator getEndIter();
-  std::map<const std::string,Action*>::const_iterator getEndIter() const;
-
-private:
-  std::map<const std::string,Action*> actionMap;
+  Action* getActionByName(const std::string name);
+  bool isActionPresentByName(const std::string name);
 
 private:
   ActionRegistry();
-  virtual ~ActionRegistry();
+  ~ActionRegistry();
 };
 
-std::ostream& operator<<(std::ostream& ost, const ActionRegistry& m);
-
 #endif /* ACTIONREGISTRY_HPP_ */

src/Descriptors/MoleculeNameDescriptor.cpp

@@ -30 +30 @@
 
 molecule *MoleculeNameDescriptor_impl::find(){
-  World::MoleculeSet molecules = getMolecules();
+  World::MoleculeSet &molecules = getMolecules();
   World::MoleculeSet::iterator res = molecules.begin();
   for (; res != molecules.end(); res++)

src/Descriptors/MoleculePtrDescriptor.cpp

@@ -34 +34 @@
 
 molecule *MoleculePtrDescriptor_impl::find(){
-  World::MoleculeSet molecules = getMolecules();
+  World::MoleculeSet &molecules = getMolecules();
   World::MoleculeSet::iterator res = molecules.find(ptr->getId());
   return (res!=molecules.end())?((*res).second):0;

src/Patterns/ObservedContainer_impl.hpp

@@ -17 +17 @@
 
 template <class Container>
-inline ObservedContainer<Container>::ObservedContainer(const ObservedContainer &src) :
+inline ObservedContainer<Container>::ObservedContainer(const ObservedContainer<Container> &src) :
   content(src.content),
   obs(src.obs)
@@ -29 +29 @@
 inline
 ObservedContainer<Container>&
-ObservedContainer<Container>::operator=(const ObservedContainer &rhs){
+ObservedContainer<Container>::operator=(const ObservedContainer<Container> &rhs){
   content=rhs.content;
   return *this;

src/UIElements/CommandLineUI/CommandLineWindow.cpp

@@ -44 +44 @@
   for (std::list<std::string>::iterator CommandRunner = CommandLineParser::getInstance().SequenceOfActions.begin(); CommandRunner != CommandLineParser::getInstance().SequenceOfActions.end(); ++CommandRunner) {
     cout << "Checking presence of " << *CommandRunner << ": ";
-    if (ActionRegistry::getInstance().isActionByNamePresent(*CommandRunner)) {
+    if (ActionRegistry::getInstance().isActionPresentByName(*CommandRunner)) {
       cout << "calling " << *CommandRunner << endl;
       ActionRegistry::getInstance().getActionByName(*CommandRunner)->call();