Changeset 17254 for branches/2521_ProblemRefactoring/HeuristicLab.Parameters

Timestamp:

09/16/19 23:48:36 (5 years ago)

Author:

abeham

Message:

#2521: Added context lookup parameter

• Refactored tests
• Fixed duplicate GUID

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3

Files:

• ContextLookupParameter.cs (added)
• HeuristicLab.Parameters-3.3.csproj (modified) (1 diff)
• LookupParameter.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj

@@ -122 +122 @@
     <None Include="Plugin.cs.frame" />
     <Compile Include="ConstrainedValueParameter.cs" />
+    <Compile Include="ContextLookupParameter.cs" />
     <Compile Include="FixedValueParameter.cs" />
     <Compile Include="OptionalConstrainedValueParameter.cs" />

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/LookupParameter.cs

@@ -22 +22 @@
 using System;
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HEAL.Attic;
 
 namespace HeuristicLab.Parameters {
@@ -136 +136 @@
       while (currentExecutionContext != null) {
         IParameter param = null;
-        while (currentExecutionContext != null && !currentExecutionContext.Parameters.TryGetValue(translatedName, out param))
+        while (currentExecutionContext != null && (!currentExecutionContext.Parameters.TryGetValue(translatedName, out param)
+          || param is IContextLookupParameter))
           currentExecutionContext = currentExecutionContext.Parent;
         if (currentExecutionContext == null) break;
@@ -143 +144 @@
         lookupParam = param as ILookupParameter;
 
-        if ((valueParam == null) && (lookupParam == null))
+        if (valueParam == null && lookupParam == null)
           throw new InvalidOperationException(
-            string.Format("Parameter look-up chain broken. Parameter \"{0}\" is not an \"{1}\" or an \"{2}\".",
+            string.Format("Parameter look-up chain broken. Parameter \"{0}\" is neither an \"{1}\" nor an \"{2}\".",
                           translatedName, typeof(IValueParameter).GetPrettyName(), typeof(ILookupParameter).GetPrettyName())
           );