Changeset 071243 for src

Timestamp:

Nov 7, 2011, 10:46:37 AM (13 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:

949953

Parents:

88ba1f

git-author:

Frederik Heber <heber@…> (09/26/11 12:45:13)

git-committer:

Frederik Heber <heber@…> (11/07/11 10:46:37)

Message:

Enhanced tiny example to resemble action structure.

• Pythontest now also works via a true ActionRegistry along with Actions and "Atrait" and "Otrait".
• this was done to understand runtime (glibc corruption) errors in the full pyMoleCuilder module). However, fault was due to forgotten inclusion of CodePatterns library.
• In the end, we have an Action that contains the wrapped greet function in a likewise static manner as COMMAND().

Location:

src

Files:

• Actions/hello.cpp (modified) (1 diff)
• Makefile.am (modified) (1 diff)

src/Actions/hello.cpp ¶

@@ -22 +22 @@
 #include "CodePatterns/MemDebug.hpp"
 
+#include <iostream>
+#include <map>
+#include <string>
+
+#include "CodePatterns/Registry.hpp"
+#include "CodePatterns/Singleton.hpp"
+
+#include "CodePatterns/Singleton_impl.hpp"
+#include "CodePatterns/Registry_impl.hpp"
+
+class Atrait;
+
+class Otrait
+{
+public:
+  Otrait(const std::string &_text) : text(_text) {}
+  ~Otrait() {}
+  const std::string & getName() const { return text; }
+private:
+  std::string text;
+};
+
+class Atrait : public Otrait
+{
+public:
+  Atrait() : Otrait(std::string("Atrait")) 
+  {
+    options.insert( std::make_pair ( "AOtrait", new Otrait("AOtrait") ) );
+  }
+  Atrait(const Atrait &trait) : Otrait(trait) 
+  {
+    for (Omap::const_iterator iter = trait.options.begin(); iter != trait.options.end(); ++iter)
+      options.insert( std::make_pair ( "copied AOtrait", new Otrait(*(iter->second)) ) );
+  }
+  ~Atrait() 
+  {
+    for (Omap::iterator iter = options.begin(); iter != options.end(); ++iter)
+      delete iter->second;
+    options.clear();
+  }
+private:
+  typedef std::map<std::string, Otrait * > Omap;
+
+  Omap options;
+};
+
+class Action
+{
+public:
+  Action(const Atrait &_trait) : trait(_trait) {}
+  ~Action() {}
+
+  const char * greet() { return "hello, this is MoleCuilder."; }
+
+  const std::string & getName() const { return trait.getName(); }
+
+  const Atrait trait;
+private:
+};
+
+
+/** 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 name);
+  void fillRegistry();
+
+private:
+  ActionRegistry();
+  ~ActionRegistry();
+};
+
+/** Constructor for class ActionRegistry.
+ */
+ActionRegistry::ActionRegistry()
+{
+  std::cout << "ActionRegistry::ActionRegistry() called, instance is " << this << "." << std::endl;
+  fillRegistry();
+}
+
+void ActionRegistry::fillRegistry()
+{
+  Action *presentAction = NULL;
+  {
+    Atrait atrait;
+    presentAction = new Action(atrait);
+    registerInstance(presentAction);
+  }
+  std::cout << "presentAction instance is " << presentAction << "." << std::endl;
+}
+
+
+/** Destructor for class ActionRegistry.
+ */
+ActionRegistry::~ActionRegistry()
+{
+  std::cout << "ActionRegistry::~ActionRegistry() called, instance is " << this << "." << std::endl;
+  cleanup();
+}
+
+/** Just passes on call to Registry<Action>::getByName().
+ * \param name name of Action
+ * \return pointer to Action
+ */
+Action* ActionRegistry::getActionByName(const std::string name)
+{
+  return getByName(name);
+}
+
+
 char const* greet()
 {
-   return "hello, this is MoleCuilder.";
+  return ActionRegistry::getInstance().getActionByName("Atrait")->greet();
 }
 

src/Makefile.am ¶

@@ -263 +263 @@
 pyexec_LTLIBRARIES += Pythontest.la
 Pythontest_la_SOURCES = Actions/hello.cpp
-Pythontest_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(PYTHON_INCLUDE_DIR)
+Pythontest_la_CPPFLAGS = $(AM_CPPFLAGS) ${CodePatterns_CFLAGS} -I$(PYTHON_INCLUDE_DIR)
 Pythontest_la_LDFLAGS = -module -avoid-version -shared
 Pythontest_la_LIBADD = \
         $(BOOST_PYTHON_LDFLAGS) $(BOOST_PYTHON_LIBS) \
+        ${CodePatterns_LIBS} \
         -l$(PYTHON_LIB)