Changeset 6d78b6f for src/Parameters

Timestamp:

Jun 19, 2017, 8:24:16 AM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChangeBugEmailaddress, ChemicalSpaceEvaluator, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_Verbose_Codepatterns, ForceAnnealing_oldresults, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps

Children:

2eded3e

Parents:

db1048

git-author:

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

git-committer:

Frederik Heber <frederik.heber@…> (06/19/17 08:24:16)

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.
• TESTFIX: Removed XFAIL from dryrun store-session test, is working.

Location:

src/Parameters

Files:

• Parameter.hpp (modified) (1 diff)
• Parameter_impl.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/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

@@ -185 +185 @@
 {
   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 toPythonString(getUnvalidated());
 }