Changeset 6ba9ba

Timestamp:

Jun 13, 2012, 5:39:24 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, 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:

2aad5a

Parents:

ab2ebe1

git-author:

Frederik Heber <heber@…> (06/05/12 14:59:10)

git-committer:

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

Message:

Default values are properly set by the Action into their (Action)Parameters.

• we changed the boost::preprocessor magic to accomplish this.
• NODEFAULT -> NOPARAM_DEFAULT to be safe.
• it has been a hell of a lot of work to make it possible to add a construct such as ", default" to the call of a function, either the comma or the default is easy but both could only be accomplished via a list contained in the sequence of default values. Because the list has an explicit NIL element which is taken as NOPARAM_DEFAULT.
• PARAM_DEFAULT is a macro to wrap the default value into a list.

Location:

src

Files:

• Actions/Action.hpp (modified) (1 diff)
• Actions/Action_impl_header.hpp (modified) (6 diffs)
• Actions/Action_impl_pre.hpp (modified) (7 diffs)
• Actions/Action_impl_python.hpp (modified) (4 diffs)
• Actions/AnalysisAction/CalculateBoundingBoxAction.def (modified) (1 diff)
• Actions/AnalysisAction/CalculateCellVolumeAction.def (modified) (1 diff)
• Actions/AnalysisAction/CalculateMolarMassAction.def (modified) (1 diff)
• Actions/AnalysisAction/DipoleAngularCorrelationAction.def (modified) (1 diff)
• Actions/AnalysisAction/DipoleCorrelationAction.def (modified) (1 diff)
• Actions/AnalysisAction/MolecularVolumeAction.def (modified) (1 diff)
• Actions/AnalysisAction/PairCorrelationAction.def (modified) (1 diff)
• Actions/AnalysisAction/PointCorrelationAction.def (modified) (1 diff)
• Actions/AnalysisAction/PrincipalAxisSystemAction.def (modified) (1 diff)
• Actions/AnalysisAction/SurfaceCorrelationAction.def (modified) (1 diff)
• Actions/AtomAction/AddAction.def (modified) (2 diffs)
• Actions/AtomAction/ChangeElementAction.def (modified) (1 diff)
• Actions/AtomAction/RemoveAction.def (modified) (1 diff)
• Actions/AtomAction/RotateAroundOriginByAngleAction.def (modified) (1 diff)
• Actions/AtomAction/SaveSelectedAtomsAction.def (modified) (1 diff)
• Actions/AtomAction/TranslateAction.def (modified) (1 diff)
• Actions/CommandAction/BondLengthTableAction.def (modified) (1 diff)
• Actions/CommandAction/ElementDbAction.def (modified) (1 diff)
• Actions/CommandAction/FastParsingAction.def (modified) (1 diff)
• Actions/CommandAction/HelpAction.def (modified) (2 diffs)
• Actions/CommandAction/VerboseAction.def (modified) (1 diff)
• Actions/CommandAction/VersionAction.def (modified) (1 diff)
• Actions/CommandAction/WarrantyAction.def (modified) (1 diff)
• Actions/FillAction/FillRegularGridAction.def (modified) (1 diff)
• Actions/FillAction/FillSphericalSurfaceAction.def (modified) (1 diff)
• Actions/FragmentationAction/FragmentationAction.def (modified) (2 diffs)
• Actions/GraphAction/CreateAdjacencyAction.def (modified) (1 diff)
• Actions/GraphAction/DepthFirstSearchAction.def (modified) (1 diff)
• Actions/GraphAction/SubgraphDissectionAction.def (modified) (1 diff)
• Actions/MoleculeAction/BondFileAction.def (modified) (1 diff)
• Actions/MoleculeAction/ChangeNameAction.def (modified) (1 diff)
• Actions/MoleculeAction/CopyAction.def (modified) (1 diff)
• Actions/MoleculeAction/FillVoidWithMoleculeAction.def (modified) (1 diff)
• Actions/MoleculeAction/FillWithMoleculeAction.def (modified) (1 diff)
• Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.def (modified) (1 diff)
• Actions/MoleculeAction/LoadAction.def (modified) (1 diff)
• Actions/MoleculeAction/RotateAroundSelfByAngleAction.def (modified) (1 diff)
• Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.def (modified) (1 diff)
• Actions/MoleculeAction/SaveAdjacencyAction.def (modified) (1 diff)
• Actions/MoleculeAction/SaveBondsAction.def (modified) (1 diff)
• Actions/MoleculeAction/SaveSelectedMoleculesAction.def (modified) (1 diff)
• Actions/MoleculeAction/SaveTemperatureAction.def (modified) (1 diff)
• Actions/MoleculeAction/SuspendInWaterAction.def (modified) (1 diff)
• Actions/MoleculeAction/VerletIntegrationAction.def (modified) (1 diff)
• Actions/ParserAction/ParseTremoloPotentialsAction.def (modified) (1 diff)
• Actions/ParserAction/SaveSelectedAtomsAsExtTypesAction.def (modified) (1 diff)
• Actions/ParserAction/SetOutputFormatsAction.def (modified) (1 diff)
• Actions/ParserAction/SetParserParametersAction.def (modified) (1 diff)
• Actions/ParserAction/SetTremoloAtomdataAction.def (modified) (1 diff)
• Actions/RandomNumbersAction/SetRandomNumbersDistributionAction.def (modified) (1 diff)
• Actions/RandomNumbersAction/SetRandomNumbersEngineAction.def (modified) (1 diff)
• Actions/RedoAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/AllAtomsAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/AllAtomsInsideCuboidAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/AllAtomsInsideSphereAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/AtomByElementAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/AtomByIdAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/AtomByOrderAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/ClearAllAtomsAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/InvertAtomsAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/NotAllAtomsAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/NotAllAtomsInsideSphereAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/NotAtomByElementAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/NotAtomByIdAction.def (modified) (1 diff)
• Actions/SelectionAction/Atoms/NotAtomByOrderAction.def (modified) (1 diff)
• Actions/SelectionAction/Molecules/AllMoleculesAction.def (modified) (1 diff)
• Actions/SelectionAction/Molecules/ClearAllMoleculesAction.def (modified) (1 diff)
• Actions/SelectionAction/Molecules/InvertMoleculesAction.def (modified) (1 diff)
• Actions/SelectionAction/Molecules/MoleculeByFormulaAction.def (modified) (1 diff)
• Actions/SelectionAction/Molecules/MoleculeByIdAction.def (modified) (1 diff)
• Actions/SelectionAction/Molecules/MoleculeByNameAction.def (modified) (1 diff)
• Actions/SelectionAction/Molecules/MoleculeByOrderAction.def (modified) (1 diff)
• Actions/SelectionAction/Molecules/MoleculeOfAtomAction.def (modified) (1 diff)
• Actions/SelectionAction/Molecules/NotAllMoleculesAction.def (modified) (1 diff)
• Actions/SelectionAction/Molecules/NotMoleculeByFormulaAction.def (modified) (1 diff)
• Actions/SelectionAction/Molecules/NotMoleculeByIdAction.def (modified) (1 diff)
• Actions/SelectionAction/Molecules/NotMoleculeByNameAction.def (modified) (1 diff)
• Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.def (modified) (1 diff)
• Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.def (modified) (1 diff)
• Actions/TesselationAction/ConvexEnvelopeAction.def (modified) (1 diff)
• Actions/TesselationAction/NonConvexEnvelopeAction.def (modified) (1 diff)
• Actions/UndoAction.def (modified) (1 diff)
• Actions/WorldAction/AddEmptyBoundaryAction.def (modified) (1 diff)
• Actions/WorldAction/BoundInBoxAction.def (modified) (1 diff)
• Actions/WorldAction/CenterInBoxAction.def (modified) (1 diff)
• Actions/WorldAction/CenterOnEdgeAction.def (modified) (1 diff)
• Actions/WorldAction/ChangeBoxAction.def (modified) (1 diff)
• Actions/WorldAction/InputAction.def (modified) (1 diff)
• Actions/WorldAction/OutputAction.def (modified) (1 diff)
• Actions/WorldAction/RepeatBoxAction.def (modified) (1 diff)
• Actions/WorldAction/ScaleBoxAction.def (modified) (1 diff)
• Actions/WorldAction/SetBoundaryConditionsAction.def (modified) (1 diff)
• Actions/WorldAction/SetDefaultNameAction.def (modified) (1 diff)
• Actions/WorldAction/SetWorldTimeAction.def (modified) (1 diff)
• Parameters/Validators/Specific/TimeStepPresentValidator.cpp (modified) (1 diff)

src/Actions/Action.hpp

@@ -17 +17 @@
 #include <boost/shared_ptr.hpp>
 
+#include <boost/preprocessor/list/adt.hpp>
+
 /** Used in .def files in paramdefaults define to set that no default value exists.
- * We define NODEFAULT here, as it is used in .def files and needs to be present
+ * We define NOPARAM_DEFAULT here, as it is used in .def files and needs to be present
  * before these are included.
  */
-#define NODEFAULT ""
+#define NOPARAM_DEFAULT BOOST_PP_NIL
 
 // forward declaration

src/Actions/Action_impl_header.hpp

@@ -14 +14 @@
 #include <boost/preprocessor/comparison/equal.hpp>
 #include <boost/preprocessor/comparison/not_equal.hpp>
+#include <boost/preprocessor/control/expr_if.hpp>
 #include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/debug/assert.hpp>
 #include <boost/preprocessor/iteration/local.hpp>
+#include <boost/preprocessor/list/adt.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>
+#include <boost/preprocessor/punctuation/paren.hpp>
 #include <boost/preprocessor/repetition/repeat.hpp>
 #include <boost/preprocessor/seq/elem.hpp>
@@ -49 +52 @@
 #define MAXPARAMTYPES BOOST_PP_SEQ_SIZE(paramtypes)
 #endif
+#ifndef paramdefaults
+#define MAXPARAMDEFAULTS 0
+// this is required for valid_print "else part"
+#define sequencer(z,n,data) \
+  BOOST_PP_SEQ_PUSH_BACK( data, NOPARAM_DEFAULT)
+#define paramdefaults BOOST_PP_REPEAT( MAXPARAMTYPES, sequencer, BOOST_PP_SEQ_NIL )
+#else
+#define MAXPARAMDEFAULTS BOOST_PP_SEQ_SIZE(paramdefaults)
+#endif
+#define PARAM_DEFAULT(x) \
+    (x, BOOST_PP_NIL)
 
 // check user has given name and category
@@ -79 +93 @@
 #endif
 
-// check if paramdefaults is given, otherwise fill list with NODEFAULT
+// check if paramdefaults is given, otherwise fill list with NOPARAM_DEFAULT
 // this does not work: paramdefaults has to be completely defined before
 // being used within option_print (used as an array there and not as
 // some function call still to be expanded)
-//#define paramdefaults (NODEFAULT)
+//#define paramdefaults (NOPARAM_DEFAULT)
 //#define tempvalue(z,n,value)
-//  BOOST_PP_CAT(value,(NODEFAULT))
+//  BOOST_PP_CAT(value,(NOPARAM_DEFAULT))
 //BOOST_PP_REPEAT(tempvalue, MAXPARAMTYPES, paramdefaults)
 //#undef tempvalue
@@ -112 +126 @@
 
 // prints Options.insert
-#ifdef paramdefaults
 #define option_print(z,n,unused, unused2) \
   tester = Options. insert (\
@@ -120 +133 @@
           BOOST_PP_SEQ_ELEM(n, paramtokens), \
           &typeid( BOOST_PP_SEQ_ELEM(n, paramtypes) ), \
-          BOOST_PP_SEQ_ELEM(n, paramdescriptions), \
-          std::string( BOOST_PP_SEQ_ELEM(n, paramdefaults) ) )\
+          BOOST_PP_SEQ_ELEM(n, paramdescriptions) \
+          BOOST_PP_COMMA_IF( BOOST_PP_NOT( BOOST_PP_LIST_IS_NIL( BOOST_PP_SEQ_ELEM(n, paramdefaults) ) ) ) \
+          BOOST_PP_EXPR_IF( \
+              BOOST_PP_NOT( BOOST_PP_LIST_IS_NIL( BOOST_PP_SEQ_ELEM(n, paramdefaults) ) ), \
+              toString BOOST_PP_LPAREN() \
+                  BOOST_PP_LIST_FIRST( BOOST_PP_SEQ_ELEM(n, paramdefaults) )) \
+              BOOST_PP_RPAREN() \
+          )\
       )\
   ); \
   ASSERT(tester.second, "ActionTrait<ACTION>::ActionTrait<ACTION>() option token present twice!");
-#else
-#define option_print(z,n,unused, unused2) \
-  tester = Options. insert (\
-      std::pair< std::string, OptionTrait *> ( \
-      BOOST_PP_SEQ_ELEM(n, paramtokens), \
-      new OptionTrait(\
-          BOOST_PP_SEQ_ELEM(n, paramtokens), \
-          &typeid( BOOST_PP_SEQ_ELEM(n, paramtypes) ), \
-          BOOST_PP_SEQ_ELEM(n, paramdescriptions), \
-          NODEFAULT )\
-      )\
-  ); \
-  ASSERT(tester.second, "ActionTrait<ACTION>::ActionTrait<ACTION>() option token present twice!");
-#endif
 
 namespace MoleCuilder {
@@ -242 +247 @@
 #undef paramdefaults
 #undef MAXPARAMTYPES
+#undef MAXPARAMDEFAULTS
 #undef statetypes
 #undef statereferences
 #undef MAXSTATETYPES
+#undef PARAM_DEFAULT
 
 #undef option_print
+#undef sequencer
 #undef type_print
 #undef type_list

src/Actions/Action_impl_pre.hpp

@@ -37 +37 @@
 #include <boost/preprocessor/comparison/equal.hpp>
 #include <boost/preprocessor/comparison/not_equal.hpp>
+#include <boost/preprocessor/control/expr_if.hpp>
 #include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/debug/assert.hpp>
 #include <boost/preprocessor/iteration/local.hpp>
+#include <boost/preprocessor/list/adt.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>
 #include <boost/preprocessor/repetition/repeat.hpp>
@@ -76 +78 @@
 #define MAXSTATETYPES BOOST_PP_SEQ_SIZE(statetypes)
 #endif
+#ifndef paramdefaults
+#define MAXPARAMDEFAULTS 0
+// this is required for valid_print "else part"
+#define sequencer(z,n,data) \
+  BOOST_PP_SEQ_PUSH_BACK( data, NOPARAM_DEFAULT)
+#define paramdefaults BOOST_PP_REPEAT( MAXPARAMTYPES, sequencer, BOOST_PP_SEQ_NIL )
+#else
+#define MAXPARAMDEFAULTS BOOST_PP_SEQ_SIZE(paramdefaults)
+#endif
+#define PARAM_DEFAULT(x) \
+    (x, BOOST_PP_NIL)
 
 // check user has given name and category
@@ -128 +141 @@
   );
 
-// print an initialiser list, i.e. "var( token, valid )(,)"
-#define valid_print(z,n,TOKENLIST, VARLIST, VALIDLIST) \
+// print an initialiser list, i.e. "var( token, valid (,default) )(,)"
+#define valid_print(z,n,TOKENLIST, VARLIST, VALIDLIST, DEFAULTLIST) \
   BOOST_PP_COMMA_IF(n) \
   BOOST_PP_SEQ_ELEM(n, VARLIST) \
@@ -136 +149 @@
   , \
   BOOST_PP_SEQ_ELEM(n, VALIDLIST) \
+  BOOST_PP_COMMA_IF( BOOST_PP_NOT( BOOST_PP_LIST_IS_NIL( BOOST_PP_SEQ_ELEM(n, DEFAULTLIST) ) ) ) \
+  BOOST_PP_EXPR_IF( \
+      BOOST_PP_NOT( BOOST_PP_LIST_IS_NIL( BOOST_PP_SEQ_ELEM(n, DEFAULTLIST) ) ), \
+      BOOST_PP_LIST_FIRST( BOOST_PP_SEQ_ELEM(n, DEFAULTLIST) )) \
   )
 
-// print an initialiser list, i.e. "var( token, valid )(,)"
+// print an initialiser list, i.e. "var( valid . var )(,)"
 #define validcopy_print(z,n,TOKENLIST, VARLIST, VALID) \
   BOOST_PP_COMMA_IF(n) \
@@ -230 +247 @@
 #if defined paramtokens && defined paramreferences && defined paramvalids
       :
-#define BOOST_PP_LOCAL_MACRO(n) valid_print(~, n, paramtokens, paramreferences, paramvalids)
+#define BOOST_PP_LOCAL_MACRO(n) valid_print(~, n, paramtokens, paramreferences, paramvalids, paramdefaults)
 #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
 #include BOOST_PP_LOCAL_ITERATE()
@@ -309 +326 @@
 #undef paramdefaults
 #undef MAXPARAMTYPES
+#undef MAXPARAMDEFAULTS
 #undef statetypes
 #undef statereferences
 #undef MAXSTATETYPES
+#undef PARAM_DEFAULT
 
 #undef type2string
@@ -319 +338 @@
 #undef type_list
 #undef dialog_print
+#undef sequencer
 #undef valid_print
 #undef validcopy_print

src/Actions/Action_impl_python.hpp

@@ -18 +18 @@
 #include <boost/preprocessor/facilities/expand.hpp>
 #include <boost/preprocessor/iteration/local.hpp>
+#include <boost/preprocessor/list/adt.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>
-
-#define NODEFAULT ""
+#include <boost/preprocessor/punctuation/paren.hpp>
 
 // some derived names: if CATEGORY is not given, we don't prefix with it
@@ -32 +32 @@
 #define PARAMS BOOST_PP_CAT(ACTIONNAME, Parameters)
 #endif
+
+// for paramdefaults entries
+#define PARAM_DEFAULT(x) \
+    (x, BOOST_PP_NIL)
 
 // check if no lists given
@@ -61 +65 @@
   BOOST_PP_SEQ_ELEM(n, STRINGLIST) \
   ) \
-  = BOOST_PP_SEQ_ELEM(n, DEFAULTLIST)
+  = \
+  BOOST_PP_IF( \
+      BOOST_PP_NOT( BOOST_PP_LIST_IS_NIL( BOOST_PP_SEQ_ELEM(n, paramdefaults) ) ), \
+      toString BOOST_PP_LPAREN() \
+          BOOST_PP_LIST_FIRST( BOOST_PP_SEQ_ELEM(n, DEFAULTLIST) ) \
+      BOOST_PP_RPAREN(), \
+      std::string("") \
+  )
 
 // print a list of comma-separated list, i.e. (,)arg("Action")
@@ -142 +153 @@
 #undef PARAMS
 #undef MAXPARAMTYPES
+#undef PARAM_DEFAULT
 
 #undef help_print

src/Actions/AnalysisAction/CalculateBoundingBoxAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramreferences

src/Actions/AnalysisAction/CalculateCellVolumeAction.def

@@ -12 +12 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramreferences

src/Actions/AnalysisAction/CalculateMolarMassAction.def

@@ -12 +12 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramreferences

src/Actions/AnalysisAction/DipoleAngularCorrelationAction.def

@@ -19 +19 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::string)(double)(double)(double)(boost::filesystem::path)(boost::filesystem::path)(unsigned int)
 #define paramreferences (DipoleFormula)(BinStart)(BinWidth)(BinEnd)(outputname)(binoutputname)(timestepzero)
 #define paramtokens ("dipole-angular-correlation")("bin-start")("bin-width")("bin-end")("output-file")("bin-output-file")("time-step-zero")
 #define paramdescriptions ("formula of molecules to calculate dipole of")("start of the first bin")("width of the bins")("start of the last bin")("name of the output file")("name of the bin output file")("initial time step to correlate following ones against")
-#define paramdefaults (NODEFAULT)(NODEFAULT)("0.5")(NODEFAULT)(NODEFAULT)(NODEFAULT)("0")
+#define paramdefaults (NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(0.5))(NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(0))
 #define paramvalids \
 (FormulaValidator()) \

src/Actions/AnalysisAction/DipoleCorrelationAction.def

@@ -17 +17 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (double)(double)(double)(boost::filesystem::path)(boost::filesystem::path)(bool)
 #define paramreferences (BinStart)(BinWidth)(BinEnd)(outputname)(binoutputname)(periodic)
 #define paramtokens ("bin-start")("bin-width")("bin-end")("output-file")("bin-output-file")("periodic")
 #define paramdescriptions ("start of the first bin")("width of the bins")("start of the last bin")("name of the output file")("name of the bin output file")("system is constraint to periodic boundary conditions")
-#define paramdefaults (NODEFAULT)("0.5")(NODEFAULT)(NODEFAULT)(NODEFAULT)("0")
+#define paramdefaults (NOPARAM_DEFAULT)(PARAM_DEFAULT(0.5))(NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(false))
 #define paramvalids \
 (RotationAngleValidator()) \

src/Actions/AnalysisAction/MolecularVolumeAction.def

@@ -12 +12 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramreferences

src/Actions/AnalysisAction/PairCorrelationAction.def

@@ -22 +22 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::vector<const element *>)(double)(double)(double)(boost::filesystem::path)(boost::filesystem::path)(bool)
 #define paramreferences (elements)(BinStart)(BinWidth)(BinEnd)(outputname)(binoutputname)(periodic)
 #define paramtokens ("elements")("bin-start")("bin-width")("bin-end")("output-file")("bin-output-file")("periodic")
 #define paramdescriptions ("set of elements")("start of the first bin")("width of the bins")("start of the last bin")("name of the output file")("name of the bin output file")("system is constraint to periodic boundary conditions")
-#define paramdefaults (NODEFAULT)(NODEFAULT)("0.5")(NODEFAULT)(NODEFAULT)(NODEFAULT)("0")
+#define paramdefaults (NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(0.5))(NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(false))
 #define paramvalids \
 (STLVectorValidator< std::vector<const element *> >(2,2, ElementValidator())) \

src/Actions/AnalysisAction/PointCorrelationAction.def

@@ -23 +23 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::vector<const element *>)(Vector)(double)(double)(double)(boost::filesystem::path)(boost::filesystem::path)(bool)
 #define paramreferences (elements)(Point)(BinStart)(BinWidth)(BinEnd)(outputname)(binoutputname)(periodic)
 #define paramtokens ("elements")("position")("bin-start")("bin-width")("bin-end")("output-file")("bin-output-file")("periodic")
 #define paramdescriptions ("set of elements")("position in R^3 space")("start of the first bin")("width of the bins")("start of the last bin")("name of the output file")("name of the bin output file")("system is constraint to periodic boundary conditions")
-#define paramdefaults (NODEFAULT)(NODEFAULT)(NODEFAULT)("0.5")(NODEFAULT)(NODEFAULT)(NODEFAULT)("0")
+#define paramdefaults (NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(0.5))(NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(false))
 #define paramvalids \
 (STLVectorValidator< std::vector<const element *> >(ElementValidator())) \

src/Actions/AnalysisAction/PrincipalAxisSystemAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramreferences

src/Actions/AnalysisAction/SurfaceCorrelationAction.def

@@ -21 +21 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::vector<const element *>)(double)(double)(double)(boost::filesystem::path)(boost::filesystem::path)(bool)
 #define paramreferences (elements)(BinStart)(BinWidth)(BinEnd)(outputname)(binoutputname)(periodic)
 #define paramtokens ("elements")("bin-start")("bin-width")("bin-end")("output-file")("bin-output-file")("periodic")
 #define paramdescriptions ("set of elements")("start of the first bin")("width of the bins")("start of the last bin")("name of the output file")("name of the bin output file")("system is constraint to periodic boundary conditions")
-#define paramdefaults (NODEFAULT)(NODEFAULT)("0.5")(NODEFAULT)(NODEFAULT)(NODEFAULT)("0")
+#define paramdefaults (NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(0.5))(NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(false))
 #define paramvalids \
 (STLVectorValidator< std::vector<const element *> >(ElementValidator())) \

src/Actions/AtomAction/AddAction.def

@@ -16 +16 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 //#define paramtypes (const element *)(BoxVector) TODO: use a validator
 #define paramtypes (const element *)(Vector)
@@ -22 +22 @@
 #define paramdescriptions ("element of new atom")("position within current domain")
 #define paramreferences (elemental)(position)
-#define paramdefaults (NODEFAULT)(NODEFAULT)
+#define paramdefaults (NOPARAM_DEFAULT)(NOPARAM_DEFAULT)
 #define paramvalids \
 (ElementValidator()) \

src/Actions/AtomAction/ChangeElementAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (const element *)
 #define paramtokens ("change-element")

src/Actions/AtomAction/RemoveAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/AtomAction/RotateAroundOriginByAngleAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (double)(Vector)
 #define paramtokens ("rotate-around-origin")("position")

src/Actions/AtomAction/SaveSelectedAtomsAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)
 #define paramtokens ("save-selected-atoms")

src/Actions/AtomAction/TranslateAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (Vector)(bool)
 #define paramtokens ("translate-atoms")("periodic")
 #define paramdescriptions ("translation vector")("system is constraint to periodic boundary conditions")
 #define paramreferences (x)(periodic)
-#define paramdefaults (NODEFAULT)("0")
+#define paramdefaults (NOPARAM_DEFAULT)(PARAM_DEFAULT(false))
 #define paramvalids \
 (DummyValidator< Vector >()) \

src/Actions/CommandAction/BondLengthTableAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)
 #define paramtokens ("bond-table")

src/Actions/CommandAction/ElementDbAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)
 #define paramtokens ("element-db")

src/Actions/CommandAction/FastParsingAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (bool)
 #define paramtokens ("fastparsing")

src/Actions/CommandAction/HelpAction.def

@@ -7 +7 @@
 
 // all includes and forward declarations necessary for non-integral types below
+#include <string> 
+#include <vector> 
 
 #include "Parameters/Validators/DiscreteValidator.hpp"
@@ -14 +16 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::string)
 #define paramtokens ("actionname")
 #define paramdescriptions ("Name of an action whose option list is then given")
-#define paramdefaults ("none")
+#define paramdefaults (PARAM_DEFAULT(std::string("none")))
 #define paramreferences (actionname)
 #define paramvalids \

src/Actions/CommandAction/VerboseAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (unsigned int)
 #define paramtokens ("verbose")

src/Actions/CommandAction/VersionAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/CommandAction/WarrantyAction.def

@@ -12 +12 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/FillAction/FillRegularGridAction.def

@@ -20 +20 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::vector< unsigned int >)(Vector)(double)(double)(double)(double)(bool)
 #define paramtokens ("mesh-size")("mesh-offset")("min-distance")("tesselation-radius")("random-atom-displacement")("random-molecule-displacement")("DoRotate")
 #define paramdescriptions ("number of points per axis")("offset to start of partition, must be in [0,1)")("Minimum distance to other atoms")("radius of rolling sphere in tesselating selected molecule's surfaces")("magnitude of random atom displacement")("magnitude of random molecule displacement")("whether to rotate or not")
-#define paramdefaults (NODEFAULT)("0.,0.,0.")("1.")("0.")("0.")("0.")("0")
+#define paramdefaults (NOPARAM_DEFAULT)(PARAM_DEFAULT(Vector(0.,0.,0.)))(PARAM_DEFAULT(1.))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(false))
 #define paramreferences (counts)(offset)(mindistance)(SphereRadius)(RandAtomDisplacement)(RandMoleculeDisplacement)(DoRotate)
 #define paramvalids \

src/Actions/FillAction/FillSphericalSurfaceAction.def

@@ -18 +18 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (Vector)(double)(unsigned int)(double)(Vector)
 #define paramtokens ("center")("radius")("count")("min-distance")("Alignment-Axis")
 #define paramdescriptions ("center of the sphere")("sphere size")("number of instances to be added, changed according to geometric needs")("minimum distance between added instances")("The filler molecule is rotated relative to this alignment axis")
-#define paramdefaults ("0.,0.,0.")(NODEFAULT)("12")("1.")(NODEFAULT)
+#define paramdefaults (PARAM_DEFAULT(Vector(0.,0.,0.)))(NOPARAM_DEFAULT)(PARAM_DEFAULT(12))(PARAM_DEFAULT(1.))(NOPARAM_DEFAULT)
 #define paramreferences (center)(radius)(N)(mindistance)(AlignedAxis)
 #define paramvalids \

src/Actions/FragmentationAction/FragmentationAction.def

@@ -7 +7 @@
 
 // all includes and forward declarations necessary for non-integral types below
+#include <boost/assign.hpp> 
 #include <string>
 #include <vector>
@@ -18 +19 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::string)(double)(unsigned int)(bool)(std::vector<std::string>)
 #define paramtokens ("fragment-molecule")("distance")("order")("DoSaturate")("output-types")
 #define paramdescriptions ("prefix of each fragment file")("distance in space")("order of a discretization, dissection, ...")("do saturate dangling bonds with hydrogen")("type(s) of parsers that output fragment config files")
-#define paramdefaults (NODEFAULT)(NODEFAULT)(NODEFAULT)("1")("pcp tremolo xyz")
+#define paramdefaults (NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(true)) (PARAM_DEFAULT(std::vector<std::string>(1, std::string("pcp"))))
 #define paramreferences (prefix)(distance)(order)(DoSaturation)(types)
 #define paramvalids \

src/Actions/GraphAction/CreateAdjacencyAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/GraphAction/DepthFirstSearchAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (bool)
 #define paramtokens ("DoSaturate")
 #define paramdescriptions ("whether to treat hydrogen special or not")
-#define paramdefaults ("1")
+#define paramdefaults (PARAM_DEFAULT(true))
 #define paramreferences (DoSaturation)
 #define paramvalids \

src/Actions/GraphAction/SubgraphDissectionAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/MoleculeAction/BondFileAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)(unsigned int)(unsigned int)
 #define paramtokens ("bond-file")("skiplines")("offset")
 #define paramdescriptions ("name of the bond file")("number of header lines to skip")("offset to add to each id")
-#define paramdefaults (NODEFAULT)("1")("0")
+#define paramdefaults (NOPARAM_DEFAULT)(PARAM_DEFAULT(1))(PARAM_DEFAULT(0))
 #define paramreferences (bondfile)(skiplines)(id_offset)
 #define paramvalids \

src/Actions/MoleculeAction/ChangeNameAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::string)
 #define paramtokens ("change-molname")

src/Actions/MoleculeAction/CopyAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (Vector)
 #define paramtokens ("position")

src/Actions/MoleculeAction/FillVoidWithMoleculeAction.def

@@ -19 +19 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)(Vector)(double)(double)(double)(double)(bool)
 #define paramtokens ("fill-void")("distances")("distance-to-molecule")("random-atom-displacement")("random-molecule-displacement")("distance-to-boundary")("DoRotate")
 #define paramdescriptions ("name of xyz file of filler molecule")("list of three of distances in space, one for each axis direction")("minimum distance to present molecules")("magnitude of random atom displacement")("magnitude of random molecule displacement")("minimum distance to boundary")("whether to rotate or not")
-#define paramdefaults (NODEFAULT)(NODEFAULT)("0.")("0.")("0.")("0.")("0")
+#define paramdefaults (NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(false))
 #define paramreferences (fillername)(distances)(boundary)(RandAtomDisplacement)(RandMoleculeDisplacement)(MinDistance)(DoRotate)
 #define paramvalids \

src/Actions/MoleculeAction/FillWithMoleculeAction.def

@@ -22 +22 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)(Vector)(double)(double)(double)(double)(bool)
 #define paramtokens ("fill-molecule")("distances")("distance-to-molecule")("random-atom-displacement")("random-molecule-displacement")("MaxDistance")("DoRotate")
 #define paramdescriptions ("name of xyz file of filler molecule")("list of three of distances in space, one for each axis direction")("minimum distance to present molecules")("magnitude of random atom displacement")("magnitude of random molecule displacement")("maximum spatial distance")("whether to rotate or not")
-#define paramdefaults (NODEFAULT)(NODEFAULT)("0.")("0.")("0.")("0.")("0")
+#define paramdefaults (NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(false))
 #define paramreferences (fillername)(distances)(boundary)(RandAtomDisplacement)(RandMoleculeDisplacement)(MaxDistance)(DoRotate)
 #define paramvalids \

src/Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (unsigned int)(unsigned int)(unsigned int)(bool)
 #define paramtokens ("start-step")("interpolation-steps")("end-step")("id-mapping")

src/Actions/MoleculeAction/LoadAction.def

@@ -17 +17 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)
 #define paramtokens ("load")

src/Actions/MoleculeAction/RotateAroundSelfByAngleAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (double)(Vector)
 #define paramtokens ("rotate-around-self")("axis")

src/Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.def

@@ -16 +16 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (Vector)
 #define paramtokens ("rotate-to-principal-axis-system")

src/Actions/MoleculeAction/SaveAdjacencyAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)
 #define paramtokens ("save-adjacency")

src/Actions/MoleculeAction/SaveBondsAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)
 #define paramtokens ("save-bonds")

src/Actions/MoleculeAction/SaveSelectedMoleculesAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)
 #define paramtokens ("save-selected-molecules")

src/Actions/MoleculeAction/SaveTemperatureAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)
 #define paramtokens ("save-temperature")

src/Actions/MoleculeAction/SuspendInWaterAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (double)
 #define paramtokens ("suspend-in-water")

src/Actions/MoleculeAction/VerletIntegrationAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)(double)(unsigned int)(bool)
 #define paramtokens ("verlet-integration")("deltat")("MDSteps")("keep-fixed-CenterOfMass")

src/Actions/ParserAction/ParseTremoloPotentialsAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)
 #define paramtokens ("parse-tremolo-potentials")

src/Actions/ParserAction/SaveSelectedAtomsAsExtTypesAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (unsigned int)(boost::filesystem::path)
 #define paramtokens ("save-selected-atoms-as-exttypes")("filename")

src/Actions/ParserAction/SetOutputFormatsAction.def

@@ -16 +16 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::vector<std::string>)
 #define paramtokens ("set-output")

src/Actions/ParserAction/SetParserParametersAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::string)(std::string)
 #define paramtokens ("set-parser-parameters")("parser-parameters")
 #define paramdescriptions ("name of the parser to change")("parameter (key = value;)")
-#define paramdefaults (NODEFAULT)(NODEFAULT)
+#define paramdefaults (NOPARAM_DEFAULT)(NOPARAM_DEFAULT)
 #define paramreferences (parsername)(newparams)
 #define paramvalids \

src/Actions/ParserAction/SetTremoloAtomdataAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::string)
 #define paramtokens ("set-tremolo-atomdata")

src/Actions/RandomNumbersAction/SetRandomNumbersDistributionAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::string)(std::string)
 #define paramtokens ("set-random-number-distribution")("random-number-distribution-parameters")
 #define paramdescriptions ("name of the distribution from boost::random")("parameter set for requested distribution")
-#define paramdefaults (NODEFAULT)("p=-1")
+#define paramdefaults (NOPARAM_DEFAULT)(PARAM_DEFAULT(std::string("p=-1")))
 #define paramreferences (distribution_type)(parameters)
 #define paramvalids \

src/Actions/RandomNumbersAction/SetRandomNumbersEngineAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::string)(std::string)
 #define paramtokens ("set-random-number-engine")("random-number-engine-parameters")
 #define paramdescriptions ("name of the pseudo-random engine from boost::random")("seed of the pseudo-random number sequence")
-#define paramdefaults (NODEFAULT)("seed=-1")
+#define paramdefaults (NOPARAM_DEFAULT)(PARAM_DEFAULT(std::string("seed=-1")))
 #define paramreferences (engine_type)(parameters)
 #define paramvalids \

src/Actions/RedoAction.def

@@ -12 +12 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramreferences

src/Actions/SelectionAction/Atoms/AllAtomsAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/SelectionAction/Atoms/AllAtomsInsideCuboidAction.def

@@ -17 +17 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (Vector)(Vector)(double)(double)(double)
 #define paramtokens ("select-atoms-inside-cuboid")("position")("angle-x")("angle-y")("angle-z")
 #define paramdescriptions ("dimensions of cuboid")("position in R^3 space")("angle of a rotation around x axis")("angle of a rotation around y axis")("angle of a rotation around z axis")
-#define paramdefaults (NODEFAULT)(NODEFAULT)("0.")("0.")("0.")
+#define paramdefaults (NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))
 #define paramreferences (extension)(position)(Xangle)(Yangle)(Zangle)
 #define paramvalids \

src/Actions/SelectionAction/Atoms/AllAtomsInsideSphereAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (double)(Vector)
 #define paramtokens ("select-atoms-inside-sphere")("position")

src/Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/SelectionAction/Atoms/AtomByElementAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (const element*)
 #define paramtokens ("select-atom-by-element")

src/Actions/SelectionAction/Atoms/AtomByIdAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (atomId_t)
 #define paramtokens ("select-atom-by-id")

src/Actions/SelectionAction/Atoms/AtomByOrderAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (int)
 #define paramtokens ("select-atom-by-order")

src/Actions/SelectionAction/Atoms/ClearAllAtomsAction.def

@@ -12 +12 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/SelectionAction/Atoms/InvertAtomsAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/SelectionAction/Atoms/NotAllAtomsAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.def

@@ -18 +18 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (Vector)(Vector)(double)(double)(double)
 #define paramtokens ("unselect-atoms-inside-cuboid")("position")("angle-x")("angle-y")("angle-z")
 #define paramdescriptions ("dimension of cuboid")("position in R^3 space")("angle of a rotation around x axis")("angle of a rotation around y axis")("angle of a rotation around z axis")
-#define paramdefaults (NODEFAULT)(NODEFAULT)("0.")("0.")("0.")
+#define paramdefaults (NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))
 #define paramreferences (extension)(position)(Xangle)(Yangle)(Zangle)
 #define paramvalids \

src/Actions/SelectionAction/Atoms/NotAllAtomsInsideSphereAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (double)(Vector)
 #define paramtokens ("unselect-atoms-inside-sphere")("position")

src/Actions/SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/SelectionAction/Atoms/NotAtomByElementAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (const element*)
 #define paramtokens ("unselect-atom-by-element")

src/Actions/SelectionAction/Atoms/NotAtomByIdAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (atomId_t)
 #define paramtokens ("unselect-atom-by-id")

src/Actions/SelectionAction/Atoms/NotAtomByOrderAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (int)
 #define paramtokens ("unselect-atom-by-order")

src/Actions/SelectionAction/Molecules/AllMoleculesAction.def

@@ -12 +12 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/SelectionAction/Molecules/ClearAllMoleculesAction.def

@@ -12 +12 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/SelectionAction/Molecules/InvertMoleculesAction.def

@@ -12 +12 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/SelectionAction/Molecules/MoleculeByFormulaAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::string)
 #define paramtokens ("select-molecules-by-formula")

src/Actions/SelectionAction/Molecules/MoleculeByIdAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (moleculeId_t)
 #define paramtokens ("select-molecule-by-id")

src/Actions/SelectionAction/Molecules/MoleculeByNameAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::string)
 #define paramtokens ("select-molecules-by-name")

src/Actions/SelectionAction/Molecules/MoleculeByOrderAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (int)
 #define paramtokens ("select-molecule-by-order")

src/Actions/SelectionAction/Molecules/MoleculeOfAtomAction.def

@@ -12 +12 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/SelectionAction/Molecules/NotAllMoleculesAction.def

@@ -12 +12 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/SelectionAction/Molecules/NotMoleculeByFormulaAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::string)
 #define paramtokens ("unselect-molecules-by-formula")

src/Actions/SelectionAction/Molecules/NotMoleculeByIdAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (moleculeId_t)
 #define paramtokens ("unselect-molecule-by-id")

src/Actions/SelectionAction/Molecules/NotMoleculeByNameAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::string)
 #define paramtokens ("unselect-molecules-by-name")

src/Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (int)
 #define paramtokens ("unselect-molecule-by-order")

src/Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.def

@@ -12 +12 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/TesselationAction/ConvexEnvelopeAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)(boost::filesystem::path)
 #define paramtokens ("convex-file")("nonconvex-file")

src/Actions/TesselationAction/NonConvexEnvelopeAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (double)(boost::filesystem::path)
 #define paramtokens ("nonconvex-envelope")("nonconvex-file")

src/Actions/UndoAction.def

@@ -12 +12 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramreferences

src/Actions/WorldAction/AddEmptyBoundaryAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (Vector)
 #define paramtokens ("add-empty-boundary")

src/Actions/WorldAction/BoundInBoxAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/WorldAction/CenterInBoxAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (RealSpaceMatrix)
 #define paramtokens ("center-in-box")

src/Actions/WorldAction/CenterOnEdgeAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #undef paramtypes
 #undef paramtokens

src/Actions/WorldAction/ChangeBoxAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (RealSpaceMatrix)
 #define paramtokens ("change-box")

src/Actions/WorldAction/InputAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)
 #define paramtokens ("input")

src/Actions/WorldAction/OutputAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)
 #define paramtokens ("output")

src/Actions/WorldAction/RepeatBoxAction.def

@@ -19 +19 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::vector< unsigned int >)
 #define paramtokens ("repeat-box")

src/Actions/WorldAction/ScaleBoxAction.def

@@ -14 +14 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (Vector)
 #define paramtokens ("scale-box")

src/Actions/WorldAction/SetBoundaryConditionsAction.def

@@ -15 +15 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::vector< std::string >)
 #define paramtokens ("set-boundary-conditions")

src/Actions/WorldAction/SetDefaultNameAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::string)
 #define paramtokens ("default-molname")

src/Actions/WorldAction/SetWorldTimeAction.def

@@ -13 +13 @@
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (unsigned int)
 #define paramtokens ("set-world-time")
 #define paramdescriptions ("new time step")
-#define paramdefaults ("0")
+#define paramdefaults (PARAM_DEFAULT(0))
 #define paramreferences (newtime)
 #define paramvalids \

src/Parameters/Validators/Specific/TimeStepPresentValidator.cpp

@@ -36 +36 @@
   }
 
-  return (_value < maxTime);
+  return (_value <= maxTime);
 }