Changeset 3634 for trunk/sources/HeuristicLab.Parameters/3.3

Timestamp:

05/05/10 14:28:22 (15 years ago)

Author:

swagner

Message:

Worked on best solution analysis for the TSP (#999)

Location:

trunk/sources/HeuristicLab.Parameters/3.3

Files:

• HeuristicLab.Parameters-3.3.csproj (modified) (1 diff)
• SubScopesLookupParameter.cs (modified) (1 diff)
• SubScopesSubScopesLookupParameter.cs (copied) (copied from trunk/sources/HeuristicLab.Parameters/3.3/SubScopesLookupParameter.cs) (3 diffs)

trunk/sources/HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj

@@ -86 +86 @@
     <None Include="HeuristicLabParametersPlugin.cs.frame" />
     <Compile Include="ConstrainedValueParameter.cs" />
+    <Compile Include="SubScopesSubScopesLookupParameter.cs" />
     <Compile Include="OptionalConstrainedValueParameter.cs" />
     <Compile Include="ValueParameter.cs" />

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

@@ -27 +27 @@
 namespace HeuristicLab.Parameters {
   /// <summary>
-  /// A generic parameter representing instances of type T which are collected from the sub-scopes of the current scope.
+  /// A generic parameter representing instances of type T which are collected from or written to the sub-scopes of the current scope.
   /// </summary>
   [Item("SubScopesLookupParameter<T>", "A generic parameter representing instances of type T which are collected from or written to the sub-scopes of the current scope.")]

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

@@ -27 +27 @@
 namespace HeuristicLab.Parameters {
   /// <summary>
-  /// A generic parameter representing instances of type T which are collected from the sub-scopes of the current scope.
+  /// A generic parameter representing instances of type T which are collected from or written to the sub-scopes of the sub-scopes of the current scope.
   /// </summary>
-  [Item("SubScopesLookupParameter<T>", "A generic parameter representing instances of type T which are collected from or written to the sub-scopes of the current scope.")]
+  [Item("SubScopesSubScopesLookupParameter<T>", "A generic parameter representing instances of type T which are collected from or written to the sub-scopes of the sub-scopes of the current scope.")]
   [StorableClass]
-  public class SubScopesLookupParameter<T> : LookupParameter<ItemArray<T>> where T : class, IItem {
-    public SubScopesLookupParameter() : base() { }
-    public SubScopesLookupParameter(string name) : base(name) { }
-    public SubScopesLookupParameter(string name, string description) : base(name, description) { }
-    public SubScopesLookupParameter(string name, string description, string actualName) : base(name, description, actualName) { }
+  public class SubScopesSubScopesLookupParameter<T> : LookupParameter<ItemArray<ItemArray<T>>> where T : class, IItem {
+    public SubScopesSubScopesLookupParameter() : base() { }
+    public SubScopesSubScopesLookupParameter(string name) : base(name) { }
+    public SubScopesSubScopesLookupParameter(string name, string description) : base(name, description) { }
+    public SubScopesSubScopesLookupParameter(string name, string description, string actualName) : base(name, description, actualName) { }
 
     protected override IItem GetActualValue() {
-      string name = LookupParameter<ItemArray<T>>.TranslateName(Name, ExecutionContext);
+      string name = LookupParameter<ItemArray<ItemArray<T>>>.TranslateName(Name, ExecutionContext);
       IScope scope = ExecutionContext.Scope;
-      ItemArray<T> values = new ItemArray<T>(scope.SubScopes.Count);
+      ItemArray<ItemArray<T>> values = new ItemArray<ItemArray<T>>(scope.SubScopes.Count);
       IVariable var;
       T value;
 
       for (int i = 0; i < values.Length; i++) {
-        scope.SubScopes[i].Variables.TryGetValue(name, out var);
-        if (var != null) {
-          value = var.Value as T;
-          if ((var.Value != null) && (value == null))
-            throw new InvalidOperationException(
-              string.Format("Type mismatch. Variable \"{0}\" does not contain a \"{1}\".",
-                            name,
-                            typeof(T).GetPrettyName())
-            );
-          values[i] = value;
+        values[i] = new ItemArray<T>(scope.SubScopes[i].SubScopes.Count);
+        for (int j = 0; j < values[i].Length; j++) {
+          scope.SubScopes[i].SubScopes[j].Variables.TryGetValue(name, out var);
+          if (var != null) {
+            value = var.Value as T;
+            if ((var.Value != null) && (value == null))
+              throw new InvalidOperationException(
+                string.Format("Type mismatch. Variable \"{0}\" does not contain a \"{1}\".",
+                              name,
+                              typeof(T).GetPrettyName())
+              );
+            values[i][j] = value;
+          }
         }
       }
@@ -60 +63 @@
     }
     protected override void SetActualValue(IItem value) {
-      ItemArray<T> values = value as ItemArray<T>;
+      ItemArray<ItemArray<T>> values = value as ItemArray<ItemArray<T>>;
       if (values == null)
         throw new InvalidOperationException(
@@ -67 +70 @@
         );
 
-      string name = LookupParameter<ItemArray<T>>.TranslateName(Name, ExecutionContext);
+      string name = LookupParameter<ItemArray<ItemArray<T>>>.TranslateName(Name, ExecutionContext);
       IScope scope = ExecutionContext.Scope;
       IVariable var;
 
       for (int i = 0; i < values.Length; i++) {
-        scope.SubScopes[i].Variables.TryGetValue(name, out var);
-        if (var != null) var.Value = values[i];
-        else scope.SubScopes[i].Variables.Add(new Variable(name, values[i]));
+        for (int j = 0; j < values[i].Length; j++) {
+          scope.SubScopes[i].SubScopes[j].Variables.TryGetValue(name, out var);
+          if (var != null) var.Value = values[i][j];
+          else scope.SubScopes[i].SubScopes[j].Variables.Add(new Variable(name, values[i][j]));
+        }
       }
     }