Changeset ab2ebe for src/Actions

Timestamp:

Jun 13, 2012, 5:39:18 PM (13 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:

6ba9ba

Parents:

c31fbd

git-author:

Michael Ankele <ankele@…> (05/14/12 09:40:47)

git-committer:

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

Message:

ActionNameValidator implemented

• FIX: HelpAction's ActionNameValidator caused infinite loop of ActionRegistry::fillRegistry(). Default value must be checked by a DiscreteValidator which comes before ActionNameValidator!
• HelpAction::performCall() given string type explicitly.
• TESTFIX: Created ActionNameValidatorStub used in ActionRegistryUnitTest and ActionSequenceUnitTest.

Location:

src/Actions

Files:

• CommandAction/HelpAction.cpp (modified) (1 diff)
• CommandAction/HelpAction.def (modified) (2 diffs)
• unittests/Makefile.am (modified) (2 diffs)

src/Actions/CommandAction/HelpAction.cpp

@@ -63 +63 @@
   std::cout << std::endl;
   // print list of actions or its options
-  if (params.actionname.get() == "none") {
+  if (params.actionname.get() == std::string("none")) {
     // print list of all Actions
     std::cout << "Here is a list of all available Actions:" << std::endl;

src/Actions/CommandAction/HelpAction.def

@@ -8 +8 @@
 // all includes and forward declarations necessary for non-integral types below
 
-
+#include "Parameters/Validators/DiscreteValidator.hpp"
+#include "Parameters/Validators/Ops_Validator.hpp"
 #include "Parameters/Validators/Specific/ActionNameValidator.hpp"
 
@@ -20 +21 @@
 #define paramreferences (actionname)
 #define paramvalids \
-(ActionNameValidator())
+(DiscreteValidator<std::string>(std::vector<std::string>(1, std::string("none"))) || ActionNameValidator())
+// NOTE: The _default_ value MUST NOT require validation via ActionNameValidator!
+// This will trigger an infinite loop of ActionRegistry::fillRegistry() calls as ActionRegistry is
+// at the time of the filling on of the default values not yet completely constructed!
 
 #undef statetypes

src/Actions/unittests/Makefile.am

@@ -32 +32 @@
         ../Actions/unittests/ActionRegistryUnitTest.cpp \
         ../Actions/unittests/ActionRegistryUnitTest.hpp \
+        ../Parameters/unittests/stubs/ActionNameValidatorStub.cpp \
         ../Parameters/unittests/stubs/BoxLengthValidatorStub.cpp \
         ../Parameters/unittests/stubs/BoxVectorValidatorStub.cpp \
@@ -41 +42 @@
         ../Actions/unittests/ActionSequenceUnitTest.hpp \
         ../Actions/unittests/stubs/DummyUI.hpp \
+        ../Parameters/unittests/stubs/ActionNameValidatorStub.cpp \
         ../Parameters/unittests/stubs/BoxLengthValidatorStub.cpp \
         ../Parameters/unittests/stubs/BoxVectorValidatorStub.cpp \