Changeset 73faf4 for src/Actions/Values.cpp

Timestamp:

May 8, 2017, 2:00:47 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

c8165c

Parents:

ce254c (diff), cb6357 (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 'GeometryObjects' into Candidate_v1.6.1

File:

• src/Actions/Values.cpp (modified) (3 diffs)

src/Actions/Values.cpp

@@ -37 +37 @@
 #include "CodePatterns/Assert.hpp"
 
+#include <boost/lexical_cast.hpp>
+#include <boost/tokenizer.hpp>
+
 #include "Box.hpp"
 #include "LinearAlgebra/BoxVector.hpp"
@@ -44 +47 @@
 #include "Values.hpp"
 
+static const Vector parseAsVector(const std::string &_string)
+{
+  Vector temp;
+  // dissect by ","
+  typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+  boost::char_separator<char> value_separator(",)(");
+
+  bool status = true;
+  tokenizer tokens(_string, value_separator);
+  if (!_string.empty()) {
+    tokenizer::iterator tok_iter = tokens.begin();
+    for (size_t i=0;i<NDIM;++i) {
+      if (tok_iter == tokens.end()) {
+        status = false;
+        break;
+      }
+      temp[i] = boost::lexical_cast<double>(*(tok_iter++));
+    }
+  }
+  if (!status)
+    temp.Zero();
+
+  return temp;
+}
+
 Vector VectorValue::toVector() const
 {
-  Vector returnVector(vector);
+  Vector returnVector = parseAsVector(vectorstring);
 
   return returnVector;
@@ -54 +82 @@
 {
   BoxVector returnVector;
-  static_cast<Vector>(returnVector) = Vector(vector); // under its hood it's still a Vector
+  static_cast<Vector>(returnVector) = parseAsVector(vectorstring); // under its hood it's still a Vector
 
   ASSERT(_box.isValid(returnVector),