Changeset e59e8e for src/Parameters/Validators

Timestamp:

Nov 16, 2012, 11:10:57 AM (12 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:

5b991a

Parents:

713a43

git-author:

Michael Ankele <ankele@…> (11/02/12 15:43:14)

git-committer:

Frederik Heber <heber@…> (11/16/12 11:10:57)

Message:

ParserTypeValidator + And_Validator: values readable by QtQueryList

Location:

src/Parameters/Validators

Files:

• Ops_Validator_impl.hpp (modified) (1 diff)
• Specific/ParserTypeValidator.cpp (modified) (1 diff)
• Specific/ParserTypeValidator.hpp (modified) (1 diff)

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/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();
 };