Changeset ddceb1 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:

7630e3

Parents:

ac3a04

git-author:

Frederik Heber <heber@…> (03/31/17 19:18:12)

git-committer:

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

Message:

Action::outputAsPython() access Parameters via getAsStringUnvalidated().

• otherwise this would not work for Geometry Actions as these cannot yet be validated on e.g. dry-run.
• as python commands operate via string arguments anyway, this is nothing but an additional transformation.

Location:

src/Parameters

Files:

• Parameter.hpp (modified) (1 diff)
• Parameter_impl.hpp (modified) (1 diff)
• Specifics/Value_vector.cpp (modified) (1 diff)
• Specifics/Value_vector.hpp (modified) (1 diff)
• Value.hpp (modified) (1 diff)
• Value_impl.hpp (modified) (1 diff)

src/Parameters/Parameter.hpp

@@ -48 +48 @@
   bool isValidAsString(const std::string &_value) const throw(ParameterValidatorException);
   const std::string getAsString() const throw(ParameterValueException);
+  const std::string getAsStringUnvalidated() const throw(ParameterValueException);
   void setAsString(const std::string &_value) throw(ParameterValueException);
 

src/Parameters/Parameter_impl.hpp

@@ -165 +165 @@
   try {
     return value.getAsString();
+  } catch(ParameterException &e) {
+    e << ParameterName(ParameterInterface::getName());
+    throw;
+  }
+}
+
+/** Catch call to value.getAsStringUnvalidated() to add exception information.
+ *
+ * @return parameter value as string
+ */
+template<typename T>
+inline const std::string Parameter<T>::getAsStringUnvalidated() const throw(ParameterValueException)
+{
+  try {
+    return value.getAsStringUnvalidated();
   } catch(ParameterException &e) {
     e << ParameterName(ParameterInterface::getName());

src/Parameters/Specifics/Value_vector.cpp

@@ -190 +190 @@
 const std::string Value<Vector>::getAsString() const throw(ParameterValueException)
 {
+  converted_value = parseAsVector(value);
+  if (!ValueSet) throw ParameterValueException();
+  if (!isValid(converted_value)) throw ParameterValueException();
   return value;
 }
 
+const std::string Value<Vector>::getAsStringUnvalidated() const throw(ParameterValueException)
+{
+  if (!ValueSet) throw ParameterValueException();
+  return value;
+}
 
 void Value<Vector>::setAsString(const std::string &_value) throw(ParameterException)

src/Parameters/Specifics/Value_vector.hpp

@@ -53 +53 @@
   bool isValidAsString(const std::string &_value) const throw(ParameterValidatorException);
   const std::string getAsString() const throw(ParameterValueException);
+  const std::string getAsStringUnvalidated() const throw(ParameterValueException);
   void setAsString(const std::string &_value) throw(ParameterException);
 

src/Parameters/Value.hpp

@@ -85 +85 @@
   bool isValidAsString(const std::string &_value) const throw(ParameterValidatorException);
   const std::string getAsString() const throw(ParameterValueException);
+  const std::string getAsStringUnvalidated() const throw(ParameterValueException);
   void setAsString(const std::string &_value) throw(ParameterException);
 

src/Parameters/Value_impl.hpp

@@ -184 +184 @@
 {
   return toString(get());
+}
+
+/** Getter of unvalidated value, returning string.
+ *
+ * @return string value
+ */
+template <class T>
+inline const std::string Value<T>::getAsStringUnvalidated() const throw(ParameterValueException)
+{
+  return toString(getUnvalidated());
 }