Changeset 3c5ef5 for src/Parameters/Validators

Timestamp:

May 31, 2012, 1:25:16 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:

0b84b9

Parents:

9b5eb0

git-author:

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

git-committer:

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

Message:

DiscreteValueTest uses new Value class

Location:

src/Parameters/Validators

Files:

• DiscreteValidator.hpp (modified) (2 diffs)
• DiscreteValidator_impl.hpp (modified) (1 diff)
• RangeValidator.hpp (modified) (2 diffs)
• RangeValidator_impl.hpp (added)
• VectorRangeValidator.hpp (deleted)

src/Parameters/Validators/DiscreteValidator.hpp

@@ -19 +19 @@
 #include <vector>
 
+class DiscreteValueTest;
+
 /** A validator with a discrete list of valid values.
  *
@@ -25 +27 @@
 class DiscreteValidator : public Validator<T>
 {
+  //!> unit test needs to have access to internal values
+  friend class DiscreteValueTest;
 public:
   DiscreteValidator(const std::vector<T> &_ValidValues) : ValidValues(_ValidValues) {};

src/Parameters/Validators/DiscreteValidator_impl.hpp

@@ -52 +52 @@
 }
 
+
+template <class T>
+const std::vector<T> &DiscreteValidator<T>::getValidValues() const
+{
+  return ValidValues;
+}
+
 /** Internal function for finding the index of a desired value.
  *

src/Parameters/Validators/RangeValidator.hpp

@@ -28 +28 @@
   virtual ~RangeValidator() {};
 
-  bool isValid(const T & _value) const
-  {
-    bool isBefore = true;
-    bool isBeyond = true;
-    // check left boundary
-    isBefore = ValidRange.isBefore(_value);
-  //  if (isBefore)
-  //    LOG(0, "INFO: " << _value << " is before " << ValidRange.first << ".");
-    // check right boundary
-    isBeyond = ValidRange.isBeyond(_value) && (_value != ValidRange.last);
-  //  if (isBeyond)
-  //    LOG(0, "INFO: " << _value << " is beyond " << ValidRange.last << ".");
-    return (!isBefore) && (!isBeyond);
-  }
+  bool isValid(const T & _value) const;
 
-  Validator<T>* clone() const { return new RangeValidator<T>(ValidRange); };
+  Validator<T>* clone() const;
 
   // comparator
-  bool operator==(const Validator<T> &_instance) const
-  {
-    const RangeValidator<T> *inst = dynamic_cast<const RangeValidator<T> *>(&_instance);
-    if (inst)
-      return ValidRange == inst->ValidRange;
-    return false;
-  };
+  bool operator==(const Validator<T> &_instance) const;
+
+  // getter/setter for valid ranges
+  void setValidRange(const range<T> &_range);
+  const range<T> & getValidRange() const {  return ValidRange;  };
 
 private:
@@ -60 +45 @@
 
 
+#include "RangeValidator_impl.hpp"
+
 
 #endif /* RANGEVALIDATOR_HPP_ */