Changeset 23958d for src/Actions/ParserAction

Timestamp:

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

361805

Parents:

8453b3

git-author:

Frederik Heber <heber@…> (05/10/12 13:24:59)

git-committer:

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

Message:

HUGE: All .def files now contain a useful paramvalids line.

• many specific Validators have been added but have only DummyValidator funcitonality so far.
• also some more generic (i.e. templated) validators have been added.
• TESTFIXES: Some regression tests had to be changed because they either had initial faults or now fail due to stricter validators.
  • parser-tremolo-potentials-save: lacked .potentials file in testdir (thx validator!)
  • selection-.*.at: all stored to a targetfile more than once which is not allowed by FilePresentValidator.

Location:

src/Actions/ParserAction

Files:

• ParseTremoloPotentialsAction.def (modified) (2 diffs)
• SaveSelectedAtomsAsExtTypesAction.def (modified) (2 diffs)
• SetOutputFormatsAction.def (modified) (2 diffs)
• SetParserParametersAction.def (modified) (2 diffs)
• SetTremoloAtomdataAction.def (modified) (2 diffs)

src/Actions/ParserAction/ParseTremoloPotentialsAction.def

@@ -9 +9 @@
 #include <boost/filesystem.hpp>
 
-#include "Parameters/Validators/DummyValidator.hpp"
+#include "Parameters/Validators/Ops_Validator.hpp"
+#include "Parameters/Validators/Specific/FilePresentValidator.hpp"
+#include "Parameters/Validators/Specific/FileSuffixValidator.hpp"
 
 // i.e. there is an integer with variable name Z that can be found in
@@ -15 +17 @@
 // "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
 #define paramtypes (boost::filesystem::path)
-#define paramvalids (DummyValidator< boost::filesystem::path >())
 #define paramtokens ("parse-tremolo-potentials")
 #define paramdescriptions ("path to tremolo's potentials file")
 #undef paramdefaults
 #define paramreferences (filename)
+#define paramvalids \
+(FilePresentValidator() && FileSuffixValidator("potentials"))
 
 #undef statetypes

src/Actions/ParserAction/SaveSelectedAtomsAsExtTypesAction.def

@@ -9 +9 @@
 #include <boost/filesystem.hpp>
 
-#include "Parameters/Validators/DummyValidator.hpp"
+#include "Parameters/Validators/Specific/FileSuffixValidator.hpp"
 
 // i.e. there is an integer with variable name Z that can be found in
@@ -15 +15 @@
 // "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
 #define paramtypes (unsigned int)(boost::filesystem::path)
-#define paramvalids (DummyValidator< unsigned int >())(DummyValidator< boost::filesystem::path >())
 #define paramtokens ("save-selected-atoms-as-exttypes")("filename")
-#define paramdescriptions ("Type id for this selection of atoms")("path to tremolo's exttypes file")
+#define paramdescriptions ("Type id for this selection of atoms")("path to tremolo's .exttypes file to which we append")
 #undef paramdefaults
 #define paramreferences (id)(filename)
+#define paramvalids \
+(DummyValidator< unsigned int >()) \
+(FileSuffixValidator("exttypes"))
 
 #undef statetypes

src/Actions/ParserAction/SetOutputFormatsAction.def

@@ -9 +9 @@
 #include <vector>
 
-#include "Parameters/Validators/DummyValidator.hpp"
+#include "Parameters/Validators/Ops_Validator.hpp"
+#include "Parameters/Validators/STLVectorValidator.hpp"
+#include "Parameters/Validators/UniqueValidator.hpp"
+#include "Parameters/Validators/Specific/ParserTypeValidator.hpp"
 
 // i.e. there is an integer with variable name Z that can be found in
@@ -15 +18 @@
 // "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
 #define paramtypes (std::vector<std::string>)
-#define paramvalids (DummyValidator< std::vector<std::string> >())
 #define paramtokens ("set-output")
 #define paramdescriptions ("specify output formats")
 #undef paramdefaults
 #define paramreferences (FormatList)
+#define paramvalids \
+(STLVectorValidator< std::vector<std::string> >(1, 10, ParserTypeValidator()) && UniqueValidator< std::vector<std::string> >())
 
 #undef statetypes

src/Actions/ParserAction/SetParserParametersAction.def

@@ -9 +9 @@
 
 
-#include "Parameters/Validators/DummyValidator.hpp"
+#include "Parameters/Validators/Specific/ParserTypeValidator.hpp"
+#include "Parameters/Validators/Specific/KeyValueValidator.hpp"
 
 // i.e. there is an integer with variable name Z that can be found in
@@ -15 +16 @@
 // "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
 #define paramtypes (std::string)(std::string)
-#define paramvalids (DummyValidator< std::string >())(DummyValidator< 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 paramreferences (parsername)(newparams)
+#define paramvalids \
+(ParserTypeValidator())\
+(KeyValueValidator())
 
 #define statetypes (std::string)

src/Actions/ParserAction/SetTremoloAtomdataAction.def

@@ -9 +9 @@
 #include <boost/filesystem.hpp>
 
-#include "Parameters/Validators/DummyValidator.hpp"
+#include "Parameters/Validators/Specific/AtomDataValidator.hpp"
 
 // i.e. there is an integer with variable name Z that can be found in
@@ -15 +15 @@
 // "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
 #define paramtypes (std::string)
-#define paramvalids (DummyValidator< std::string >())
 #define paramtokens ("set-tremolo-atomdata")
 #define paramdescriptions ("properties to set, space-separated")
 #undef paramdefaults
 #define paramreferences (atomdata_string)
+#define paramvalids \
+(AtomDataValidator())
 
 #undef statetypes