Changeset 118f1e for src/Parser/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/Parser/Parameters

Files:

• ContinuousParameter.hpp (deleted)
• ContinuousParameter_impl.hpp (deleted)
• ContinuousValue.hpp (deleted)
• ContinuousValue_impl.hpp (deleted)
• DiscreteParameter.hpp (deleted)
• DiscreteParameter_impl.hpp (deleted)
• DiscreteValue.hpp (deleted)
• DiscreteValue_impl.hpp (deleted)
• Parameter.hpp (deleted)
• ParameterStorage.cpp (modified) (2 diffs)
• ParameterStorage.hpp (modified) (2 diffs)
• StringParameter.cpp (deleted)
• StringParameter.hpp (deleted)
• ValueInterface.hpp (deleted)
• unittests/ContinuousParameterUnitTest.cpp (deleted)
• unittests/ContinuousParameterUnitTest.hpp (deleted)
• unittests/ContinuousValueUnitTest.cpp (deleted)
• unittests/ContinuousValueUnitTest.hpp (deleted)
• unittests/DiscreteParameterUnitTest.cpp (deleted)
• unittests/DiscreteParameterUnitTest.hpp (deleted)
• unittests/DiscreteValueUnitTest.cpp (deleted)
• unittests/DiscreteValueUnitTest.hpp (deleted)
• unittests/Makefile.am (modified) (4 diffs)
• unittests/ParameterStorageUnitTest.cpp (modified) (2 diffs)
• unittests/StringParameterUnitTest.cpp (modified) (4 diffs)

src/Parser/Parameters/ParameterStorage.cpp

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

src/Parser/Parameters/ParameterStorage.hpp

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

src/Parser/Parameters/unittests/Makefile.am

@@ -4 +4 @@
 
 PARSERPARAMETERSTESTSSOURCES = \
-        ../Parser/Parameters/unittests/ContinuousValueUnitTest.cpp \
-        ../Parser/Parameters/unittests/ContinuousParameterUnitTest.cpp \
-        ../Parser/Parameters/unittests/DiscreteValueUnitTest.cpp \
-        ../Parser/Parameters/unittests/DiscreteParameterUnitTest.cpp \
         ../Parser/Parameters/unittests/ParameterStorageUnitTest.cpp \
         ../Parser/Parameters/unittests/StringParameterUnitTest.cpp
 
 PARSERPARAMETERSTESTSHEADERS = \
-        ../Parser/Parameters/unittests/ContinuousValueUnitTest.hpp \
-        ../Parser/Parameters/unittests/ContinuousParameterUnitTest.hpp \
-        ../Parser/Parameters/unittests/DiscreteValueUnitTest.hpp \
-        ../Parser/Parameters/unittests/DiscreteParameterUnitTest.hpp \
         ../Parser/Parameters/unittests/ParameterStorageUnitTest.hpp \
         ../Parser/Parameters/unittests/StringParameterUnitTest.hpp
 
 PARSERPARAMETERSTESTS = \
-        ContinuousValueUnitTest \
-        ContinuousParameterUnitTest \
-        DiscreteValueUnitTest \
-        DiscreteParameterUnitTest \
         ParameterStorageUnitTest \
         StringParameterUnitTest
@@ -34 +22 @@
 
 
-ContinuousValueUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ../Parser/Parameters/unittests/ContinuousValueUnitTest.cpp \
-        ../Parser/Parameters/unittests/ContinuousValueUnitTest.hpp \
-        ../Parser/Parameters/ContinuousValue.hpp \
-        ../Parser/Parameters/ContinuousValue_impl.hpp \
-        ../Parser/Parameters/ValueInterface.hpp
-ContinuousValueUnitTest_LDADD = \
-        $(PARSERPARAMETERSLIBS)
- 
-ContinuousParameterUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ../Parser/Parameters/unittests/ContinuousParameterUnitTest.cpp \
-        ../Parser/Parameters/unittests/ContinuousParameterUnitTest.hpp \
-        ../Parser/Parameters/ContinuousValue.hpp \
-        ../Parser/Parameters/ContinuousValue_impl.hpp \
-        ../Parser/Parameters/ContinuousParameter.hpp \
-        ../Parser/Parameters/ContinuousParameter_impl.hpp \
-        ../Parser/Parameters/Parameter.hpp \
-        ../Parser/Parameters/ValueInterface.hpp
-ContinuousParameterUnitTest_LDADD = \
-        $(PARSERPARAMETERSLIBS)
- 
-DiscreteValueUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ../Parser/Parameters/unittests/DiscreteValueUnitTest.cpp \
-        ../Parser/Parameters/unittests/DiscreteValueUnitTest.hpp \
-        ../Parser/Parameters/DiscreteValue.hpp \
-        ../Parser/Parameters/DiscreteValue_impl.hpp \
-        ../Parser/Parameters/ValueInterface.hpp
-DiscreteValueUnitTest_LDADD = \
-        $(PARSERPARAMETERSLIBS)
-
-DiscreteParameterUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ../Parser/Parameters/unittests/DiscreteParameterUnitTest.cpp \
-        ../Parser/Parameters/unittests/DiscreteParameterUnitTest.hpp \
-        ../Parser/Parameters/DiscreteValue.hpp \
-        ../Parser/Parameters/DiscreteValue_impl.hpp \
-        ../Parser/Parameters/DiscreteParameter.hpp \
-        ../Parser/Parameters/DiscreteParameter_impl.hpp \
-        ../Parser/Parameters/Parameter.hpp \
-        ../Parser/Parameters/ValueInterface.hpp
-DiscreteParameterUnitTest_LDADD = \
-        $(PARSERPARAMETERSLIBS)
-
 ParameterStorageUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ../Parser/Parameters/unittests/ParameterStorageUnitTest.cpp \
@@ -81 +27 @@
         ../Parser/Parameters/ParameterStorage.cpp \
         ../Parser/Parameters/ParameterStorage.hpp \
-        ../Parser/Parameters/ContinuousValue.hpp \
-        ../Parser/Parameters/ContinuousValue_impl.hpp \
-        ../Parser/Parameters/DiscreteValue.hpp \
-        ../Parser/Parameters/DiscreteValue_impl.hpp \
-        ../Parser/Parameters/ValueInterface.hpp
+        ../Parameters/Parameter.hpp \
+        ../Parameters/Validators/DummyValidator.hpp \
+        ../Parameters/Validators/RangeValidator.hpp \
+        ../Parameters/Validators/RangeValidator_impl.hpp \
+        ../Parameters/Validators/Validator.hpp \
+        ../Parameters/Value.hpp \
+        ../Parameters/Value_impl.hpp \
+        ../Parameters/ValueInterface.hpp \
 ParameterStorageUnitTest_LDADD = \
-        $(CodePatterns_LIBS) \
         $(PARSERPARAMETERSLIBS)
 
@@ -93 +41 @@
         ../Parser/Parameters/unittests/StringParameterUnitTest.cpp \
         ../Parser/Parameters/unittests/StringParameterUnitTest.hpp \
-        ../Parser/Parameters/StringParameter.cpp \
-        ../Parser/Parameters/StringParameter.hpp \
-        ../Parser/Parameters/Parameter.hpp \
-        ../Parser/Parameters/ValueInterface.hpp
+        ../Parameters/Validators/DiscreteValidator.hpp \
+        ../Parameters/Validators/DiscreteValidator_impl.hpp \
+        ../Parameters/Validators/DummyValidator.hpp \
+        ../Parameters/Validators/RangeValidator.hpp \
+        ../Parameters/Validators/RangeValidator_impl.hpp \
+        ../Parameters/Validators/Validator.hpp \
+        ../Parameters/Value.hpp \
+        ../Parameters/Value_impl.hpp \
+        ../Parameters/ValueInterface.hpp \
+        ../Parameters/VectorFromString.hpp
 StringParameterUnitTest_LDADD = \
         $(PARSERPARAMETERSLIBS)

src/Parser/Parameters/unittests/ParameterStorageUnitTest.cpp

@@ -27 +27 @@
 
 #include "Parser/Parameters/ParameterStorage.hpp"
-#include "Parser/Parameters/ContinuousParameter.hpp"
-#include "Parser/Parameters/DiscreteParameter.hpp"
+#include "Parameters/Parameter.hpp"
 
 #ifdef HAVE_TESTRUNNER
@@ -53 +52 @@
     ValidValues.push_back(i);
   range<double> ValidRange(1., 4.);
-  ParserParameter *intParam = new DiscreteParameter<int>("intParam", ValidValues);
-  ParserParameter *doubleParam = new ContinuousParameter<double>("doubleParam", ValidRange);
+  ParameterAsString *intParam = new Parameter<int>("intParam", ValidValues);
+  ParameterAsString *doubleParam = new Parameter<double>("doubleParam", ValidRange);
   // note: delete is done by registry in tearDown ...
 

src/Parser/Parameters/unittests/StringParameterUnitTest.cpp

@@ -24 +24 @@
 #include <cppunit/ui/text/TestRunner.h>
 
-#include "Parser/Parameters/StringParameter.hpp"
+#include "Parameters/Parameter.hpp"
 
 #include "CodePatterns/Assert.hpp"
@@ -54 +54 @@
 {
   // create instance
-  StringParameter test("stringParam");
-  StringParameter samenamedsamevalued("stringParam");
-  StringParameter samenamedelsevalued("stringParam");
-  StringParameter elsenamedsamevalued("string2Param");
-  StringParameter elsenamedelsevalued("string2Param");
+  Parameter<std::string> test("stringParam");
+  Parameter<std::string> samenamedsamevalued("stringParam");
+  Parameter<std::string> samenamedelsevalued("stringParam");
+  Parameter<std::string> elsenamedsamevalued("string2Param");
+  Parameter<std::string> elsenamedelsevalued("string2Param");
   test.set(std::string("1"));
   samenamedsamevalued.set(std::string("1"));
@@ -77 +77 @@
 {
   // create instance
-  StringParameter test("intParam");
-
-  // check that we throw because of unset parameter
-#ifndef NDEBUG
-  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
-  CPPUNIT_ASSERT_THROW(test.clone(), Assert::AssertionFailure);
-#endif
+  Parameter<std::string> test("intParam");
 
   // set parameter
@@ -90 +84 @@
   // is returned as Parameter but we can compare only in true class as
   // Parameter may also be a DiscreteParameter where comparison is nonsense
-  StringParameter *instance = dynamic_cast< StringParameter *> (test.clone());
+  Parameter<std::string> *instance = dynamic_cast< Parameter<std::string> *> (test.clone());
 
   // different places in memory