Changeset 9ee38b for src/Actions/Action_impl_pre.hpp

Timestamp:

Aug 28, 2010, 12:52:58 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:

b4fa106

Parents:

0b2ce9

git-author:

Frederik Heber <heber@…> (08/25/10 17:20:37)

git-committer:

Frederik Heber <heber@…> (08/28/10 00:52:58)

Message:

Extended macro framework.

Extensions:

• all central definitions reside in .def files
  • This if file is necessary because we need the definitions at two places: hpp and cpp
  • And as we always use the same define names, we have to undefine them at the end of both (otherwise we get compiler warnings and are prone to dumb mistakes of forgotten defines seeming present)
• the .hpp is just a very tiny header, that should be possible to batch- construct inside Makefile as well
• .cpp includes some Action_...hpp files and implements the function

For later (i.e. when ActionRegistry becomes prototype copier)

• instead of waiting for clone(), for now we simply call the prototype.
• in the action command we must not yet prefix paramreferences with "params."

Changes:

• Dialog::query<> is a template which is specialized for every present query...() function. We need it to automatize fillDialog()
• all AnalysisAction's are now converted, i.e. framework is functional with parameters and queries (MolecularVolume had none).

File:

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

src/Actions/Action_impl_pre.hpp

@@ -23 +23 @@
  */
 
+
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/comparison/equal.hpp>
+#include <boost/preprocessor/comparison/not_equal.hpp>
+#include <boost/preprocessor/control/if.hpp>
+#include <boost/preprocessor/debug/assert.hpp>
+#include <boost/preprocessor/iteration/local.hpp>
+#include <boost/preprocessor/punctuation/comma_if.hpp>
+#include <boost/preprocessor/repetition/repeat.hpp>
+#include <boost/preprocessor/seq/elem.hpp>
+#include <boost/preprocessor/seq/push_back.hpp>
+#include <boost/preprocessor/seq/seq.hpp>
+#include <boost/preprocessor/seq/size.hpp>
+#include <boost/preprocessor/seq/transform.hpp>
+
+// some derived names
+#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
+#else
+#define MAXNOTOKENS BOOST_PP_SEQ_SIZE(types)
+#endif
+
+// check user has given name and category
+#ifndef CATEGORY
+ERROR: No "CATEGORY" defined in: __FILE__
+#endif
+
+#ifndef ACTIONNAME
+ERROR: No "ACTIONNAME" defined in: __FILE__
+#endif
+
+// 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__ \
+)
+#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__ \
+)
+#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)\
+  separator
+
+// print a list of type ref followed, i.e. "int i, double position"
+#define type_list(z,n,unused) \
+  BOOST_PP_COMMA_IF(n)\
+  BOOST_PP_SEQ_ELEM(n, types) \
+  BOOST_PP_SEQ_ELEM(n, references)
+
+// 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 paramreferences and paramtokens
+#define value_print(z,n,command, prefix) \
+  ValueStorage::getInstance(). command (\
+  BOOST_PP_SEQ_ELEM(n, tokens)\
+  , \
+  prefix\
+  BOOST_PP_SEQ_ELEM(n, references)\
+  );
+
+#if BOOST_PP_NOT_EQUAL(MAXNOTOKENS,0)
+#define COMMANDFULL \
+void COMMAND( \
+BOOST_PP_REPEAT(MAXNOTOKENS, type_list, ~) \
+)
+# else
+#define COMMANDFULL void COMMAND()
+#endif
+
 #include "Actions/ActionRegistry.hpp"
 #include "UIElements/Dialog.hpp"
 #include "Actions/ValueStorage.hpp"
+
 
 const char ACTION::NAME[] = TOKEN;
@@ -52 +143 @@
 };
 
-struct PARAMS : ActionParameters {
+COMMANDFULL
+{
+  ACTION::PARAMS params;
+  Action *ToCall = ActionRegistry::getInstance().getActionByName( ACTION::NAME ); //->clone(params);
 #if BOOST_PP_NOT_EQUAL(MAXNOTOKENS,0)
-#define BOOST_PP_LOCAL_MACRO(n) type_print(~, n, ;)
+#define BOOST_PP_LOCAL_MACRO(n) value_print(~, n, setCurrentValue, )
 #define BOOST_PP_LOCAL_LIMITS  (0, MAXNOTOKENS-1)
 #include BOOST_PP_LOCAL_ITERATE()
@@ -60 +154 @@
 #undef BOOST_PP_LOCAL_LIMITS
 #endif
+  ToCall->call(Action::NonInteractive);
 };
 
-COMMANDFULL
-{
+void ACTION::getParametersfromValueStorage() {
 #if BOOST_PP_NOT_EQUAL(MAXNOTOKENS,0)
-#define BOOST_PP_LOCAL_MACRO(n) value_print(~, n, setCurrentValue)
-#define BOOST_PP_LOCAL_LIMITS  (0, MAXNOTOKENS-1)
-#include BOOST_PP_LOCAL_ITERATE()
-#undef BOOST_PP_LOCAL_MACRO
-#undef BOOST_PP_LOCAL_LIMITS
-#endif
-        ActionRegistry::getInstance().getActionByName( ACTION::NAME )->call(Action::NonInteractive);
-};
-
-void AnalysisMolecularVolumeAction::getParametersfromValueStorage() {
-#if BOOST_PP_NOT_EQUAL(MAXNOTOKENS,0)
-#define BOOST_PP_LOCAL_MACRO(n) value_print(~, n, queryCurrentValue)
+#define BOOST_PP_LOCAL_MACRO(n) value_print(~, n, queryCurrentValue, params.)
 #define BOOST_PP_LOCAL_LIMITS  (0, MAXNOTOKENS-1)
 #include BOOST_PP_LOCAL_ITERATE()
@@ -89 +172 @@
 #undef MAXNOTOKENS
 
+#undef ACTION
+#undef ACTIONNAME
+#undef CATEGORY
+#undef COMMAND
+#undef COMMANDFULL
+#undef PARAMS
+#undef STATE
+#undef TOKEN