Changeset 2818 for trunk/sources/HeuristicLab.Parameters/3.3/LookupParameter.cs

Timestamp:

02/17/10 05:24:03 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• corrected several bugs in order to get SGA working

File:

• trunk/sources/HeuristicLab.Parameters/3.3/LookupParameter.cs (modified) (9 diffs)

trunk/sources/HeuristicLab.Parameters/3.3/LookupParameter.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -71 +68 @@
 
     public override string ToString() {
-      return string.Format("{0}: {1} ({2})", Name, ActualName, DataType.Name);
-    }
-
-    private IValueParameter<T> GetParameter(out string name) {
-      IValueParameter<T> valueParam = this as IValueParameter<T>;
-      ILookupParameter<T> lookupParam = this as ILookupParameter<T>;
+      return string.Format("{0}: {1} ({2})", Name, ActualName, DataType.GetPrettyName());
+    }
+
+    private IValueParameter GetParameter(out string name) {
+      IValueParameter valueParam = this as IValueParameter;
+      ILookupParameter lookupParam = this as ILookupParameter;
       ExecutionContext current = ExecutionContext;
 
       name = Name;
-      while ((valueParam != null) && (lookupParam != null)) {
+      while ((valueParam != null) || (lookupParam != null)) {
         if ((valueParam != null) && (valueParam.Value != null)) return valueParam;
         if (lookupParam != null) name = lookupParam.ActualName;
@@ -89 +86 @@
 
         if (current != null) {
-          valueParam = current.Operator.Parameters[name] as IValueParameter<T>;
-          lookupParam = current.Operator.Parameters[name] as ILookupParameter<T>;
+          valueParam = current.Operator.Parameters[name] as IValueParameter;
+          lookupParam = current.Operator.Parameters[name] as ILookupParameter;
           if ((valueParam == null) && (lookupParam == null))
             throw new InvalidOperationException(
               string.Format("Parameter look-up chain broken. Parameter \"{0}\" is not an \"{1}\" or an \"{2}\".",
                             name,
-                            typeof(IValueParameter<T>).GetPrettyName(),
-                            typeof(ILookupParameter<T>).GetPrettyName())
+                            typeof(IValueParameter).GetPrettyName(),
+                            typeof(ILookupParameter).GetPrettyName())
             );
         } else {
@@ -111 +108 @@
       return scope != null ? scope.Variables[actualName] : null;
     }
-    private IValueParameter<T> GetProblemParameter(string name) {
-      IValueParameter<T> param = null;
+    private IValueParameter GetProblemParameter(string name) {
+      IValueParameter param = null;
       if (ExecutionContext.Problem.Parameters.ContainsKey(name)) {
-        param = ExecutionContext.Problem.Parameters[name] as IValueParameter<T>;
+        param = ExecutionContext.Problem.Parameters[name] as IValueParameter;
         if (param == null)
           throw new InvalidOperationException(
             string.Format("Parameter look-up chain broken. Parameter \"{0}\" is not an \"{1}\".",
                           name,
-                          typeof(IValueParameter<T>).GetPrettyName())
+                          typeof(IValueParameter).GetPrettyName())
           );
       }
@@ -127 +124 @@
       string name;
       // try to get value from context stack
-      IValueParameter<T> param = GetParameter(out name);
+      IValueParameter param = GetParameter(out name);
       if (param != null) return param.Value;
 
@@ -144 +141 @@
 
       // try to get value from problem
-      IValueParameter<T> problemParam = GetProblemParameter(name);
+      IValueParameter problemParam = GetProblemParameter(name);
       if (problemParam != null) return problemParam.Value;
 
@@ -158 +155 @@
       // try to set value in context stack
       string name;
-      IValueParameter<T> param = GetParameter(out name);
+      IValueParameter param = GetParameter(out name);
       if (param != null) {
         param.Value = val;
@@ -172 +169 @@
 
       // try to set value in problem
-      IValueParameter<T> problemParam = GetProblemParameter(name);
+      IValueParameter problemParam = GetProblemParameter(name);
       if (problemParam != null) {
         problemParam.Value = val;
@@ -193 +190 @@
       ExecutionContext currentContext = context;
       IParameter param;
-      ILookupParameter<T> lookupParam;
+      ILookupParameter lookupParam;
 
       while (currentContext != null) {
         currentContext.Operator.Parameters.TryGetValue(currentName, out param);
         if (param != null) {
-          lookupParam = param as ILookupParameter<T>;
+          lookupParam = param as ILookupParameter;
           if (lookupParam == null)
             throw new InvalidOperationException(
               string.Format("Parameter look-up chain broken. Parameter \"{0}\" is not an \"{1}\".",
                             currentName,
-                            typeof(ILookupParameter<T>).GetPrettyName())
+                            typeof(ILookupParameter).GetPrettyName())
             );
           currentName = lookupParam.ActualName;