Changeset 6440c6 for src/Parameters

Timestamp:

Feb 13, 2013, 3:47:46 PM (12 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:

cf1d82

Parents:

b11f5e

git-author:

Frederik Heber <heber@…> (01/10/13 13:27:38)

git-committer:

Frederik Heber <heber@…> (02/13/13 15:47:46)

Message:

Reworked inheritance graph of Parameter and Value.

• Value now takes both ValueInterface and ValueAsString.
• ParameterAsString placed into ParameterInterface, deleted, and renamed everywhere.
• ParameterInterface is longer template-dependent.
• ParameterInterface and Value inherited by Parameter.

Location:

src/Parameters

Files:

• Makefile.am (modified) (1 diff)
• Parameter.hpp (modified) (2 diffs)
• ParameterAsString.hpp (deleted)
• ParameterInterface.hpp (modified) (2 diffs)
• Parameter_impl.hpp (modified) (16 diffs)
• Value.hpp (modified) (2 diffs)
• ValueInterface.hpp (modified) (1 diff)
• unittests/Makefile.am (modified) (2 diffs)

src/Parameters/Makefile.am

@@ -31 +31 @@
         Parameters/Parameter.hpp \
         Parameters/Parameter_impl.hpp \
-        Parameters/ParameterAsString.hpp \
         Parameters/ParameterInterface.hpp \
         Parameters/Validators/DiscreteValidator.hpp \

src/Parameters/Parameter.hpp

@@ -28 +28 @@
  */
 template <typename T>
-class Parameter : public ParameterInterface<T>, public Value<T>
+class Parameter :
+  virtual public ParameterInterface,
+  virtual public Value<T>
 {
 public:
@@ -53 +55 @@
       { return !((*this)==(_instance)); }
 
-  ParameterAsString* clone() const;
+  ParameterInterface* clone() const;
 
 //private: // TODO...

src/Parameters/ParameterInterface.hpp

@@ -16 +16 @@
 #include <string>
 
-#include "Parameters/ValueInterface.hpp"
-#include "Parameters/ParameterAsString.hpp"
+#include "CodePatterns/Clone.hpp"
 
+#include "Parameters/ValueAsString.hpp"
 
-/** This interface represents a clonable, named Value.
+/** This interface represents a named Value.
  *
  */
-template <class T>
-class ParameterInterface : virtual public ParameterAsString, virtual public ValueInterface<T>
+class ParameterInterface :
+  virtual public ValueAsString,
+  public Clone<ParameterInterface>
 {
 public:
@@ -31 +32 @@
 
   const std::string &getName() const { return name; }
+
+  virtual ParameterInterface* clone() const=0;
 
 private:

src/Parameters/Parameter_impl.hpp

@@ -20 +20 @@
 template<typename T>
 Parameter<T>::Parameter(const Parameter<T> &instance) :
-  ParameterInterface<T>(instance.getName()),
+  ParameterInterface(instance.getName()),
   Value<T>(instance.getValidator())
 {
@@ -31 +31 @@
 template<typename T>
 Parameter<T>::Parameter() :
-  ParameterInterface<T>("__no_name__"),
+  ParameterInterface("__no_name__"),
   Value<T>()
 {};
@@ -40 +40 @@
 template<typename T>
 Parameter<T>::Parameter(const std::string &_name) :
-  ParameterInterface<T>(_name),
+  ParameterInterface(_name),
   Value<T>()
 {};
@@ -51 +51 @@
 template<typename T>
 Parameter<T>::Parameter(const std::string &_name, const T &_value) :
-  ParameterInterface<T>(_name),
+  ParameterInterface(_name),
   Value<T>()
 {
@@ -64 +64 @@
 template<typename T>
 Parameter<T>::Parameter(const std::string &_name, const Validator<T> &_Validator) :
-  ParameterInterface<T>(_name),
+  ParameterInterface(_name),
   Value<T>(_Validator)
 {};
@@ -76 +76 @@
 template<typename T>
 Parameter<T>::Parameter(const std::string &_name, const Validator<T> &_Validator, const T &_value) :
-  ParameterInterface<T>(_name),
+  ParameterInterface(_name),
   Value<T>(_Validator)
 {
@@ -89 +89 @@
 template<typename T>
 Parameter<T>::Parameter(const std::string &_name, const std::vector<T> &_ValidValues) :
-  ParameterInterface<T>(_name),
+  ParameterInterface(_name),
   Value<T>(_ValidValues)
 {};
@@ -101 +101 @@
 template<typename T>
 Parameter<T>::Parameter(const std::string &_name, const std::vector<T> &_ValidValues, const T &_value) :
-  ParameterInterface<T>(_name),
+  ParameterInterface(_name),
   Value<T>(_ValidValues)
 {
@@ -114 +114 @@
 template<typename T>
 Parameter<T>::Parameter(const std::string &_name, const range<T> &_ValidRange) :
-  ParameterInterface<T>(_name),
+  ParameterInterface(_name),
   Value<T>(_ValidRange)
 {};
@@ -126 +126 @@
 template<typename T>
 Parameter<T>::Parameter(const std::string &_name, const range<T> &_ValidRange, const T &_value) :
-  ParameterInterface<T>(_name),
+  ParameterInterface(_name),
   Value<T>(_ValidRange)
 {
@@ -149 +149 @@
     return Value<T>::getAsString();
   } catch(ParameterException &e) {
-    e << ParameterName(ParameterInterface<T>::getName());
+    e << ParameterName(ParameterInterface::getName());
     throw;
   }
@@ -164 +164 @@
     return Value<T>::get();
   } catch(ParameterException &e) {
-    e << ParameterName(ParameterInterface<T>::getName());
+    e << ParameterName(ParameterInterface::getName());
     throw;
   }
@@ -179 +179 @@
     Value<T>::set(_value);
   } catch(ParameterException &e) {
-    e << ParameterName(ParameterInterface<T>::getName());
+    e << ParameterName(ParameterInterface::getName());
     throw;
   }
@@ -194 +194 @@
     Value<T>::setAsString(_value);
   } catch(ParameterException &e) {
-    e << ParameterName(ParameterInterface<T>::getName());
+    e << ParameterName(ParameterInterface::getName());
     throw;
   }
@@ -211 +211 @@
     status = status &&
         (*dynamic_cast<const Value<T> *>(this) == dynamic_cast<const Value<T> &>(_instance));
-    status = status && (ParameterInterface<T>::getName() == _instance.ParameterInterface<T>::getName());
-  } catch(ParameterException &e) {
-    e << ParameterName(ParameterInterface<T>::getName());
+    status = status && (ParameterInterface::getName() == _instance.ParameterInterface::getName());
+  } catch(ParameterException &e) {
+    e << ParameterName(ParameterInterface::getName());
     throw;
   }
@@ -224 +224 @@
  */
 template<typename T>
-inline ParameterAsString* Parameter<T>::clone() const
-{
-  Parameter<T> *instance = new Parameter<T>(ParameterInterface<T>::getName(), Value<T>::getValidator());
+inline ParameterInterface* Parameter<T>::clone() const
+{
+  Parameter<T> *instance = new Parameter<T>(ParameterInterface::getName(), Value<T>::getValidator());
   if (Value<T>::ValueSet)
     instance->set(Value<T>::get());

src/Parameters/Value.hpp

@@ -18 +18 @@
 #include <vector>
 
+#include "ValueAsString.hpp"
 #include "ValueInterface.hpp"
 #include "Validators/Validator.hpp"
@@ -57 +58 @@
  */
 template <class T>
-class Value : virtual public ValueInterface<T>
+class Value :
+  virtual public ValueAsString,
+  public ValueInterface<T>
 {
   //!> unit test needs to have access to internal values

src/Parameters/ValueInterface.hpp

@@ -23 +23 @@
  */
 template <class T>
-class ValueInterface : virtual public ValueAsString
+class ValueInterface
 {
 public:

src/Parameters/unittests/Makefile.am

@@ -56 +56 @@
         ../Parameters/Parameter.hpp \
         ../Parameters/Parameter_impl.hpp \
-        ../Parameters/ParameterAsString.hpp \
         ../Parameters/ParameterInterface.hpp
 ContinuousParameterTest_LDADD = \
@@ -80 +79 @@
         ../Parameters/Parameter.hpp \
         ../Parameters/Parameter_impl.hpp \
-        ../Parameters/ParameterAsString.hpp \
         ../Parameters/ParameterInterface.hpp \
         ../Parameters/Validators/DiscreteValidator.hpp \