Changeset 40 for trunk/sources/HeuristicLab.Operators

Timestamp:

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

Author:

swagner

Message:

Worked on ticket #41

• added generic ItemList<T>

Location:

trunk/sources/HeuristicLab.Operators

Files:

• CombinedOperator.cs (modified) (2 diffs)
• DataCollector.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Operators/CombinedOperator.cs

@@ -47 +47 @@
       GetVariableInfo("InjectSubOperators").Local = true;
       AddVariable(new Variable("InjectSubOperators", new BoolData(false)));
-      AddVariableInfo(new VariableInfo("SubOperatorNames", "Variable names for injecting the sub-operators", typeof(ItemList), VariableKind.In));
+      AddVariableInfo(new VariableInfo("SubOperatorNames", "Variable names for injecting the sub-operators", typeof(ItemList<StringData>), VariableKind.In));
       GetVariableInfo("SubOperatorNames").Local = true;
-      ItemList subOperatorNames = new ItemList();
-      subOperatorNames.ItemType = typeof(StringData);
+      ItemList<StringData> subOperatorNames = new ItemList<StringData>();
       AddVariable(new Variable("SubOperatorNames", subOperatorNames));
     }
@@ -75 +74 @@
         bool inject = GetVariableValue<BoolData>("InjectSubOperators", scope, false).Data;
         if (inject) {
-          ItemList names = GetVariableValue<ItemList>("SubOperatorNames", scope, false);
+          ItemList<StringData> names = GetVariableValue<ItemList<StringData>>("SubOperatorNames", scope, false);
           for (int i = 0; i < SubOperators.Count; i++) {
-            if (scope.GetVariable(names[i].ToString()) != null)
-              scope.RemoveVariable(names[i].ToString());
-            scope.AddVariable(new Variable(names[i].ToString(), SubOperators[i]));
+            if (scope.GetVariable(names[i].Data) != null)
+              scope.RemoveVariable(names[i].Data);
+            scope.AddVariable(new Variable(names[i].Data, SubOperators[i]));
           }
         }

trunk/sources/HeuristicLab.Operators/DataCollector.cs

@@ -33 +33 @@
 
     public DataCollector() {
-      IVariableInfo variableNamesVariableInfo = new VariableInfo("VariableNames", "Names of variables whose values should be collected", typeof(ItemList), VariableKind.In);
+      IVariableInfo variableNamesVariableInfo = new VariableInfo("VariableNames", "Names of variables whose values should be collected", typeof(ItemList<StringData>), VariableKind.In);
       variableNamesVariableInfo.Local = true;
       AddVariableInfo(variableNamesVariableInfo);
-      ItemList variableNames = new ItemList();
-      variableNames.ItemType = typeof(StringData);
+      ItemList<StringData> variableNames = new ItemList<StringData>();
       AddVariable(new Variable("VariableNames", variableNames));
       AddVariableInfo(new VariableInfo("Values", "Collected values", typeof(ItemList), VariableKind.New | VariableKind.In | VariableKind.Out));
@@ -43 +42 @@
 
     public override IOperation Apply(IScope scope) {
-      ItemList names = GetVariableValue<ItemList>("VariableNames", scope, false);
+      ItemList<StringData> names = GetVariableValue<ItemList<StringData>>("VariableNames", scope, false);
       ItemList values = GetVariableValue<ItemList>("Values", scope, false, false);
       if (values == null) {
@@ -56 +55 @@
       ItemList currentValues = new ItemList();
       for (int i = 0; i < names.Count; i++)
-        currentValues.Add((IItem)scope.GetVariableValue(((StringData)names[i]).Data, true).Clone());
+        currentValues.Add((IItem)scope.GetVariableValue(names[i].Data, true).Clone());
       values.Add(currentValues);
       return null;