Changeset d61161 for src/Parameters/Validators

Timestamp:

Nov 19, 2012, 10:27:51 AM (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, 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:

d5307b

Parents:

286a967 (diff), 315351 (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 'michi-list-query-validator' into stable

Location:

src/Parameters/Validators

Files:

• DiscreteValidator.hpp (modified) (1 diff)
• Ops_Validator_impl.hpp (modified) (1 diff)
• STLVectorValidator.hpp (modified) (1 diff)
• Specific/BoundaryConditionValidator.cpp (modified) (1 diff)
• Specific/BoundaryConditionValidator.hpp (modified) (1 diff)
• Specific/ParserTypeValidator.cpp (modified) (1 diff)
• Specific/ParserTypeValidator.hpp (modified) (1 diff)
• Specific/RandomNumberValidators.cpp (modified) (4 diffs)
• Specific/RandomNumberValidators.hpp (modified) (2 diffs)
• Specific/ShapeNameValidator.cpp (added)
• Specific/ShapeNameValidator.hpp (added)
• Specific/ShapeOpValidator.cpp (added)
• Specific/ShapeOpValidator.hpp (added)
• Specific/ShapeTypeValidator.cpp (added)
• Specific/ShapeTypeValidator.hpp (added)

src/Parameters/Validators/DiscreteValidator.hpp

@@ -42 +42 @@
 
   void appendValidValue(const T &_value) throw(ParameterValidatorException);
-  const std::vector<T> &getValidValues() const;
+  virtual const std::vector<T> &getValidValues() const;
 
 private:

src/Parameters/Validators/Ops_Validator_impl.hpp

@@ -49 +49 @@
     return false;
   }
+
+  Validator<T> *getA(){ return a; }
+  Validator<T> *getB(){ return b; }
 
 private:

src/Parameters/Validators/STLVectorValidator.hpp

@@ -122 +122 @@
   }
 
+  Validator<value_type> *getElementwiseValidator(){ return ElementwiseValidator;  }
+  Validator<size_t> *getNumberOfElementsValidator(){  return NumberOfElementsValidator; }
+
 private:
   /** Constructor for class STLVectorValidator, number of elements given by \ref RangeValidator.

src/Parameters/Validators/Specific/BoundaryConditionValidator.cpp

@@ -41 +41 @@
 #include "Box_BoundaryConditions.hpp"
 
+BoundaryConditionValidator::BoundaryConditionValidator() :
+  DiscreteValidator<std::string>(std::vector<std::string>())
+{}
+
 bool BoundaryConditionValidator::isValid(const std::string & _value) const
 {
   BoundaryConditions::BCContainer bc;
   return (bc.ReConverterBiMap.find(_value) != bc.ReConverterBiMap.end());
+}
+
+const std::vector<std::string> &BoundaryConditionValidator::getValidValues() const
+{
+  BoundaryConditions::BCContainer bc;
+  currentList.clear();
+  for (BoundaryConditions::BCContainer::StringToEnumMap::iterator iter = bc.ReConverterBiMap.begin();
+    iter != bc.ReConverterBiMap.end();
+    iter ++)
+    currentList.push_back(iter->first);
+  return currentList;
 }
 

src/Parameters/Validators/Specific/BoundaryConditionValidator.hpp

@@ -17 +17 @@
 #include <string>
 
-#include "Parameters/Validators/Validator.hpp"
+#include "Parameters/Validators/DiscreteValidator.hpp"
 
 /** This validator checks whether the given string is one keyword of a box
  * condition.
  */
-class BoundaryConditionValidator : public Validator<std::string>
+class BoundaryConditionValidator : public DiscreteValidator<std::string>
 {
+public:
+  BoundaryConditionValidator();
   bool isValid(const std::string & _value) const;
+  const std::vector<std::string> &getValidValues() const;
   bool operator==(const Validator<std::string> &_instance) const;
   Validator< std::string >* clone() const;
+private:
+  mutable std::vector<std::string> currentList;
 };
 

src/Parameters/Validators/Specific/ParserTypeValidator.cpp

@@ -39 +39 @@
 
 #include "Parser/FormatParserStorage.hpp"
+#include "Parser/ParserTypes.hpp"
 
-bool ParserTypeValidator::isValid(const std::string & _value) const
+ParserTypeValidator::ParserTypeValidator() :
+DiscreteValidator<std::string>(std::vector<std::string>())
 {
-  return (FormatParserStorage::getInstance().getTypeFromName(_value) != ParserTypes_end);
-}
-
-bool ParserTypeValidator::operator==(const Validator<std::string> &_instance) const
-{
-  const ParserTypeValidator *inst =
-      dynamic_cast<const ParserTypeValidator *>(&_instance);
-  if (inst)
-    return true;
-  else
-    return false;
-}
-
-Validator< std::string >* ParserTypeValidator::clone() const
-{
-  Validator< std::string > *inst =
-      new ParserTypeValidator();
-  return inst;
+  for (ParserTypes t = ParserTypes_begin; t != ParserTypes_end; ++ t)
+    appendValidValue(FormatParserStorage::getInstance().getNameFromType(t));
 }
 

src/Parameters/Validators/Specific/ParserTypeValidator.hpp

@@ -17 +17 @@
 #include <string>
 
-#include "Parameters/Validators/Validator.hpp"
+#include "Parameters/Validators/DiscreteValidator.hpp"
 
 /** This validator checks whether the given string refers to a valid
  * \ref FormatParser type.
  */
-class ParserTypeValidator : public Validator<std::string>
+class ParserTypeValidator : public DiscreteValidator<std::string>
 {
-  bool isValid(const std::string & _value) const;
-  bool operator==(const Validator<std::string> &_instance) const;
-  Validator< std::string >* clone() const;
+public:
+  ParserTypeValidator();
 };
 

src/Parameters/Validators/Specific/RandomNumberValidators.cpp

@@ -41 +41 @@
 #include "RandomNumbers/RandomNumberEngineFactory.hpp"
 
+RandomNumberDistributionNameValidator::RandomNumberDistributionNameValidator() :
+  DiscreteValidator<std::string>(std::vector<std::string>())
+{}
+
 bool RandomNumberDistributionNameValidator::isValid(const std::string & _value) const
 {
@@ -52 +56 @@
   }
   return false;
+}
+
+const std::vector<std::string> &RandomNumberDistributionNameValidator::getValidValues() const
+{
+  currentList.clear();
+  RandomNumberDistributionFactory::getInstance();
+  for (RandomNumberDistributionFactory::NameMap::const_iterator
+      iter = RandomNumberDistributionFactory::getInstance().names.begin();
+      iter != RandomNumberDistributionFactory::getInstance().names.end();
+      ++iter)
+    currentList.push_back(iter->second);
+  return currentList;
 }
 
@@ -79 +95 @@
 
 
+RandomNumberEngineNameValidator::RandomNumberEngineNameValidator() :
+  DiscreteValidator<std::string>(std::vector<std::string>())
+{}
+
 bool RandomNumberEngineNameValidator::isValid(const std::string & _value) const
 {
@@ -90 +110 @@
   }
   return false;
+}
+
+const std::vector<std::string> &RandomNumberEngineNameValidator::getValidValues() const
+{
+  currentList.clear();
+  RandomNumberEngineFactory::getInstance();
+  for (RandomNumberEngineFactory::NameMap::const_iterator
+      iter = RandomNumberEngineFactory::getInstance().names.begin();
+      iter != RandomNumberEngineFactory::getInstance().names.end();
+      ++iter)
+    currentList.push_back(iter->second);
+  return currentList;
 }
 

src/Parameters/Validators/Specific/RandomNumberValidators.hpp

@@ -17 +17 @@
 #include <string>
 
-#include "Parameters/Validators/Validator.hpp"
+#include "Parameters/Validators/DiscreteValidator.hpp"
 
 /** This validator checks whether the given string contains the name of a
  * present \ref RandomNumberDistribution.
  */
-class RandomNumberDistributionNameValidator : public Validator<std::string>
+class RandomNumberDistributionNameValidator : public DiscreteValidator<std::string>
 {
+public:
+  RandomNumberDistributionNameValidator();
   bool isValid(const std::string & _value) const;
+  const std::vector<std::string> &getValidValues() const;
   bool operator==(const Validator<std::string> &_instance) const;
   Validator< std::string >* clone() const;
+private:
+  mutable std::vector<std::string> currentList;
 };
 
@@ -32 +37 @@
  * present \ref RandomNumberEngine.
  */
-class RandomNumberEngineNameValidator : public Validator<std::string>
+class RandomNumberEngineNameValidator : public DiscreteValidator<std::string>
 {
+public:
+  RandomNumberEngineNameValidator();
   bool isValid(const std::string & _value) const;
+  const std::vector<std::string> &getValidValues() const;
   bool operator==(const Validator<std::string> &_instance) const;
   Validator< std::string >* clone() const;
+private:
+  mutable std::vector<std::string> currentList;
 };