Changeset 30ebdd for src/Parameters/unittests

Timestamp:

May 22, 2012, 12:50:26 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:

047cad

Parents:

adcfc6

git-author:

Michael Ankele <ankele@…> (04/16/12 11:44:31)

git-committer:

Michael Ankele <ankele@…> (05/22/12 12:50:26)

Message:

DiscreteParameterTest: using new Parameter class

File:

• src/Parameters/unittests/DiscreteParameterTest.cpp (modified) (4 diffs)

src/Parameters/unittests/DiscreteParameterTest.cpp

@@ -24 +24 @@
 #include <cppunit/ui/text/TestRunner.h>
 
-#include "Parameters/DiscreteParameter.hpp"
+#include "Parameters/Parameter.hpp"
 
 #ifdef HAVE_TESTRUNNER
@@ -59 +59 @@
 {
   // 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);
+  Parameter<int> test("intParam", ValidValues);
+  Parameter<int> samenamedsamevalued("intParam", ValidValues);
+  Parameter<int> samenamedelsevalued("intParam", ValidValues);
+  Parameter<int> elsenamedsamevalued("int2Param", ValidValues);
+  Parameter<int> elsenamedelsevalued("int2Param", ValidValues);
+  test.set(1);
+  samenamedsamevalued.set(1);
+  samenamedelsevalued.set(2);
+  elsenamedsamevalued.set(1);
+  elsenamedelsevalued.set(2);
 
   CPPUNIT_ASSERT( test == samenamedsamevalued );
@@ -82 +82 @@
 {
   // create instance
-  DiscreteParameter<int> test("intParam", ValidValues);
+  Parameter<int> test("intParam", ValidValues);
 
   // check that we throw because of unset parameter
@@ -91 +91 @@
 
   // set parameter
-  test.setValue(2);
+  test.set(2);
 
   // is returned as Parameter but we can compare only in true class as
   // Parameter may also be a ContinuousParameter where comparison is nonsense
-  DiscreteParameter<int> *instance = dynamic_cast< DiscreteParameter<int> *> (test.clone());
+  Parameter<int> *instance = dynamic_cast< Parameter<int> *> (test.clone());
 
   // different places in memory