Changeset 6b5228 for src/Parser/Parameters

Timestamp:

Oct 17, 2011, 4:52:28 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:

ec0acc

Parents:

39fa96

git-author:

Frederik Heber <heber@…> (10/04/11 08:35:42)

git-committer:

Frederik Heber <heber@…> (10/17/11 16:52:28)

Message:

Added operator==() to Continuous- and DiscreteParameter classes.

• added comparator function for both Parameter types.
• added unit tests on these.

Location:

src/Parser/Parameters

Files:

• ContinuousParameter.hpp (modified) (1 diff)
• ContinuousParameter_impl.hpp (modified) (1 diff)
• DiscreteParameter.hpp (modified) (1 diff)
• DiscreteParameter_impl.hpp (modified) (1 diff)
• unittests/ContinuousParameterUnitTest.cpp (modified) (1 diff)
• unittests/ContinuousParameterUnitTest.hpp (modified) (2 diffs)
• unittests/DiscreteParameterUnitTest.cpp (modified) (1 diff)
• unittests/DiscreteParameterUnitTest.hpp (modified) (2 diffs)

src/Parser/Parameters/ContinuousParameter.hpp

@@ -30 +30 @@
   virtual ~ContinuousParameter();
 
+  // comparator
+  bool operator==(const ContinuousParameter<T> &_instance) const;
+  bool operator!=(const ContinuousParameter<T> &_instance) const
+      { return !((*this)==(_instance)); }
+
   Parameter* clone() const;
 

src/Parser/Parameters/ContinuousParameter_impl.hpp

@@ -42 +42 @@
 {};
 
+/** Compares this continuous value against another \a _instance.
+ *
+ * @param _instance other value to compare to
+ * @return true - if contained ContinuousValue and name are the same, false - else
+ */
+template <class T>
+bool ContinuousParameter<T>::operator==(const ContinuousParameter<T> &_instance) const
+{
+  bool status = true;
+  status = status &&
+      (*dynamic_cast<const ContinuousValue<T> *>(this) == dynamic_cast<const ContinuousValue<T> &>(_instance));
+  status = status && (Parameter::getName() == _instance.Parameter::getName());
+  return status;
+}
+
 /** Creates a clone of this Parameter instance.
  *

src/Parser/Parameters/DiscreteParameter.hpp

@@ -32 +32 @@
   virtual ~DiscreteParameter();
 
+  // comparator
+  bool operator==(const DiscreteParameter<T> &_instance) const;
+  bool operator!=(const DiscreteParameter<T> &_instance) const
+      { return !((*this)==(_instance)); }
+
   Parameter* clone() const;
 

src/Parser/Parameters/DiscreteParameter_impl.hpp

@@ -44 +44 @@
 {};
 
+/** Compares this discrete value against another \a _instance.
+ *
+ * @param _instance other value to compare to
+ * @return true - if contained DiscreteValue and name are the same, false - else
+ */
+template <class T>
+bool DiscreteParameter<T>::operator==(const DiscreteParameter<T> &_instance) const
+{
+  bool status = true;
+  status = status &&
+      (*dynamic_cast<const DiscreteValue<T> *>(this) == dynamic_cast<const DiscreteValue<T> &>(_instance));
+  status = status && (Parameter::getName() == _instance.Parameter::getName());
+  return status;
+}
+
 /** Creates a clone of this Parameter instance.
  *

src/Parser/Parameters/unittests/ContinuousParameterUnitTest.cpp

@@ -51 +51 @@
 /************************************ tests ***********************************/
 
+/** Unit test for comparator.
+ *
+ */
+void ContinuousParameterTest::comparatorTest()
+{
+  // create instance
+  ContinuousParameter<int> test("intParam", *ValidRange);
+  ContinuousParameter<int> samenamedsamevalued("intParam", *ValidRange);
+  ContinuousParameter<int> samenamedelsevalued("intParam", *ValidRange);
+  ContinuousParameter<int> elsenamedsamevalued("int2Param", *ValidRange);
+  ContinuousParameter<int> elsenamedelsevalued("int2Param", *ValidRange);
+  test.setValue(1);
+  samenamedsamevalued.setValue(1);
+  samenamedelsevalued.setValue(2);
+  elsenamedsamevalued.setValue(1);
+  elsenamedelsevalued.setValue(2);
+
+  CPPUNIT_ASSERT( test == samenamedsamevalued );
+  CPPUNIT_ASSERT( test != samenamedelsevalued );
+  CPPUNIT_ASSERT( test != elsenamedsamevalued );
+  CPPUNIT_ASSERT( test != elsenamedelsevalued );
+}
+
 /** Unit test for clone.
  *

src/Parser/Parameters/unittests/ContinuousParameterUnitTest.hpp

@@ -22 +22 @@
 {
   CPPUNIT_TEST_SUITE( ContinuousParameterTest ) ;
+  CPPUNIT_TEST ( comparatorTest );
   CPPUNIT_TEST ( cloneTest );
   CPPUNIT_TEST_SUITE_END();
@@ -29 +30 @@
   void tearDown();
 
+  void comparatorTest();
   void cloneTest();
 

src/Parser/Parameters/unittests/DiscreteParameterUnitTest.cpp

@@ -53 +53 @@
 /************************************ tests ***********************************/
 
+/** Unit test for comparator.
+ *
+ */
+void DiscreteParameterTest::comparatorTest()
+{
+  // create instance
+  DiscreteParameter<int> test("intParam", ValidValues);
+  DiscreteParameter<int> samenamedsamevalued("intParam", ValidValues);
+  DiscreteParameter<int> samenamedelsevalued("intParam", ValidValues);
+  DiscreteParameter<int> elsenamedsamevalued("int2Param", ValidValues);
+  DiscreteParameter<int> elsenamedelsevalued("int2Param", ValidValues);
+  test.setValue(1);
+  samenamedsamevalued.setValue(1);
+  samenamedelsevalued.setValue(2);
+  elsenamedsamevalued.setValue(1);
+  elsenamedelsevalued.setValue(2);
+
+  CPPUNIT_ASSERT( test == samenamedsamevalued );
+  CPPUNIT_ASSERT( test != samenamedelsevalued );
+  CPPUNIT_ASSERT( test != elsenamedsamevalued );
+  CPPUNIT_ASSERT( test != elsenamedelsevalued );
+}
+
 /** Unit test for clone.
  *

src/Parser/Parameters/unittests/DiscreteParameterUnitTest.hpp

@@ -20 +20 @@
 {
   CPPUNIT_TEST_SUITE( DiscreteParameterTest ) ;
+  CPPUNIT_TEST ( comparatorTest );
   CPPUNIT_TEST ( cloneTest );
   CPPUNIT_TEST_SUITE_END();
@@ -27 +28 @@
   void tearDown();
 
+  void comparatorTest();
   void cloneTest();