Changeset 7630e3

Timestamp:

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

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

cb6357

Parents:

ddceb1

git-author:

Frederik Heber <heber@…> (03/31/17 20:56:50)

git-committer:

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

Message:

Moved toPythonString() from Action::outputAsPython() to Parameter::getAsStringUnvalidated().

• This allows to have a special "getAsStringUnvalidated" for outputAsPython for type Vector in Parameter/Value, while all other types retain the same outout.
• TESTFIX: Regression tests Options/Session used different Vector spellings in pre and post complextest.py.

Files:

• src/Actions/Action_impl_pre.hpp (modified) (1 diff)
• src/Actions/MakroAction_impl_pre.hpp (modified) (1 diff)
• src/Parameters/Value_impl.hpp (modified) (2 diffs)
• tests/regression/Options/Session/post/complextest.py (modified) (1 diff)
• tests/regression/Options/Session/pre/complextest.py (modified) (1 diff)

src/Actions/Action_impl_pre.hpp

@@ -173 +173 @@
     output << \
     BOOST_PP_IF(n, ", ", "") \
-    << "\"" << toPythonString(params. \
+    << "\"" << params. \
         BOOST_PP_SEQ_ELEM(n, paramreferences) \
-        .getAsStringUnvalidated()) \
+        .getAsStringUnvalidated() \
     << "\"";
 

src/Actions/MakroAction_impl_pre.hpp

@@ -165 +165 @@
     output << \
     BOOST_PP_IF(n, ", ", "") \
-    << "\"" << toPythonString(params. \
+    << "\"" << params. \
         BOOST_PP_SEQ_ELEM(n, paramreferences) \
-        .get()) \
+        .getAsStringUnvalidated() \
     << "\"";
 

src/Parameters/Value_impl.hpp

@@ -22 +22 @@
 #include "CodePatterns/Log.hpp"
 
+#include "Actions/toPythonString.hpp"
 #include "Validators/DummyValidator.hpp"
 #include "Validators/DiscreteValidator.hpp"
@@ -193 +194 @@
 inline const std::string Value<T>::getAsStringUnvalidated() const throw(ParameterValueException)
 {
-  return toString(getUnvalidated());
+  return toPythonString(getUnvalidated());
 }
 

tests/regression/Options/Session/post/complextest.py

@@ -9 +9 @@
 pyMoleCuilder.GraphSubgraphDissection()
 pyMoleCuilder.SelectionMoleculeOfAtom()
-pyMoleCuilder.FillRegularGrid("3 3 3", "0.5,0.5,0.5", "1", "0", "0", "0", "0")
+pyMoleCuilder.FillRegularGrid("3 3 3", ".5,.5,.5", "1", "0", "0", "0", "0")
 pyMoleCuilder.CommandVersion()
 # =========================== Stored Session END ===========================

tests/regression/Options/Session/pre/complextest.py

@@ -9 +9 @@
 pyMoleCuilder.GraphSubgraphDissection()
 pyMoleCuilder.SelectionMoleculeOfAtom()
-pyMoleCuilder.FillRegularGrid("3 3 3", "0.5,0.5,0.5", "1", "0", "0", "0", "0")
+pyMoleCuilder.FillRegularGrid("3 3 3", ".5,.5,.5", "1", "0", "0", "0", "0")
 pyMoleCuilder.CommandVersion()
 # =========================== Stored Session END ===========================