Changeset 118f1e for src/Parameters

Timestamp:

Jun 6, 2012, 1:04:21 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:

b9c69d

Parents:

6c05d8

git-author:

Michael Ankele <ankele@…> (04/18/12 12:56:29)

git-committer:

Michael Ankele <ankele@…> (06/06/12 13:04:21)

Message:

ParameterStorage now uses ParameterAsString class

Location:

src/Parameters

Files:

• Parameter.hpp (modified) (1 diff)
• ParameterAsString.hpp (modified) (3 diffs)
• ParameterInterface.hpp (modified) (3 diffs)
• Parameter_impl.hpp (modified) (1 diff)
• Validators/RangeValidator_impl.hpp (modified) (1 diff)
• VectorFromString.hpp (modified) (1 diff)

src/Parameters/Parameter.hpp

@@ -43 +43 @@
       { return !((*this)==(_instance)); }
 
-  ParameterInterface<T>* clone() const;
+  ParameterAsString* clone() const;
 
 private:

src/Parameters/ParameterAsString.hpp

@@ -17 +17 @@
 #include <string>
 
+#include "CodePatterns/Clone.hpp"
+
 #include "ValueAsString.hpp"
 
@@ -22 +24 @@
  *
  */
-class ParameterAsString : virtual public ValueAsString
+class ParameterAsString : virtual public ValueAsString, public Clone<ParameterAsString>
 {
 public:
@@ -28 +30 @@
 
   virtual const std::string &getName() const=0;
+
+  virtual ParameterAsString* clone() const=0;
 };
 

src/Parameters/ParameterInterface.hpp

@@ -16 +16 @@
 #include <string>
 
-#include "CodePatterns/Clone.hpp"
-
 #include "Parameters/ValueInterface.hpp"
 #include "Parameters/ParameterAsString.hpp"
@@ -26 +24 @@
  */
 template <class T>
-class ParameterInterface : virtual public ParameterAsString, virtual public ValueInterface<T>, public Clone<ParameterInterface<T> >
+class ParameterInterface : virtual public ParameterAsString, virtual public ValueInterface<T>
 {
 public:
@@ -33 +31 @@
 
   const std::string &getName() const { return name; }
-
-  virtual ParameterInterface* clone() const=0;
 
 private:

src/Parameters/Parameter_impl.hpp

@@ -140 +140 @@
  */
 template<typename T>
-ParameterInterface<T>* Parameter<T>::clone() const
+ParameterAsString* Parameter<T>::clone() const
 {
   Parameter<T> *instance = new Parameter<T>(ParameterInterface<T>::getName(), Value<T>::getValidator());

src/Parameters/Validators/RangeValidator_impl.hpp

@@ -71 +71 @@
 
 template <>
-bool RangeValidator<Vector>::isValid(const Vector & _value) const
+inline bool RangeValidator<Vector>::isValid(const Vector & _value) const
 {
   return ValidRange.first[0] <= _value[0] && _value[0] < ValidRange.last[0] &&

src/Parameters/VectorFromString.hpp

@@ -26 +26 @@
 class Vector;
 
-std::istream& operator>>(std::istream& ist, const Vector& m)
+inline std::istream& operator>>(std::istream& ist, const Vector& m)
 {
   ASSERT(0, "TODO:  implement istream >> Vector !!!");