Changeset 40 for trunk/sources/HeuristicLab.Selection.OffspringSelection

Timestamp:

03/05/08 02:08:02 (16 years ago)

Author:

swagner

Message:

Worked on ticket #41

• added generic ItemList<T>

File:

• trunk/sources/HeuristicLab.Selection.OffspringSelection/OffspringSelector.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Selection.OffspringSelection/OffspringSelector.cs

@@ -38 +38 @@
       AddVariableInfo(new VariableInfo("SelectionPressure", "Current selection pressure", typeof(DoubleData), VariableKind.New | VariableKind.Out));
       AddVariableInfo(new VariableInfo("SuccessRatio", "Current success ratio", typeof(DoubleData), VariableKind.New | VariableKind.Out));
-      AddVariableInfo(new VariableInfo("GoodChildren", "Temporarily store successful children", typeof(ItemList), VariableKind.New | VariableKind.Out | VariableKind.In | VariableKind.Deleted));
-      AddVariableInfo(new VariableInfo("BadChildren", "Temporarily store unsuccessful children", typeof(ItemList), VariableKind.New | VariableKind.Out | VariableKind.In | VariableKind.Deleted));
+      AddVariableInfo(new VariableInfo("GoodChildren", "Temporarily store successful children", typeof(ItemList<IScope>), VariableKind.New | VariableKind.Out | VariableKind.In | VariableKind.Deleted));
+      AddVariableInfo(new VariableInfo("BadChildren", "Temporarily store unsuccessful children", typeof(ItemList<IScope>), VariableKind.New | VariableKind.Out | VariableKind.In | VariableKind.Deleted));
     }
 
@@ -50 +50 @@
 
       // retrieve good and bad children
-      ItemList goodChildren = GetVariableValue<ItemList>("GoodChildren", scope, false, false);
+      ItemList<IScope> goodChildren = GetVariableValue<ItemList<IScope>>("GoodChildren", scope, false, false);
       if (goodChildren == null) {
-        goodChildren = new ItemList();
-        goodChildren.ItemType = typeof(IScope);
+        goodChildren = new ItemList<IScope>();
         IVariableInfo goodChildrenInfo = GetVariableInfo("GoodChildren");
         if (goodChildrenInfo.Local)
@@ -60 +59 @@
           scope.AddVariable(new Variable(goodChildrenInfo.ActualName, goodChildren));
       }
-      ItemList badChildren = GetVariableValue<ItemList>("BadChildren", scope, false, false);
+      ItemList<IScope> badChildren = GetVariableValue<ItemList<IScope>>("BadChildren", scope, false, false);
       if (badChildren == null) {
-        badChildren = new ItemList();
-        badChildren.ItemType = typeof(IScope);
+        badChildren = new ItemList<IScope>();
         IVariableInfo badChildrenInfo = GetVariableInfo("BadChildren");
         if (badChildrenInfo.Local)