Changeset 649aaa for src/Actions/Action_impl_pre.hpp

Timestamp:

Jun 13, 2012, 5:39:12 PM (14 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, Candidate_v1.7.0, Candidate_v1.7.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:

8453b3

Parents:

301723

git-author:

Frederik Heber <heber@…> (05/09/12 16:17:57)

git-committer:

Frederik Heber <heber@…> (06/13/12 17:39:12)

Message:

All Actions' .def files now have a paramvalids that is used to for validators of their Parameters.

• the structure ActionParameters contains Parameter<> instances per required parameter of the Action.
• these Parameter<> contain a validation functionality if given a Validator.
• right now via boost::preprocessor magic (new defines valid_print and validcopy_print) we create the cstor of the derived ActionParameters class and create a DummyValidator of the correct type for each parameter.
• TODO: We have to go through each .def file and replace DummyValidator by the correct Validator.
• added src/Actions/test.sh which is the shell script to make these changes.

File:

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

src/Actions/Action_impl_pre.hpp

@@ -50 +50 @@
 #include "Parameters/Parameter.hpp"
 
+
 // some derived names: if CATEGORY is not given, we don't prefix with it
 #ifdef CATEGORY
@@ -127 +128 @@
   );
 
+// print an initialiser list, i.e. "var( token, valid )(,)"
+#define valid_print(z,n,TOKENLIST, VARLIST, VALIDLIST) \
+  BOOST_PP_COMMA_IF(n) \
+  BOOST_PP_SEQ_ELEM(n, VARLIST) \
+  ( \
+  BOOST_PP_SEQ_ELEM(n, TOKENLIST) \
+  , \
+  BOOST_PP_SEQ_ELEM(n, VALIDLIST) \
+  )
+
+// print an initialiser list, i.e. "var( token, valid )(,)"
+#define validcopy_print(z,n,TOKENLIST, VARLIST, VALID) \
+  BOOST_PP_COMMA_IF(n) \
+  BOOST_PP_SEQ_ELEM(n, VARLIST) \
+  ( \
+  VALID . \
+  BOOST_PP_SEQ_ELEM(n, VARLIST) \
+  )
+
 // prints set/queryCurrentValue (command) for paramreferences and paramtokens
 #define value_print(z, n, container, prefix) \
@@ -206 +226 @@
 }
 
+// =========== parameter constructor ===========
+ACTION::PARAMS::PARAMS()
+#if defined paramtokens && defined paramreferences && defined paramvalids
+      :
+#define BOOST_PP_LOCAL_MACRO(n) valid_print(~, n, paramtokens, paramreferences, paramvalids)
+#define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#endif
+    {}
+
+ACTION::PARAMS::PARAMS(const PARAMS &p)
+#if defined paramtokens && defined paramreferences
+      :
+#define BOOST_PP_LOCAL_MACRO(n) validcopy_print(~, n, paramtokens, paramreferences, p)
+#define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#endif
+    {}
+
 // =========== fill a dialog ===========
 Dialog* ACTION::fillDialog(Dialog *dialog) {
@@ -263 +302 @@
 
 // free up defines
+#undef paramvalids
 #undef paramtypes
 #undef paramtokens
 #undef paramreferences
+#undef paramdescriptions
+#undef paramdefaults
 #undef MAXPARAMTYPES
 #undef statetypes
@@ -277 +319 @@
 #undef type_list
 #undef dialog_print
+#undef valid_print
+#undef validcopy_print
 #undef value_print
 #undef valuetype_print