Changeset cf1d82 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:

4d4ef8

Parents:

6440c6

git-author:

Frederik Heber <heber@…> (01/10/13 16:02:33)

git-committer:

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

Message:

Parameter now contains Value, not inherits.

• added several function to fully wrap all Value member functions.
• this should prevent any vtable clashes between Parameter and Value that both inherit ValueAsString.
• MpqcParser_Parameters.hpp does not contain any reference to the templated parts of Parameter or Value. These are only contained in the .cpp module.

Location:

src/Parameters

Files:

• Parameter.hpp (modified) (4 diffs)
• ParameterInterface.hpp (modified) (1 diff)
• Parameter_impl.hpp (modified) (16 diffs)
• Value.hpp (modified) (1 diff)

src/Parameters/Parameter.hpp

@@ -19 +19 @@
 
 #include "Value.hpp"
+#include "ValueInterface.hpp"
 #include "ParameterInterface.hpp"
 
@@ -29 +30 @@
 template <typename T>
 class Parameter :
-  virtual public ParameterInterface,
-  virtual public Value<T>
+  public ParameterInterface,
+  public ValueInterface<T>
 {
 public:
@@ -44 +45 @@
   virtual ~Parameter();
 
-  // catch the following functions from Value<T> to add exception information
+  // wrap the following functions from ValueAsString to add exception information
+  bool isValidAsString(const std::string &_value) const throw(ParameterValidatorException);
   const std::string getAsString() const throw(ParameterValueException);
+  void setAsString(const std::string &_value) throw(ParameterValueException);
+
+  // wrap the following functions from Value<T> to add exception information
+  bool isValid(const T &_value) const throw(ParameterValidatorException);
   const T & get() const throw(ParameterValueException);
   void set(const T & _value) throw(ParameterValueException);
-  void setAsString(const std::string &_value) throw(ParameterValueException);
+  bool isSet() const
+  { return value.isSet(); }
+
+  const Validator<T> & getValidator() const
+  { return value.getValidator(); }
+  Validator<T> & getValidator()
+  { return value.getValidator(); }
 
   // comparator
@@ -59 +71 @@
 //private: // TODO...
   Parameter();
+
+private:
+  //!> contained value of this parameter
+  Value<T> value;
 };
 

src/Parameters/ParameterInterface.hpp

@@ -24 +24 @@
  */
 class ParameterInterface :
-  virtual public ValueAsString,
+  public ValueAsString,
   public Clone<ParameterInterface>
 {

src/Parameters/Parameter_impl.hpp

@@ -21 +21 @@
 Parameter<T>::Parameter(const Parameter<T> &instance) :
   ParameterInterface(instance.getName()),
-  Value<T>(instance.getValidator())
-{
-  Value<T>::set(instance.Value<T>::get());
+  value(instance.value.getValidator())
+{
+  value.set(instance.value.get());
 }
 
@@ -32 +32 @@
 Parameter<T>::Parameter() :
   ParameterInterface("__no_name__"),
-  Value<T>()
+  value()
 {};
 
@@ -41 +41 @@
 Parameter<T>::Parameter(const std::string &_name) :
   ParameterInterface(_name),
-  Value<T>()
+  value()
 {};
 
@@ -52 +52 @@
 Parameter<T>::Parameter(const std::string &_name, const T &_value) :
   ParameterInterface(_name),
-  Value<T>()
-{
-  Value<T>::set(_value);
+  value()
+{
+  value.set(_value);
 };
 
@@ -65 +65 @@
 Parameter<T>::Parameter(const std::string &_name, const Validator<T> &_Validator) :
   ParameterInterface(_name),
-  Value<T>(_Validator)
+  value(_Validator)
 {};
 
@@ -77 +77 @@
 Parameter<T>::Parameter(const std::string &_name, const Validator<T> &_Validator, const T &_value) :
   ParameterInterface(_name),
-  Value<T>(_Validator)
-{
-  Value<T>::set(_value);
+  value(_Validator)
+{
+  value.set(_value);
 };
 
@@ -90 +90 @@
 Parameter<T>::Parameter(const std::string &_name, const std::vector<T> &_ValidValues) :
   ParameterInterface(_name),
-  Value<T>(_ValidValues)
+  value(_ValidValues)
 {};
 
@@ -102 +102 @@
 Parameter<T>::Parameter(const std::string &_name, const std::vector<T> &_ValidValues, const T &_value) :
   ParameterInterface(_name),
-  Value<T>(_ValidValues)
-{
-  Value<T>::set(_value);
+  value(_ValidValues)
+{
+  value.set(_value);
 };
 
@@ -115 +115 @@
 Parameter<T>::Parameter(const std::string &_name, const range<T> &_ValidRange) :
   ParameterInterface(_name),
-  Value<T>(_ValidRange)
+  value(_ValidRange)
 {};
 
@@ -127 +127 @@
 Parameter<T>::Parameter(const std::string &_name, const range<T> &_ValidRange, const T &_value) :
   ParameterInterface(_name),
-  Value<T>(_ValidRange)
-{
-  Value<T>::set(_value);
+  value(_ValidRange)
+{
+  value.set(_value);
 };
 
@@ -139 +139 @@
 {};
 
-/** Catch call to Value<T>::getAsString() to add exception information.
+/** Catch call to value.isValidAsString() to add exception information.
+ *
+ * @param _value value to set to
+ */
+template<typename T>
+inline
+bool Parameter<T>::isValidAsString(const std::string &_value) const throw(ParameterValidatorException)
+{
+  try {
+    return value.isValidAsString(_value);
+  } catch(ParameterException &e) {
+    e << ParameterName(ParameterInterface::getName());
+    throw;
+  }
+}
+
+
+/** Catch call to value.getAsString() to add exception information.
  *
  * @return parameter value as string
@@ -147 +164 @@
 {
   try {
-    return Value<T>::getAsString();
-  } catch(ParameterException &e) {
-    e << ParameterName(ParameterInterface::getName());
-    throw;
-  }
-}
-
-/** Catch call to Value<T>::get() to add exception information.
+    return value.getAsString();
+  } catch(ParameterException &e) {
+    e << ParameterName(ParameterInterface::getName());
+    throw;
+  }
+}
+
+/** Catch call to value.isValid() to add exception information.
  *
  * @return parameter value as string
  */
 template<typename T>
+inline bool Parameter<T>::isValid(const T &_value) const throw(ParameterValidatorException)
+{
+  try {
+    return value.isValid(_value);
+  } catch(ParameterException &e) {
+    e << ParameterName(ParameterInterface::getName());
+    throw;
+  }
+}
+
+
+/** Catch call to value.get() to add exception information.
+ *
+ * @return parameter value as string
+ */
+template<typename T>
 inline const T & Parameter<T>::get() const throw(ParameterValueException)
 {
   try {
-    return Value<T>::get();
-  } catch(ParameterException &e) {
-    e << ParameterName(ParameterInterface::getName());
-    throw;
-  }
-}
-
-/** Catch call to Value<T>::set() to add exception information.
+    return value.get();
+  } catch(ParameterException &e) {
+    e << ParameterName(ParameterInterface::getName());
+    throw;
+  }
+}
+
+/** Catch call to value.set() to add exception information.
  *
  * @param _value value to set to
@@ -177 +210 @@
 {
   try {
-    Value<T>::set(_value);
-  } catch(ParameterException &e) {
-    e << ParameterName(ParameterInterface::getName());
-    throw;
-  }
-}
-
-/** Catch call to Value<T>::set() to add exception information.
+    value.set(_value);
+  } catch(ParameterException &e) {
+    e << ParameterName(ParameterInterface::getName());
+    throw;
+  }
+}
+
+/** Catch call to value.set() to add exception information.
  *
  * @param _value value to set to
@@ -192 +225 @@
 {
   try {
-    Value<T>::setAsString(_value);
+    value.setAsString(_value);
   } catch(ParameterException &e) {
     e << ParameterName(ParameterInterface::getName());
@@ -210 +243 @@
   try {
     status = status &&
-        (*dynamic_cast<const Value<T> *>(this) == dynamic_cast<const Value<T> &>(_instance));
+        (value == _instance.value);
     status = status && (ParameterInterface::getName() == _instance.ParameterInterface::getName());
   } catch(ParameterException &e) {
@@ -226 +259 @@
 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());
+  Parameter<T> *instance = new Parameter<T>(ParameterInterface::getName(), value.getValidator());
+  if (value.ValueSet)
+    instance->set(value.get());
   return instance;
 }

src/Parameters/Value.hpp

@@ -59 +59 @@
 template <class T>
 class Value :
-  virtual public ValueAsString,
+  public ValueAsString,
   public ValueInterface<T>
 {