Changeset 61003d for src/Parameters

Timestamp:

Jun 19, 2017, 8:24:16 AM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChangeBugEmailaddress, ChemicalSpaceEvaluator, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_Verbose_Codepatterns, ForceAnnealing_oldresults, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps

Children:

b5bdb9

Parents:

9a9f847

git-author:

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

git-committer:

Frederik Heber <frederik.heber@…> (06/19/17 08:24:16)

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();