Changeset 8453b3

Timestamp:

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

23958d

Parents:

649aaa

git-author:

Frederik Heber <heber@…> (05/09/12 16:44:04)

git-committer:

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

Message:

Exemplarily modified PairCorrelationAction.def to have specific validators.

• this commit showcases how to use the new validators in the .def files.
• specific validators are placed in Parameters/Validators/Specifics.
• added BoxLengthValidator, ElementValidator.
• added STLVectorValidator for vector of arbitrary type and validators on size of vector and each element.
• added convenience library for Parameters
• TESTFIX: Created BoxLengthValidatorStub for later use, e.g. ActionRegistryUnitTest.

Location:

src

Files:

• Actions/AnalysisAction/PairCorrelationAction.def (modified) (2 diffs)
• Actions/unittests/Makefile.am (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• Parameters/Makefile.am (added)
• Parameters/Validators/STLVectorValidator.hpp (added)
• Parameters/Validators/Specific/BoxLengthValidator.cpp (added)
• Parameters/Validators/Specific/BoxLengthValidator.hpp (added)
• Parameters/Validators/Specific/ElementValidator.hpp (added)
• Parameters/Validators/Specific/FilePresentValidator.hpp (added)
• Parameters/unittests/stubs/BoxLengthValidatorStub.cpp (added)
• UIElements/Makefile.am (modified) (1 diff)

src/Actions/AnalysisAction/PairCorrelationAction.def

@@ -12 +12 @@
 
 #include "Parameters/Validators/DummyValidator.hpp"
+#include "Parameters/Validators/Ops_Validator.hpp"
+#include "Parameters/Validators/STLVectorValidator.hpp"
+#include "Parameters/Validators/Specific/BoxLengthValidator.hpp"
+#include "Parameters/Validators/Specific/ElementValidator.hpp"
+#include "Parameters/Validators/Specific/FilePresentValidator.hpp"
+
+#include "Parameters/Validators/DummyValidator.hpp"
 
 // i.e. there is an integer with variable name Z that can be found in
@@ -17 +24 @@
 // "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
 #define paramtypes (std::vector<const element *>)(double)(double)(double)(boost::filesystem::path)(boost::filesystem::path)(bool)
-#define paramvalids (DummyValidator< std::vector<const element *> >())(DummyValidator< double >())(DummyValidator< double >())(DummyValidator< double >())(DummyValidator< boost::filesystem::path >())(DummyValidator< boost::filesystem::path >())(DummyValidator< 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 paramvalids \
+(STLVectorValidator< std::vector<const element *> >(2,2, ElementValidator())) \
+(BoxLengthValidator()) \
+(BoxLengthValidator()) \
+(BoxLengthValidator()) \
+(!FilePresentValidator()) \
+(!FilePresentValidator()) \
+(DummyValidator<bool>())
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS

src/Actions/unittests/Makefile.am

@@ -31 +31 @@
 ActionRegistryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ../Actions/unittests/ActionRegistryUnitTest.cpp \
-        ../Actions/unittests/ActionRegistryUnitTest.hpp
+        ../Actions/unittests/ActionRegistryUnitTest.hpp \
+        ../Parameters/unittests/stubs/BoxLengthValidatorStub.cpp
 ActionRegistryUnitTest_LDADD = ${ACTIONLIBS}
 
@@ -37 +38 @@
         ../Actions/unittests/ActionSequenceUnitTest.cpp \
         ../Actions/unittests/ActionSequenceUnitTest.hpp \
-        ../Actions/unittests/stubs/DummyUI.hpp
+        ../Actions/unittests/stubs/DummyUI.hpp \
+        ../Parameters/unittests/stubs/BoxLengthValidatorStub.cpp
 ActionSequenceUnitTest_LDADD = \
         ${ACTIONLIBS} \

src/Makefile.am

@@ -18 +18 @@
 include Helpers/Makefile.am
 include LinkedCell/Makefile.am
+include Parameters/Makefile.am
 include Parser/Makefile.am
 include RandomNumbers/Makefile.am

src/UIElements/Makefile.am

@@ -271 +271 @@
         libMolecuilderFragmentation.la \
         libMolecuilderParser.la \
+        libMolecuilderParameters.la \
         libMolecuilderShapes.la \
         libMolecuilderLinkedCell.la \