Changeset dbb533 for src/Parameters/DiscreteParameter_impl.hpp

Timestamp:

Apr 17, 2012, 11:39:19 AM (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:

c513b7

Parents:

c68409

git-author:

Michael Ankele <ankele@…> (04/10/12 11:52:53)

git-committer:

Michael Ankele <ankele@…> (04/17/12 11:39:19)

Message:

updated Parameters' unittests

• renamed "xxxUnitTest" -> "xxxTest" (to evade naming conflicts)
• removed string operations
• fixed missing template <T>s

File:

• src/Parameters/DiscreteParameter_impl.hpp (modified) (5 diffs)

src/Parameters/DiscreteParameter_impl.hpp

@@ -23 +23 @@
 template<typename T>
 DiscreteParameter<T>::DiscreteParameter(const std::string &_name) :
-  Parameter(_name)
+  Parameter<T>(_name)
 {};
 
@@ -33 +33 @@
 template<typename T>
 DiscreteParameter<T>::DiscreteParameter(const std::string &_name, const std::vector<T> &_ValidValues) :
-  Parameter(_name),
+  Parameter<T>(_name),
   DiscreteValue<T>(_ValidValues)
 {};
@@ -45 +45 @@
 template<typename T>
 DiscreteParameter<T>::DiscreteParameter(const std::string &_name, const std::vector<T> &_ValidValues, const T &_value) :
-  Parameter(_name),
+  Parameter<T>(_name),
   DiscreteValue<T>(_ValidValues)
 {
@@ -69 +69 @@
   status = status &&
       (*dynamic_cast<const DiscreteValue<T> *>(this) == dynamic_cast<const DiscreteValue<T> &>(_instance));
-  status = status && (Parameter::getName() == _instance.Parameter::getName());
+  status = status && (Parameter<T>::getName() == _instance.Parameter<T>::getName());
   return status;
 }
@@ -78 +78 @@
  */
 template<typename T>
-Parameter* DiscreteParameter<T>::clone() const
+Parameter<T>* DiscreteParameter<T>::clone() const
 {
-  DiscreteParameter<T> *instance = new DiscreteParameter<T>(Parameter::getName(), DiscreteValue<T>::getValidValues());
+  DiscreteParameter<T> *instance = new DiscreteParameter<T>(Parameter<T>::getName(), DiscreteValue<T>::getValidValues());
   instance->setValue(DiscreteValue<T>::getValue());
   return instance;