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

Timestamp:

02/23/10 06:50:50 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on algorithms

File:

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

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

@@ -108 +108 @@
       return scope != null ? scope.Variables[actualName] : null;
     }
-    //private IValueParameter GetProblemParameter(string name) {
-    //  IValueParameter param = null;
-    //  if (ExecutionContext.Problem.Parameters.ContainsKey(name)) {
-    //    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).GetPrettyName())
-    //      );
-    //  }
-    //  return param;
-    //}
     protected override IItem GetActualValue() {
       string name;
@@ -130 +117 @@
       IVariable var = LookupVariable(name);
       if (var != null) {
-        T value = var.Value as T;
-        if (value == null)
+        if (!(var.Value is T))
           throw new InvalidOperationException(
             string.Format("Type mismatch. Variable \"{0}\" does not contain a \"{1}\".",
@@ -137 +123 @@
                           typeof(T).GetPrettyName())
           );
-        return value;
+        return var.Value;
       }
-
-      // try to get value from problem
-      //IValueParameter problemParam = GetProblemParameter(name);
-      //if (problemParam != null) return problemParam.Value;
-
       return null;
     }
     protected override void SetActualValue(IItem value) {
-      T val = value as T;
-      if (val == null)
+      if (!(value is T))
         throw new InvalidOperationException(
           string.Format("Type mismatch. Value is not a \"{0}\".",
@@ -157 +137 @@
       IValueParameter param = GetParameter(out name);
       if (param != null) {
-        param.Value = val;
+        param.Value = value;
         return;
       }
@@ -164 +144 @@
       IVariable var = LookupVariable(name);
       if (var != null) {
-        var.Value = val;
+        var.Value = value;
         return;
       }
-
-      // try to set value in problem
-      //IValueParameter problemParam = GetProblemParameter(name);
-      //if (problemParam != null) {
-      //  problemParam.Value = val;
-      //  return;
-      //}
 
       // create new variable