Changeset 9b5eb0 for src/Parameters/Validators

Timestamp:

May 31, 2012, 1:25:15 PM (13 years ago)

Author:

Michael Ankele <ankele@…>

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:

3c5ef5

Parents:

047cad

git-author:

Michael Ankele <ankele@…> (04/16/12 12:46:45)

git-committer:

Michael Ankele <ankele@…> (05/31/12 13:25:15)

Message:

added DiscreteValidator.findIndexOfValue

• created xxx_impl.hpp

Location:

src/Parameters/Validators

Files:

• DiscreteValidator.hpp (modified) (2 diffs)
• DiscreteValidator_impl.hpp (added)

src/Parameters/Validators/DiscreteValidator.hpp

@@ -29 +29 @@
   virtual ~DiscreteValidator() {};
 
-  bool isValid(const T & _value) const
-  {
-    typename std::vector<T>::const_iterator iter = std::find(ValidValues.begin(), ValidValues.end(), _value);
-    if (iter != ValidValues.end()) {
-      //std::cout << "Found " << _value << ":" << *iter << std::endl;
-      return true;
-    } else {
-      //std::cout << "Did not find " << _value << "." << std::endl;
-      return false;
-    }
-  }
+  bool isValid(const T & _value) const;
 
-  Validator<T>* clone() const { return new DiscreteValidator<T>(ValidValues); };
+  Validator<T>* clone() const;
 
   // comparator
-  bool operator==(const Validator<T> &_instance) const
-  {
-    const DiscreteValidator<T> *inst = dynamic_cast<const DiscreteValidator<T> *>(&_instance);
-    if (inst)
-      return ValidValues == inst->ValidValues;
-    return false;
-  };
+  bool operator==(const Validator<T> &_instance) const;
 
-  void appendValidValue(const T &_value)
-  {
-    ASSERT(!isValid(_value),
-        "DiscreteValidator<>::appendValidValue() - value "+toString(_value)+" is already among the valid");
-    ValidValues.push_back(_value);
-  }
+  void appendValidValue(const T &_value);
+  const std::vector<T> &getValidValues() const;
+
+private:
+  const size_t findIndexOfValue(const T &_value) const;
 
 private:
@@ -64 +47 @@
 };
 
+#include "DiscreteValidator_impl.hpp"
 
 #endif /* DISCRETEVALIDATOR_HPP_ */