Changeset 498ddd for src/Parser

Timestamp:

Oct 17, 2011, 2:45:04 PM (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, 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:

c4afd1

Parents:

84e752

git-author:

Frederik Heber <heber@…> (09/30/11 12:26:44)

git-committer:

Frederik Heber <heber@…> (10/17/11 14:45:04)

Message:

Added operator==() and operator!=() to Continuous- and DiscreteValue.

• ValueInterface is now inherited virtually.
• this is preparatory for class Parameter which is a clonable ...Value.
• we need comparators for the unit tests on that.
• unit test added for comparators.

Location:

src/Parser/Parameters

Files:

• ContinuousValue.hpp (modified) (2 diffs)
• ContinuousValue_impl.hpp (modified) (1 diff)
• DiscreteValue.hpp (modified) (2 diffs)
• DiscreteValue_impl.hpp (modified) (1 diff)
• unittests/ContinuousValueUnitTest.cpp (modified) (1 diff)
• unittests/ContinuousValueUnitTest.hpp (modified) (2 diffs)
• unittests/DiscreteValueUnitTest.cpp (modified) (1 diff)
• unittests/DiscreteValueUnitTest.hpp (modified) (2 diffs)

src/Parser/Parameters/ContinuousValue.hpp

@@ -27 +27 @@
  */
 template <class T>
-class ContinuousValue : public ValueInterface
+class ContinuousValue : virtual public ValueInterface
 {
   //!> unit test needs to have access to internal values
@@ -40 +40 @@
   const std::string get() const;
   void set(const std::string _value);
+
+  // comparator
+  bool operator==(const ContinuousValue<T> &_instance) const;
+  bool operator!=(const ContinuousValue<T> &_instance) const
+      { return !((*this)==(_instance)); }
 
   // getter/setter for valid ranges

src/Parser/Parameters/ContinuousValue_impl.hpp

@@ -64 +64 @@
 //  LOG(0, "Converted value reads " << castvalue <<".");
   return isValidValue(castvalue);
+}
+
+/** Compares this continuous value against another \a _instance.
+ *
+ * @param _instance other value to compare to
+ * @return true - if value and valid ranges are the same, false - else
+ */
+template <class T>
+bool ContinuousValue<T>::operator==(const ContinuousValue<T> &_instance) const
+{
+  bool status = true;
+  status = status && (ValidRange == _instance.ValidRange);
+  status = status && (ValueSet == _instance.ValueSet);
+  if (ValueSet && _instance.ValueSet)
+    status = status && (value == _instance.value);
+  return status;
 }
 

src/Parser/Parameters/DiscreteValue.hpp

@@ -27 +27 @@
  */
 template <class T>
-class DiscreteValue : public ValueInterface
+class DiscreteValue : virtual public ValueInterface
 {
   //!> unit test needs to have access to internal values
@@ -40 +40 @@
   const std::string get() const;
   void set(const std::string _value);
+
+  // comparator
+  bool operator==(const DiscreteValue<T> &_instance) const;
+  bool operator!=(const DiscreteValue<T> &_instance) const
+      { return !((*this)==(_instance)); }
 
   // setter/getter for valid values

src/Parser/Parameters/DiscreteValue_impl.hpp

@@ -59 +59 @@
   return isValidValue(castvalue);
 }
+
+/** Compares this discrete value against another \a _instance.
+ *
+ * @param _instance other value to compare to
+ * @return true - if value and valid ranges are the same, false - else
+ */
+template <class T>
+bool DiscreteValue<T>::operator==(const DiscreteValue<T> &_instance) const
+{
+  bool status = true;
+  status = status && (ValidValues == _instance.ValidValues);
+  status = status && (ValueSet == _instance.ValueSet);
+  if (ValueSet && _instance.ValueSet)
+    status = status && (value == _instance.value);
+  return status;
+}
+
 
 /** Getter of value, returning string.

src/Parser/Parameters/unittests/ContinuousValueUnitTest.cpp

@@ -193 +193 @@
 }
 
+/** Unit test for comparator.
+ *
+ */
+void ContinuousValueTest::comparatorTest()
+{
+  {
+    // create instance
+    ContinuousValue<int> test(*ValidRange);
+    ContinuousValue<int> instance(*ValidRange);
+    test.setValue(1);
+    instance.setValue(1);
+
+    // same value, same range
+    {
+      CPPUNIT_ASSERT(test == instance);
+    }
+
+    // different value, same range
+    {
+      const int oldvalue = instance.getValue();
+      instance.setValue(2);
+      CPPUNIT_ASSERT(test != instance);
+      instance.setValue(oldvalue);
+    }
+  }
+  {
+    ContinuousValue<int> test(*ValidRange);
+    range<int> OtherValidRange(1,5);
+    ContinuousValue<int> instance(OtherValidRange);
+
+    test.setValue(1);
+    instance.setValue(1);
+
+    // same value, same range
+    {
+      CPPUNIT_ASSERT(test != instance);
+    }
+
+    // different value, same range
+    {
+      const int oldvalue = instance.getValue();
+      instance.setValue(2);
+      CPPUNIT_ASSERT(test != instance);
+      instance.setValue(oldvalue);
+    }
+  }
+}

src/Parser/Parameters/unittests/ContinuousValueUnitTest.hpp

@@ -27 +27 @@
   CPPUNIT_TEST ( settergetterValueTest );
   CPPUNIT_TEST ( settergetterTest );
+  CPPUNIT_TEST ( comparatorTest );
   CPPUNIT_TEST_SUITE_END();
 
@@ -38 +39 @@
   void settergetterValueTest();
   void settergetterTest();
+  void comparatorTest();
 
 private:

src/Parser/Parameters/unittests/DiscreteValueUnitTest.cpp

@@ -212 +212 @@
   }
 }
+
+/** Unit test for comparator.
+ *
+ */
+void DiscreteValueTest::comparatorTest()
+{
+  {
+    // create instance
+    DiscreteValue<int> test(ValidValues);
+    DiscreteValue<int> instance(ValidValues);
+    test.setValue(1);
+    instance.setValue(1);
+
+    // same value, same range
+    {
+      CPPUNIT_ASSERT(test == instance);
+    }
+
+    // different value, same range
+    {
+      const int oldvalue = instance.getValue();
+      instance.setValue(2);
+      CPPUNIT_ASSERT(test != instance);
+      instance.setValue(oldvalue);
+    }
+  }
+  {
+    DiscreteValue<int> test(ValidValues);
+    DiscreteValue<int> instance(ValidValues);
+    instance.appendValidValue(4);
+
+    test.setValue(1);
+    instance.setValue(1);
+
+    // same value, same range
+    {
+      CPPUNIT_ASSERT(test != instance);
+    }
+
+    // different value, same range
+    {
+      const int oldvalue = instance.getValue();
+      instance.setValue(2);
+      CPPUNIT_ASSERT(test != instance);
+      instance.setValue(oldvalue);
+    }
+  }
+}

src/Parser/Parameters/unittests/DiscreteValueUnitTest.hpp

@@ -26 +26 @@
   CPPUNIT_TEST ( settergetterTest );
   CPPUNIT_TEST ( settergetterValueTest );
+  CPPUNIT_TEST ( comparatorTest );
   CPPUNIT_TEST_SUITE_END();
 
@@ -38 +39 @@
   void settergetterTest();
   void settergetterValueTest();
+  void comparatorTest();
 
 private: