Changeset 9110 for branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/CoveringOperator.cs

Timestamp:

01/04/13 20:46:18 (11 years ago)

Author:

sforsten

Message:

#1980:

• added GA subsumption
• simplified deletion before covering
• simplified XCSDeletionOperator

File:

• branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/CoveringOperator.cs (modified) (1 diff)

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/CoveringOperator.cs

@@ -101 +101 @@
         throw new ArgumentException("More classifiers with unique actions shall be created than unique actions are available.");
       }
+      if (count > 0) {
+        CurrentPopulationSizeParameter.ActualValue.Value += count;
 
-      CurrentPopulationSizeParameter.ActualValue.Value += count;
+        int current = CurrentScope.SubScopes.Count;
+        for (int i = 0; i < count; i++) {
+          CurrentScope.SubScopes.Add(new Scope((current + i).ToString()));
+        }
 
-      int current = CurrentScope.SubScopes.Count;
-      for (int i = 0; i < count; i++) {
-        CurrentScope.SubScopes.Add(new Scope((current + i).ToString()));
+        creator.ActionParameter.ActualName = "Action";
+        OperationCollection variableCreation = new OperationCollection() { Parallel = parallel };
+        OperationCollection creation = new OperationCollection();
+        OperationCollection evaluation = new OperationCollection() { Parallel = parallel };
+        for (int i = 0; i < count; i++) {
+          VariableCreator variableCreator = new VariableCreator();
+          int pos = RandomParameter.ActualValue.Next(clone.Count);
+          IClassifier action = clone.ElementAt(pos);
+          clone.Remove(action);
+          variableCreator.CollectedValues.Add(new ValueParameter<IClassifier>("Action", action));
+          variableCreation.Add(ExecutionContext.CreateOperation(variableCreator, CurrentScope.SubScopes[current + i]));
+          creation.Add(ExecutionContext.CreateOperation(creator, CurrentScope.SubScopes[current + i]));
+          evaluation.Add(ExecutionContext.CreateOperation(evaluator, CurrentScope.SubScopes[current + i]));
+        }
+        OperationCollection next = new OperationCollection();
+        next.Add(variableCreation);
+        next.Add(creation);
+        next.Add(evaluation);
+        next.Add(base.Apply());
+        return next;
+      } else {
+        return base.Apply();
       }
-
-      creator.ActionParameter.ActualName = "Action";
-      OperationCollection variableCreation = new OperationCollection() { Parallel = parallel };
-      OperationCollection creation = new OperationCollection();
-      OperationCollection evaluation = new OperationCollection() { Parallel = parallel };
-      for (int i = 0; i < count; i++) {
-        VariableCreator variableCreator = new VariableCreator();
-        int pos = RandomParameter.ActualValue.Next(clone.Count);
-        IClassifier action = clone.ElementAt(pos);
-        clone.Remove(action);
-        variableCreator.CollectedValues.Add(new ValueParameter<IClassifier>("Action", action));
-        variableCreation.Add(ExecutionContext.CreateOperation(variableCreator, CurrentScope.SubScopes[current + i]));
-        creation.Add(ExecutionContext.CreateOperation(creator, CurrentScope.SubScopes[current + i]));
-        evaluation.Add(ExecutionContext.CreateOperation(evaluator, CurrentScope.SubScopes[current + i]));
-      }
-      OperationCollection next = new OperationCollection();
-      next.Add(variableCreation);
-      next.Add(creation);
-      next.Add(evaluation);
-      next.Add(base.Apply());
-      return next;
     }
   }