Changeset 78ea3c for src/Actions/WorldAction/StepWorldTimeAction.def

Timestamp:

Jun 21, 2017, 10:02:50 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChangeBugEmailaddress, ChemicalSpaceEvaluator, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_Verbose_Codepatterns, ForceAnnealing_oldresults, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps

Children:

310445

Parents:

be848d (diff), 101d2d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'Docu_Python_wait' into Candidate_v1.6.1

Conflicts:

tests/Python/AllActions/options.dat

• two options introduced at same place, both get in.

File:

• src/Actions/WorldAction/StepWorldTimeAction.def (modified) (1 diff)

src/Actions/WorldAction/StepWorldTimeAction.def

@@ -14 +14 @@
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
 // "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
-#define paramtypes (unsigned int)(unsigned int)
-#define paramtokens ("steps-forward")("steps-backward")
-#define paramdescriptions ("how many steps to take forward or backward")("how many steps to take forward or backward")
-#define paramdefaults (PARAM_DEFAULT(1))(PARAM_DEFAULT(0))
-#define paramreferences (steps_forward)(steps_backward)
+#define paramtypes (int)
+#define paramtokens ("step-world-time")
+#define paramdescriptions ("how many steps to take forward (positive) or backward (negative)")
+#define paramdefaults (PARAM_DEFAULT(1))
+#define paramreferences (steps)
 #define paramvalids \
-(DummyValidator< unsigned int >()) \
-(DummyValidator< unsigned int >())
+(DummyValidator< int >())
 
 #define statetypes (unsigned int)