Changeset 8f130c

Timestamp:

May 22, 2012, 12:09:10 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:

ad6917

Parents:

4892c3

git-author:

Michael Ankele <ankele@…> (04/13/12 15:20:56)

git-committer:

Michael Ankele <ankele@…> (05/22/12 12:09:10)

Message:

made Validators comparable

Location:

src/Parameters

Files:

• Validators/DiscreteValidator.hpp (modified) (1 diff)
• Validators/DummyValidator.hpp (modified) (1 diff)
• Validators/RangeValidator.hpp (modified) (1 diff)
• Validators/Validator.hpp (modified) (1 diff)
• Value_impl.hpp (modified) (1 diff)

src/Parameters/Validators/DiscreteValidator.hpp

@@ -43 +43 @@
   Validator<T>* clone() const { return new DiscreteValidator<T>(ValidValues); };
 
+  // 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;
+  };
+
 private:
   //!> list of valid values

src/Parameters/Validators/DummyValidator.hpp

@@ -32 +32 @@
 
   Validator<T>* clone() const { return new DummyValidator<T>; };
+
+  // comparator
+  bool operator==(const Validator<T> &_instance) const
+  {
+    const DummyValidator<T> *inst = dynamic_cast<const DummyValidator<T> *>(&_instance);
+    if (inst)
+      return true;
+    return false;
+  };
 };
 

src/Parameters/Validators/RangeValidator.hpp

@@ -45 +45 @@
   Validator<T>* clone() const { return new RangeValidator<T>(ValidRange); };
 
+  // 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;
+  };
+
 private:
   //!> valid range of values

src/Parameters/Validators/Validator.hpp

@@ -28 +28 @@
   virtual bool isValid(const T & _value) const=0;
   bool operator()(const T &_value) const {  return isValid(_value);  }
+
+  // comparator
+  virtual bool operator==(const Validator<T> &_instance) const=0;
+  bool operator!=(const Validator<T> &_instance) const
+      { return !((*this)==(_instance)); }
 };
 

src/Parameters/Value_impl.hpp

@@ -97 +97 @@
 {
   bool status = true;
-  //status = status && (ValidValues == _instance.ValidValues); // TODO
+  status = status && (*validator == *_instance.validator);
   status = status && (ValueSet == _instance.ValueSet);
   if (ValueSet && _instance.ValueSet)