Changeset 73faf4 for src/Parameters/Parameter_impl.hpp

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/Parameters/Parameter_impl.hpp (modified) (4 diffs)

src/Parameters/Parameter_impl.hpp

@@ -23 +23 @@
   value(instance.value.getValidator())
 {
-  value.set(instance.value.value);
+  value.set(instance.value.getUnvalidated());
 }
 
@@ -171 +171 @@
 }
 
+/** 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());
+    throw;
+  }
+}
+
 /** Catch call to value.isValid() to add exception information.
  *
@@ -258 +273 @@
   try {
     status = status &&
-        (value == _instance.value);
+        (getUnvalidated() == _instance.getUnvalidated());
     status = status && (ParameterInterface::getName() == _instance.ParameterInterface::getName());
   } catch(ParameterException &e) {
@@ -276 +291 @@
   Parameter<T> *instance = new Parameter<T>(ParameterInterface::getName(), value.getValidator());
   // do not use get, we do not check for validity here
-  if (value.ValueSet)
-    instance->set(value.value);
+  if (value.isSet())
+    instance->set(value.getUnvalidated());
   return instance;
 }