Changeset b4fa106 for src/Actions/Action_impl_header.hpp

Timestamp:

Aug 28, 2010, 12:57:50 AM (15 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:

e3e6e2

Parents:

9ee38b

git-author:

Frederik Heber <heber@…> (08/26/10 13:23:21)

git-committer:

Frederik Heber <heber@…> (08/28/10 00:57:50)

Message:

Extended action generating macro framework to create specialized ActionState, too.

• types, tokens, references -> param...
• new statetypes, statereferences that have to be defined for additional variables in the state

File:

• src/Actions/Action_impl_header.hpp (modified) (4 diffs)

src/Actions/Action_impl_header.hpp

@@ -23 +23 @@
 #define ACTION BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, Action))
 #define COMMAND BOOST_PP_CAT(CATEGORY, ACTIONNAME)
-#define STATE BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, State))
 #define PARAMS BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, Parameters))
-#define PARAMSDOT BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, Parameters))
 
 // check if no lists given
-#ifndef types
-#define MAXNOTOKENS 0
+#ifndef paramtypes
+#define MAXPARAMTYPES 0
 #else
-#define MAXNOTOKENS BOOST_PP_SEQ_SIZE(types)
+#define MAXPARAMTYPES BOOST_PP_SEQ_SIZE(paramtypes)
 #endif
 
@@ -44 +42 @@
 
 // calculate numbers and check whether all have same size
-#ifdef tokens
-BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXNOTOKENS, BOOST_PP_SEQ_SIZE(tokens)),\
-  ERROR: There are not the same number of "tokens" and "types" in: __FILE__ \
+#ifdef paramtokens
+BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXPARAMTYPES, BOOST_PP_SEQ_SIZE(paramtokens)),\
+  ERROR: There are not the same number of "paramtokens" and "paramtypes" in: __FILE__ \
 )
 #endif
-#ifdef references
-BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXNOTOKENS, BOOST_PP_SEQ_SIZE(references)),\
-  ERROR: There are not the same number of "tokens" and "references" in: __FILE__ \
+#ifdef paramreferences
+BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXPARAMTYPES, BOOST_PP_SEQ_SIZE(paramreferences)),\
+  ERROR: There are not the same number of "paramtokens" and "paramreferences" in: __FILE__ \
 )
 #endif
 
 // print a list of type ref followed by a separator, i.e. "int i;"
-#define type_print(z,n,separator) \
-  BOOST_PP_SEQ_ELEM(n, types) \
-  BOOST_PP_SEQ_ELEM(n, references)\
+#define type_print(z,n,TYPELIST, VARLIST, separator) \
+  BOOST_PP_SEQ_ELEM(n, TYPELIST) \
+  BOOST_PP_SEQ_ELEM(n, VARLIST)\
   separator
 
 // print a list of type ref followed, i.e. "int i, double position"
-#define type_list(z,n,unused) \
+#define type_list(z,n,TYPELIST, VARLIST) \
   BOOST_PP_COMMA_IF(n)\
-  BOOST_PP_SEQ_ELEM(n, types) \
-  BOOST_PP_SEQ_ELEM(n, references)
+  BOOST_PP_SEQ_ELEM(n, TYPELIST) \
+  BOOST_PP_SEQ_ELEM(n, VARLIST)
 
-// prints dialog->query calls for types with tokens
-#define dialog_print(z,n,unused) \
-  dialog->query<\
-  BOOST_PP_SEQ_ELEM(n, types)\
-  >(\
-  BOOST_PP_SEQ_ELEM(n, tokens)\
-  , ValueStorage::getInstance().getDescription(\
-  BOOST_PP_SEQ_ELEM(n, tokens)\
-  ));
-
-// prints set/queryCurrentValue (command) for references and tokens
-#define value_print(z,n,command) \
-  ValueStorage::getInstance(). command (\
-  BOOST_PP_SEQ_ELEM(n, tokens)\
-  , \
-  params.\
-  BOOST_PP_SEQ_ELEM(n, references)\
-  );
-
-#if BOOST_PP_NOT_EQUAL(MAXNOTOKENS,0)
-#define COMMANDFULL \
-void COMMAND( \
-BOOST_PP_REPEAT(MAXNOTOKENS, type_list, ~) \
-)
+#if defined paramtypes && defined paramreferences
+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()
+    );
 # else
-#define COMMANDFULL void COMMAND()
+void COMMAND();
 #endif
 
-COMMANDFULL;
+class ACTION : public Action {
+  friend
+  #if defined paramtypes && defined paramreferences
+  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()
+      );
+  # else
+  void COMMAND();
+  #endif
 
-class ACTION : public Action {
-  friend COMMANDFULL;
 public:
   ACTION();
@@ -109 +97 @@
 
   struct PARAMS : ActionParameters {
-  #if BOOST_PP_NOT_EQUAL(MAXNOTOKENS,0)
-  #define BOOST_PP_LOCAL_MACRO(n) type_print(~, n, ;)
-  #define BOOST_PP_LOCAL_LIMITS  (0, MAXNOTOKENS-1)
+  #if defined paramtypes && defined paramreferences
+  #define BOOST_PP_LOCAL_MACRO(n) type_print(~, n, paramtypes, paramreferences, ;)
+  #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
   #include BOOST_PP_LOCAL_ITERATE()
-  #undef BOOST_PP_LOCAL_MACRO
-  #undef BOOST_PP_LOCAL_LIMITS
   #endif
   } params;
@@ -129 +115 @@
 };
 
-#undef types
-#undef tokens
-#undef references
-#undef MAXNOTOKENS
+#undef paramtypes
+#undef paramtokens
+#undef paramreferences
+#undef MAXPARAMTYPES
+#undef statetypes
+#undef statereferences
+#undef MAXSTATETYPES
 
 #undef ACTION
-#undef ACTIONNAME
-#undef CATEGORY
 #undef COMMAND
 #undef COMMANDFULL
 #undef PARAMS
-#undef STATE
+
+#undef ACTIONNAME
+#undef CATEGORY
 #undef TOKEN