Changeset e4036a

Timestamp:

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

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

7f3f9c

Parents:

ce254c

git-author:

Frederik Heber <heber@…> (03/29/17 10:58:47)

git-committer:

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

Message:

FIX: Parameter is now longer friend of class Value.

• Parameter does not need direct access to member variables of Value and this causes problems when value is not the same class as the template class of Parameter.

Location:

src/Parameters

Files:

• Parameter_impl.hpp (modified) (3 diffs)
• Value.hpp (modified) (1 diff)

src/Parameters/Parameter_impl.hpp

@@ -23 +23 @@
   value(instance.value.getValidator())
 {
-  value.set(instance.value.value);
+  value.set(instance.value.getUnvalidated());
 }
 
@@ -258 +258 @@
   try {
     status = status &&
-        (value == _instance.value);
+        (getUnvalidated() == _instance.getUnvalidated());
     status = status && (ParameterInterface::getName() == _instance.ParameterInterface::getName());
   } catch(ParameterException &e) {
@@ -276 +276 @@
   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;
 }

src/Parameters/Value.hpp

@@ -67 +67 @@
   friend class ValueTest;
   friend class ContinuousValueTest;
-  friend class Parameter<T>;
+//  friend class Parameter<T>;
 public:
   Value();