Changeset 2665d3

Timestamp:

Feb 13, 2013, 3:47:45 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:

9e6722

Parents:

574a4f

git-author:

Frederik Heber <heber@…> (01/10/13 13:26:25)

git-committer:

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

Message:

String specializations of Value placed into own module.

Location:

src

Files:

• Parameters/Makefile.am (modified) (2 diffs)
• Parameters/Value.hpp (modified) (1 diff)
• Parameters/Value_impl.hpp (modified) (2 diffs)
• Parameters/Value_string.cpp (added)
• Parameters/Value_string.hpp (added)
• Parser/Parameters/unittests/Makefile.am (modified) (1 diff)

src/Parameters/Makefile.am

@@ -25 +25 @@
         Parameters/Validators/Specific/VectorNotZeroValidator.cpp \
         Parameters/Validators/Specific/VectorPositiveComponentsValidator.cpp \
-        Parameters/Validators/Specific/VectorZeroOneComponentsValidator.cpp
+        Parameters/Validators/Specific/VectorZeroOneComponentsValidator.cpp \
+        Parameters/Value_string.cpp
 
 PARAMETERHEADER = \
@@ -72 +73 @@
         Parameters/Value.hpp \
         Parameters/Value_impl.hpp \
+        Parameters/Value_string.hpp \
         Parameters/ValueAsString.hpp \
         Parameters/ValueInterface.hpp

src/Parameters/Value.hpp

@@ -114 +114 @@
 #include "Value_impl.hpp"
 
+#include "Value_string.hpp"
 
 #endif /* VALUE_HPP_ */

src/Parameters/Value_impl.hpp

@@ -161 +161 @@
 }
 
-template <>
-inline bool Value<std::string>::isValidAsString(const std::string _value) const throw(ParameterValidatorException)
-{
-  return isValid(_value);
-}
-
 /** Getter of value, returning string.
  *
@@ -188 +182 @@
 //  LOG(0, "Converted value reads " << castvalue <<".");
   set(castvalue);
-//  LOG(0, "STATUS: Value is now set to " << value << ".");
-}
-
-template <>
-inline void Value<std::string>::setAsString(const std::string _value) throw(ParameterException)
-{
-  set(_value);
 //  LOG(0, "STATUS: Value is now set to " << value << ".");
 }

src/Parser/Parameters/unittests/Makefile.am

@@ -53 +53 @@
         ../Parameters/Value.hpp \
         ../Parameters/Value_impl.hpp \
+        ../Parameters/Value_String.hpp \
         ../Parameters/ValueInterface.hpp
 StringParameterUnitTest_LDADD = \
+        ../libMolecuilderParameters.la \
         $(PARSERPARAMETERSLIBS)