Changeset 975b83 for src/Actions

Timestamp:

May 20, 2014, 9:11:52 AM (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:

415ddd

Parents:

cc6e5c

git-author:

Frederik Heber <heber@…> (02/20/14 20:23:42)

git-committer:

Frederik Heber <heber@…> (05/20/14 09:11:52)

Message:

Added ActionQueue::insertAction().

• this is preparatory for allowing Actions to be executed inside an Action's performCall() body. Once ActionQueue::run() is executed in its own thread these command calls would just append an Action to the queue and not run the command.

Location:

src/Actions

Files:

• Action.cpp (modified) (1 diff)
• Action.hpp (modified) (1 diff)
• ActionQueue.cpp (modified) (1 diff)
• ActionQueue.hpp (modified) (1 diff)
• Action_impl_header.hpp (modified) (3 diffs)
• Action_impl_pre.hpp (modified) (2 diffs)
• GlobalListOfActions.hpp (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• MakroAction_impl_header.hpp (modified) (3 diffs)
• MakroAction_impl_pre.hpp (modified) (2 diffs)

src/Actions/Action.cpp

@@ -168 +168 @@
 }
 
+void Action::insertAction(Action *_action, enum Action::QueryOptions state)
+{
+  ActionQueue::getInstance().insertAction(_action, state);
+}
 
 bool Action::isActive(){

src/Actions/Action.hpp

@@ -261 +261 @@
   virtual void endTimer() const {};
 
+  /** Function pass-through for ActionQueue::insertAction().
+   *
+   * This pass-through is present to allow each derived Action access to private
+   * ActionQueue::insertAction() which is not possible otherwise as friendship
+   * is not inherited.
+   *
+   */
+  static void insertAction(Action *_action, enum Action::QueryOptions state);
+
 private:
 

src/Actions/ActionQueue.cpp

@@ -87 +87 @@
     World::getInstance().setExitFlag(5);
   }
+}
+
+void ActionQueue::insertAction(Action *_action, enum Action::QueryOptions state)
+{
+  queueAction(_action, state);
 }
 

src/Actions/ActionQueue.hpp

@@ -140 +140 @@
   void clear();
 
+  /** Insert an action after CurrentAction.
+   *
+   * This is implemented only to allow action's COMMAND to work. If we
+   * were to use queueAction, actions would come after all other already
+   * present actions.
+   */
+  void insertAction(Action *_action, enum Action::QueryOptions state);
+
 private:
   /** Private cstor for ActionQueue.

src/Actions/Action_impl_header.hpp

@@ -144 +144 @@
   ASSERT(tester.second, "ActionTrait<ACTION>::ActionTrait<ACTION>() option token present twice!");
 
+#define stringtype std::string
+
+#define type2string(s, data, elem) \
+  stringtype
+
 namespace MoleCuilder {
 
@@ -149 +154 @@
 #if defined paramtypes && defined paramreferences
 #define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, paramtypes, paramreferences)
+#define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#endif
+    );
+
+void BOOST_PP_CAT( COMMAND, _stringargs)(
+#if defined paramtypes && defined paramreferences && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
+#define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, BOOST_PP_SEQ_TRANSFORM( type2string, , paramtypes), paramreferences)
 #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
 #include BOOST_PP_LOCAL_ITERATE()
@@ -199 +212 @@
 class ACTION : public Action {
 #endif
-  #if defined paramtypes && defined paramreferences
   friend void COMMAND(
-  #define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, paramtypes, paramreferences)
-  #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
-  #include BOOST_PP_LOCAL_ITERATE()
+#if defined paramtypes && defined paramreferences
+#define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, paramtypes, paramreferences)
+#define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#endif
       );
-  # else
-  void COMMAND();
-  #endif
+
+  friend void BOOST_PP_CAT( COMMAND, _stringargs)(
+#if defined paramtypes && defined paramreferences && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
+#define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, BOOST_PP_SEQ_TRANSFORM( type2string, , paramtypes), paramreferences)
+#define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#endif
+      );
 
 public:

src/Actions/Action_impl_pre.hpp

@@ -376 +376 @@
 #include BOOST_PP_LOCAL_ITERATE()
 #endif
-  ActionQueue::getInstance().queueAction( ToCall, Action::NonInteractive);
+  Action::insertAction( ToCall, Action::NonInteractive);
 };
 
@@ -393 +393 @@
 #include BOOST_PP_LOCAL_ITERATE()
 #endif
-  ActionQueue::getInstance().queueAction( ToCall, Action::NonInteractive);
+  Action::insertAction( ToCall, Action::NonInteractive);
 };
 

src/Actions/GlobalListOfActions.hpp

@@ -15 +15 @@
 
 #include <boost/preprocessor/seq/push_back.hpp>
+#include <boost/preprocessor/seq/remove.hpp>
 
 // this is global list of actions valid for all cases
@@ -166 +167 @@
 
 // define final list
-
 #ifdef HAVE_PYTHON
 #define GLOBALLISTOFACTIONS_PYTHON \

src/Actions/Makefile.am

@@ -663 +663 @@
         echo "#define ALLACTIONPYTHON_HPP_" >>$@; \
         for file in $(ACTIONPROTOTYPESHEADER); do \
-                echo "#include \"`echo $$file | sed -e 's/hpp/def/'`\"" >>$@; \
-                echo "#include \"Actions/Action_impl_python.hpp\"" >>$@; \
-                echo "#include \"Actions/Action_impl_undef.hpp\"" >>$@; \
+                if test "$$file" != "Actions/CommandAction/LoadSessionAction.hpp"; then \
+                        echo "#include \"`echo $$file | sed -e 's/hpp/def/'`\"" >>$@; \
+                        echo "#include \"Actions/Action_impl_python.hpp\"" >>$@; \
+                        echo "#include \"Actions/Action_impl_undef.hpp\"" >>$@; \
+                fi; \
         done; \
         echo "#endif /* ALLACTIONPYTHON_HPP_ */" >>$@;

src/Actions/MakroAction_impl_header.hpp

@@ -145 +145 @@
   ASSERT(tester.second, "ActionTrait<ACTION>::ActionTrait<ACTION>() option token present twice!");
 
+#define stringtype std::string
+
+#define type2string(s, data, elem) \
+  stringtype
+
 namespace MoleCuilder {
 
@@ -150 +155 @@
 #if defined paramtypes && defined paramreferences
 #define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, paramtypes, paramreferences)
+#define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#endif
+    );
+
+void BOOST_PP_CAT( COMMAND, _stringargs)(
+#if defined paramtypes && defined paramreferences && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
+#define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, BOOST_PP_SEQ_TRANSFORM( type2string, , paramtypes), paramreferences)
 #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
 #include BOOST_PP_LOCAL_ITERATE()
@@ -196 +209 @@
 
 class ACTION : public MakroAction {
-  #if defined paramtypes && defined paramreferences
   friend void COMMAND(
-  #define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, paramtypes, paramreferences)
-  #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
-  #include BOOST_PP_LOCAL_ITERATE()
+#if defined paramtypes && defined paramreferences
+#define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, paramtypes, paramreferences)
+#define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#endif
       );
-  # else
-  void COMMAND();
-  #endif
+
+  friend void BOOST_PP_CAT( COMMAND, _stringargs)(
+#if defined paramtypes && defined paramreferences && BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
+#define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, BOOST_PP_SEQ_TRANSFORM( type2string, , paramtypes), paramreferences)
+#define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#endif
+      );
 
 public:

src/Actions/MakroAction_impl_pre.hpp

@@ -371 +371 @@
 #include BOOST_PP_LOCAL_ITERATE()
 #endif
-  ActionQueue::getInstance().queueAction( ToCall, Action::NonInteractive);
+  Action::insertAction( ToCall, Action::NonInteractive);
 };
 
@@ -388 +388 @@
 #include BOOST_PP_LOCAL_ITERATE()
 #endif
-  ActionQueue::getInstance().queueAction( ToCall, Action::NonInteractive);
+  Action::insertAction( ToCall, Action::NonInteractive);
 };