Changeset cb5231 for src/UIElements/CommandLineUI/CommandLineParser_validate.cpp

Timestamp:

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

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

d7bd62

Parents:

a443e1

git-author:

Frederik Heber <heber@…> (03/30/17 21:59:00)

git-committer:

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

Message:

Vector(s) are now stored as strings in Querys intermediately.

• they get evaluated first after being stored in a Parameter/Value on request via get().
• Needed to change all Vector(s)..Query's of all UIs and also the general base classes inside Dialog.
• QtQueryList need to be specialized in order to allow a QtQueryList<Vector> to actually store a vector of strings.
• we may use setAsString() in order to set the Parameter thankfully.
• TESTS: All regression tests on Geometry Actions are now working.

File:

• src/UIElements/CommandLineUI/CommandLineParser_validate.cpp (modified) (2 diffs)

src/UIElements/CommandLineUI/CommandLineParser_validate.cpp

@@ -66 +66 @@
         std::string("value"),
         std::string("VectorValue")
+    );
+#endif
+  }
+  VV.vectorstring = values.at(0);
+  v = boost::any(VectorValue(VV));
+}
+
+void validate(boost::any& v, const std::vector<std::string>& values, RealSpaceMatrixValue *, int)
+{
+  RealSpaceMatrixValue RSMV;
+  std::vector<std::string> components;
+
+  // split comma-separated values
+  if (values.size() != 1) {
+    std::cerr <<  "Not one vector but " << values.size() << " given " << std::endl;
+#if BOOST_VERSION < 104200
+    throw boost::program_options::validation_error("Unequal to one vector given");
+#else
+    throw boost::program_options::validation_error(
+        boost::program_options::validation_error::invalid_option_value,
+        std::string("value"),
+        std::string("BoxValue")
     );
 #endif
@@ -83 +105 @@
   components.push_back(std::string(Biter,argument.end()));
 
-  if (components.size() != 3) {
-    std::cerr <<  "Specified vector does not have three components but " << components.size() << std::endl;
-#if BOOST_VERSION < 104200
-    throw boost::program_options::validation_error("Specified vector does not have three components");
-#else
-    throw boost::program_options::validation_error(
-        boost::program_options::validation_error::invalid_option_value,
-        std::string("value"),
-        std::string("VectorValue")
-    );
-#endif
-  }
-  for (size_t i=0;i<NDIM;++i)
-    VV.vector[i] = boost::lexical_cast<double>(components.at(i));
-  v = boost::any(VectorValue(VV));
-}
-
-void validate(boost::any& v, const std::vector<std::string>& values, RealSpaceMatrixValue *, int)
-{
-  RealSpaceMatrixValue RSMV;
-  std::vector<std::string> components;
-
-  // split comma-separated values
-  if (values.size() != 1) {
-    std::cerr <<  "Not one vector but " << values.size() << " given " << std::endl;
-#if BOOST_VERSION < 104200
-    throw boost::program_options::validation_error("Unequal to one vector given");
-#else
-    throw boost::program_options::validation_error(
-        boost::program_options::validation_error::invalid_option_value,
-        std::string("value"),
-        std::string("BoxValue")
-    );
-#endif
-  }
-  std::string argument(values.at(0));
-  std::string::iterator Aiter = argument.begin();
-  std::string::iterator Biter = argument.begin();
-  for (; Aiter != argument.end(); ++Aiter) {
-    if (*Aiter == ',') {
-      components.push_back(std::string(Biter,Aiter));
-      do {
-        Aiter++;
-      } while (*Aiter == ' ' || *Aiter == '\t');
-      Biter = Aiter;
-    }
-  }
-  components.push_back(std::string(Biter,argument.end()));
-
   if (components.size() != 6) {
     std::cerr <<  "Specified vector does not have three components but " << components.size() << std::endl;