Changeset a443e1 for src/Parameters

Timestamp:

May 8, 2017, 1:54:50 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

cb5231

Parents:

cb4037

git-author:

Frederik Heber <heber@…> (03/29/17 10:19:35)

git-committer:

Frederik Heber <frederik.heber@…> (05/08/17 13:54:50)

Message:

Added specific Value and Parameter implemenations for Vector.

• for the CommandLineParser the values are get parsed immediately (prior to executing any Action). Hence, names of geometry objects that first need to be created by an action cannot yet be present in the registry and thus the Action will fail.
• we need to postpone the replacement of the geometry name by its stored vector components until the Parameter<>::get() call. This is possible as the value is validated only on get(), not on set(), i.e. giving illegal values is ok, only the Action will fail.
• therefore, we override the specialize the template Value for Vector to allow storing of a string instead of a Vector and to allow putting the actual parsing of the string in front.
• the Parameter overriding becomes necessary in order to override clone() and copy cstor(), there using string setters.
• ContinuousValueTest now needs lib..Parameters, lib..Geometry.
• static functions parseAsVector and setFromVector for convenience, e.g. QtUI needs to convert from string and to Vector.

Location:

src/Parameters

Files:

• Makefile.am (modified) (4 diffs)
• Parameter.hpp (modified) (2 diffs)
• Specifics/Parameter_vector.cpp (added)
• Specifics/Parameter_vector.hpp (added)
• Specifics/Value_vector.cpp (added)
• Specifics/Value_vector.hpp (added)
• Value.hpp (modified) (1 diff)
• unittests/Makefile.am (modified) (1 diff)

src/Parameters/Makefile.am

@@ -4 +4 @@
 
 PARAMETERSOURCE = \
+        Parameters/Specifics/Parameter_vector.cpp \
         Parameters/Specifics/Value_atom.cpp \
         Parameters/Specifics/Value_element.cpp \
@@ -9 +10 @@
         Parameters/Specifics/Value_molecule.cpp \
         Parameters/Specifics/Value_string.cpp \
+        Parameters/Specifics/Value_vector.cpp \
         Parameters/Validators/Specific/ActionNameValidator.cpp \
         Parameters/Validators/Specific/AtomDataValidator.cpp \
@@ -47 +49 @@
         Parameters/ValueInterface.hpp \
         Parameters/Specifics/KeyValuePair.hpp \
+        Parameters/Specifics/Parameter_vector.hpp \
         Parameters/Specifics/Value_atom.hpp \
         Parameters/Specifics/Value_element.hpp \
@@ -52 +55 @@
         Parameters/Specifics/Value_molecule.hpp \
         Parameters/Specifics/Value_string.hpp \
+        Parameters/Specifics/Value_vector.hpp \
         Parameters/Validators/DiscreteValidator.hpp \
         Parameters/Validators/DiscreteValidator_impl.hpp \

src/Parameters/Parameter.hpp

@@ -25 +25 @@
 class ParameterValueException;
 
-/** This class encapsulates a clonable, continuous value.
+/** This class encapsulates a cloneable, continuous value.
  *
  */
@@ -78 +78 @@
 };
 
+#include "Parameters/Specifics/Parameter_vector.hpp"
+
 #include "Parameter_impl.hpp"
 

src/Parameters/Value.hpp

@@ -123 +123 @@
 #include "Specifics/Value_molecule.hpp"
 #include "Specifics/Value_string.hpp"
+#include "Specifics/Value_vector.hpp"
 
 #include "Value_impl.hpp"

src/Parameters/unittests/Makefile.am

@@ -47 +47 @@
         ../Parameters/ValueInterface.hpp
 ContinuousValueTest_LDADD = \
+        ../libMolecuilderParameters.la \
+        ../libMolecuilderGeometry.la \
         $(PARAMETERSLIBS)