Changeset 8d56a6 for src/Actions

Timestamp:

Jun 21, 2018, 8:31:25 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.6.1, ChemicalSpaceEvaluator

Children:

d83d64, f5ea10

Parents:

3e334e (diff), 4fc0ea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'TremoloParser_IncreasedPrecision' into Candidate_v1.6.1

Conflicts:

tests/Python/ForceAnnealing/post/five_carbon_test_bondgraph.data
tests/Python/ForceAnnealing/post/five_carbon_test_no-bondgraph.data

Location:

src/Actions

Files:

• Action.hpp (modified) (2 diffs)
• Action_impl_pre.hpp (modified) (1 diff)
• Action_impl_python.hpp (modified) (2 diffs)
• MakroAction_impl_pre.hpp (modified) (1 diff)

src/Actions/Action.hpp

@@ -14 +14 @@
 #endif
 
+#include <algorithm>
 #include <iosfwd>
 #include <string>
@@ -24 +25 @@
  */
 #define NOPARAM_DEFAULT BOOST_PP_NIL
+
+namespace MoleCuilder {
+  //!> helps normalizing Action's tokens for use as Python parameter names
+#ifdef HAVE_INLINE
+  inline
+#endif
+  std::string normalizeToken(std::string _token) {
+    std::replace(_token.begin(), _token.end(), '-', '_');
+    return _token;
+  }
+} /* namespace MoleCuilder */
 
 /** Nicely visible short-hand for push a status message

src/Actions/Action_impl_pre.hpp

@@ -173 +173 @@
     output << \
     BOOST_PP_IF(n, ", ", "") \
+    << normalizeToken( BOOST_PP_SEQ_ELEM(n, paramtokens) ) \
+    << "=" \
     << "\"" << params. \
         BOOST_PP_SEQ_ELEM(n, paramreferences) \
-        .getAsStringUnvalidated() \
-    << "\"";
+          .getAsStringUnvalidated() \
+    << "\""; \
 
 // print an initialiser list, i.e. "var( token, valid (,default) )(,)"

src/Actions/Action_impl_python.hpp

@@ -77 +77 @@
   BOOST_PP_COMMA_IF(n) \
   boost::python::arg( \
-  BOOST_PP_SEQ_ELEM(n, STRINGLIST) \
+                  MoleCuilder::normalizeToken( BOOST_PP_SEQ_ELEM(n, STRINGLIST) ).c_str() \
   ) \
   = \
@@ -92 +92 @@
   BOOST_PP_COMMA_IF(n) \
   boost::python::arg( \
-  BOOST_PP_SEQ_ELEM(n, STRINGLIST) \
+                  MoleCuilder::normalizeToken( BOOST_PP_SEQ_ELEM(n, STRINGLIST) ).c_str() \
   )
 

src/Actions/MakroAction_impl_pre.hpp

@@ -165 +165 @@
     output << \
     BOOST_PP_IF(n, ", ", "") \
+          << normalizeToken( BOOST_PP_SEQ_ELEM(n, paramtokens) ) \
+          << "=" \
     << "\"" << params. \
         BOOST_PP_SEQ_ELEM(n, paramreferences) \