Changeset 6440c6 for src/Parser

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/Parser

Files:

• FormatParser_Parameters.cpp (modified) (4 diffs)
• FormatParser_Parameters.hpp (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• Parameters/ParameterStorage.cpp (modified) (2 diffs)
• Parameters/ParameterStorage.hpp (modified) (2 diffs)
• Parameters/unittests/ParameterStorageUnitTest.cpp (modified) (1 diff)

src/Parser/FormatParser_Parameters.cpp

@@ -44 +44 @@
 #include "CodePatterns/Log.hpp"
 
-#include "Parameters/ParameterAsString.hpp"
+#include "Parameters/ParameterInterface.hpp"
 #include "FormatParser_Parameters.hpp"
 
@@ -102 +102 @@
  * @param instance parameter to add
  */
-void FormatParser_Parameters::appendParameter(ParameterAsString *instance)
+void FormatParser_Parameters::appendParameter(ParameterInterface *instance)
 {
   storage->registerInstance(instance);
@@ -124 +124 @@
  * @return pointer to instance with this \a _name
  */
-ParameterAsString *FormatParser_Parameters::getParameter(const std::string &_name) const
+ParameterInterface *FormatParser_Parameters::getParameter(const std::string &_name) const
 {
   return storage->getByName(_name);
@@ -202 +202 @@
           +key+"' with value "+valuestream.str()+"!");
       if (params.haveParameter(key)) {
-        ParameterAsString *instance = params.getParameter(key);
+        ParameterInterface *instance = params.getParameter(key);
         instance->setAsString(valuestream.str());
       }

src/Parser/FormatParser_Parameters.hpp

@@ -20 +20 @@
 #include "Parser/Parameters/ParameterStorage.hpp"
 
-class ParameterAsString;
+class ParameterInterface;
 
 /** This class is an interface to the internal parameters of any FormatParser.
@@ -41 +41 @@
 
   // accessing parameters in storage
-  void appendParameter(ParameterAsString *instance);
+  void appendParameter(ParameterInterface *instance);
   bool haveParameter(const std::string &_name) const;
-  ParameterAsString *getParameter(const std::string &_name) const;
+  ParameterInterface *getParameter(const std::string &_name) const;
 
 protected:

src/Parser/Makefile.am

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

src/Parser/Parameters/ParameterStorage.cpp

@@ -52 +52 @@
 {
   for (const_iterator iter = _storage.getBeginIter(); iter != _storage.getEndIter(); ++iter) {
-    ParameterAsString *instance = (iter->second)->clone();
+    ParameterInterface *instance = (iter->second)->clone();
     registerInstance(instance);
   }
@@ -64 +64 @@
 }
 
-CONSTRUCT_REGISTRY(ParameterAsString)
+CONSTRUCT_REGISTRY(ParameterInterface)

src/Parser/Parameters/ParameterStorage.hpp

@@ -16 +16 @@
 #include "CodePatterns/Registry.hpp"
 
-#include "Parameters/ParameterAsString.hpp"
+#include "Parameters/ParameterInterface.hpp"
 
 /** Parameter Registry.
@@ -23 +23 @@
  *
  */
-class ParameterStorage : public Registry<ParameterAsString>
+class ParameterStorage : public Registry<ParameterInterface>
 {
 public:

src/Parser/Parameters/unittests/ParameterStorageUnitTest.cpp

@@ -67 +67 @@
     ValidValues.push_back(i);
   range<double> ValidRange(1., 4.);
-  ParameterAsString *intParam = new Parameter<int>("intParam", ValidValues);
-  ParameterAsString *doubleParam = new Parameter<double>("doubleParam", ValidRange);
+  ParameterInterface *intParam = new Parameter<int>("intParam", ValidValues);
+  ParameterInterface *doubleParam = new Parameter<double>("doubleParam", ValidRange);
   // note: delete is done by registry in tearDown ...