Changeset 39fa96

Timestamp:

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

6b5228

Parents:

c4afd1

git-author:

Frederik Heber <heber@…> (10/04/11 08:34:41)

git-committer:

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

Message:

Added variable name and function getName() to interface Parameter.

• a Parameter always must have a name (cstors without params are private).
• this is preparatory for storage inside a Registry<Parameter>.
• adapted Continuous- and DiscreteParameter's cstors accordingly, pass on to Parameter's cstor.

Location:

src/Parser/Parameters

Files:

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

src/Parser/Parameters/ContinuousParameter.hpp

@@ -14 +14 @@
 #endif
 
+#include <string>
 
 #include "ContinuousValue.hpp"
@@ -25 +26 @@
 {
 public:
-  ContinuousParameter();
-  ContinuousParameter(const range<T> &_ValidRange);
+  ContinuousParameter(const std::string &_name);
+  ContinuousParameter(const std::string &_name, const range<T> &_ValidRange);
   virtual ~ContinuousParameter();
 
   Parameter* clone() const;
+
+private:
+  ContinuousParameter();
 };
 

src/Parser/Parameters/ContinuousParameter_impl.hpp

@@ -20 +20 @@
  */
 template<typename T>
-ContinuousParameter<T>::ContinuousParameter()
+ContinuousParameter<T>::ContinuousParameter(const std::string &_name) :
+  Parameter(_name)
 {};
 
 /** Constructor for class ContinuousParameter.
  *
+ * @param _name name of this parameter
  * @param _ValidRange valid range for this ContinuousValue
  */
 template<typename T>
-ContinuousParameter<T>::ContinuousParameter(const range<T> &_ValidRange) :
+ContinuousParameter<T>::ContinuousParameter(const std::string &_name, const range<T> &_ValidRange) :
+  Parameter(_name),
   ContinuousValue<T>(_ValidRange)
 {};
@@ -46 +49 @@
 Parameter* ContinuousParameter<T>::clone() const
 {
-  ContinuousParameter<T> *instance = new ContinuousParameter<T>(ContinuousValue<T>::getValidRange());
+  ContinuousParameter<T> *instance = new ContinuousParameter<T>(Parameter::getName(), ContinuousValue<T>::getValidRange());
   instance->setValue(ContinuousValue<T>::getValue());
   return instance;

src/Parser/Parameters/DiscreteParameter.hpp

@@ -14 +14 @@
 #endif
 
+#include <string>
 
 #include "DiscreteValue.hpp"
@@ -27 +28 @@
 {
 public:
-  DiscreteParameter();
-  DiscreteParameter(const std::vector<T> &_ValidValues);
+  DiscreteParameter(const std::string &_name);
+  DiscreteParameter(const std::string &_name, const std::vector<T> &_ValidValues);
   virtual ~DiscreteParameter();
 
   Parameter* clone() const;
+
+private:
+  DiscreteParameter();
 };
 

src/Parser/Parameters/DiscreteParameter_impl.hpp

@@ -22 +22 @@
  */
 template<typename T>
-DiscreteParameter<T>::DiscreteParameter()
+DiscreteParameter<T>::DiscreteParameter(const std::string &_name) :
+  Parameter(_name)
 {};
 
 /** Constructor for class DiscreteParameter.
  *
+ * @param _name name of this parameter
  * @param _ValidValues valid values for this DiscreteValue
  */
 template<typename T>
-DiscreteParameter<T>::DiscreteParameter(const std::vector<T> &_ValidValues) :
+DiscreteParameter<T>::DiscreteParameter(const std::string &_name, const std::vector<T> &_ValidValues) :
+  Parameter(_name),
   DiscreteValue<T>(_ValidValues)
 {};
@@ -48 +51 @@
 Parameter* DiscreteParameter<T>::clone() const
 {
-  DiscreteParameter<T> *instance = new DiscreteParameter<T>(DiscreteValue<T>::getValidValues());
+  DiscreteParameter<T> *instance = new DiscreteParameter<T>(Parameter::getName(), DiscreteValue<T>::getValidValues());
   instance->setValue(DiscreteValue<T>::getValue());
   return instance;

src/Parser/Parameters/Parameter.hpp

@@ -14 +14 @@
 #endif
 
+#include <string>
+
 #include "CodePatterns/Clone.hpp"
 
@@ -19 +21 @@
 
 
+/** This interface represents a clonable, named Value.
+ *
+ */
 class Parameter : virtual public ValueInterface, public Clone<Parameter>
 {
 public:
+  Parameter(const std::string &_name) : name(_name) {}
   virtual ~Parameter() {}
 
+  const std::string &getName() const { return name; }
+
   virtual Parameter* clone() const=0;
+
+private:
+  Parameter();
+
+private:
+  const std::string name;
 };
 

src/Parser/Parameters/unittests/ContinuousParameterUnitTest.cpp

@@ -57 +57 @@
 {
   // create instance
-  ContinuousParameter<int> test(*ValidRange);
+  ContinuousParameter<int> test("intParam", *ValidRange);
 
   // check that we throw because of unset parameter

src/Parser/Parameters/unittests/DiscreteParameterUnitTest.cpp

@@ -59 +59 @@
 {
   // create instance
-  DiscreteParameter<int> test(ValidValues);
+  DiscreteParameter<int> test("intParam", ValidValues);
 
   // check that we throw because of unset parameter