Changeset 9204 for branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Manipulator

Timestamp:

02/04/13 16:16:38 (12 years ago)

Author:

sforsten

Message:

#1980:

• deleted not needed interface IMatching
• finished VariableVector encoding
• the algorithm LearningClassifierSystem is now independent of a specific encoding. It still needs the ConditionActionEncoding.
• merged r9191:9203 HeuristicLab.Core from trunk to branch

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Manipulator

Files:

• UniformActionManipulator.cs (modified) (1 diff)
• UniformOnePositionInConditionManipulator.cs (modified) (1 diff)
• UniformSomePositionManipulator.cs (modified) (3 diffs)

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Manipulator/UniformActionManipulator.cs

@@ -47 +47 @@
     }
 
-    protected override CombinedIntegerVector Manipulate(IRandom random, CombinedIntegerVector child, CombinedIntegerVector parent) {
-      return Manipulate(random, parent, child, PossibleActionsParameter.ActualValue);
+    protected override CombinedIntegerVector Manipulate(IRandom random, CombinedIntegerVector child, CombinedIntegerVector input) {
+      return Manipulate(random, child, PossibleActionsParameter.ActualValue);
     }
 
-    public static CombinedIntegerVector Manipulate(IRandom random, CombinedIntegerVector parent, CombinedIntegerVector child, IEnumerable<CombinedIntegerVector> possibleActions) {
-      var otherActions = possibleActions.Except(((CombinedIntegerVector)parent.Action).ToEnumerable());
+    public static CombinedIntegerVector Manipulate(IRandom random, CombinedIntegerVector child, IEnumerable<CombinedIntegerVector> possibleActions) {
+      var otherActions = possibleActions.Except(((CombinedIntegerVector)child.Action).ToEnumerable());
       int actionIndex = random.Next(otherActions.Count());
       CombinedIntegerVector newAction = otherActions.ElementAt(actionIndex);

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Manipulator/UniformOnePositionInConditionManipulator.cs

@@ -41 +41 @@
     }
 
-    protected override CombinedIntegerVector Manipulate(IRandom random, CombinedIntegerVector parent, CombinedIntegerVector child) {
-      return Manipulate(parent, child, random.Next(((CombinedIntegerVector)child.Condition).Length));
+    protected override CombinedIntegerVector Manipulate(IRandom random, CombinedIntegerVector input, CombinedIntegerVector child) {
+      return Manipulate(input, child, random.Next(((CombinedIntegerVector)child.Condition).Length));
     }
 
-    public static CombinedIntegerVector Manipulate(CombinedIntegerVector parent, CombinedIntegerVector child, int index) {
+    public static CombinedIntegerVector Manipulate(CombinedIntegerVector input, CombinedIntegerVector child, int index) {
       int max = child.Bounds[index % child.Bounds.Rows, 1] - 1;
       if (child[index].Equals(max)) {
-        child[index] = parent[index];
+        child[index] = input[index];
       } else {
         child[index] = max;

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Manipulator/UniformSomePositionManipulator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.ConditionActionEncoding;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Encodings.CombinedIntegerVectorEncoding {
-  public class UniformSomePositionManipulator : CombinedIntegerVectorManipulator {
+  public class UniformSomePositionManipulator : CombinedIntegerVectorManipulator, IProbabilityMutatorOperator {
 
     public IValueLookupParameter<PercentValue> ProbabilityParameter {
@@ -50 +51 @@
     }
 
-    protected override CombinedIntegerVector Manipulate(IRandom random, CombinedIntegerVector parent, CombinedIntegerVector child) {
-      return Manipulate(random, parent, child, ProbabilityParameter.ActualValue.Value, PossibleActionsParameter.ActualValue);
+    protected override CombinedIntegerVector Manipulate(IRandom random, CombinedIntegerVector input, CombinedIntegerVector child) {
+      return Manipulate(random, input, child, ProbabilityParameter.ActualValue.Value, PossibleActionsParameter.ActualValue);
     }
 
-    public static CombinedIntegerVector Manipulate(IRandom random, CombinedIntegerVector parent, CombinedIntegerVector child, double probability, IItemSet<CombinedIntegerVector> possibleActions) {
-      child = ManipulateCondition(random, parent, child, probability);
-      return ManipulateAction(random, parent, child, probability, possibleActions);
+    public static CombinedIntegerVector Manipulate(IRandom random, CombinedIntegerVector input, CombinedIntegerVector child, double probability, IItemSet<CombinedIntegerVector> possibleActions) {
+      child = ManipulateCondition(random, input, child, probability);
+      return ManipulateAction(random, child, probability, possibleActions);
     }
 
-    public static CombinedIntegerVector ManipulateCondition(IRandom random, CombinedIntegerVector parent, CombinedIntegerVector child, double probability) {
+    public static CombinedIntegerVector ManipulateCondition(IRandom random, CombinedIntegerVector input, CombinedIntegerVector child, double probability) {
       int conditionLength = child.Length - child.ActionLength;
       for (int index = 0; index < child.Length - child.ActionLength; index++) {
         if (random.NextDouble() < probability) {
-          child = UniformOnePositionInConditionManipulator.Manipulate(parent, child, index);
+          child = UniformOnePositionInConditionManipulator.Manipulate(input, child, index);
         }
       }
@@ -69 +70 @@
     }
 
-    public static CombinedIntegerVector ManipulateAction(IRandom random, CombinedIntegerVector parent, CombinedIntegerVector child, double probability, IItemSet<CombinedIntegerVector> possibleActions) {
+    public static CombinedIntegerVector ManipulateAction(IRandom random, CombinedIntegerVector child, double probability, IItemSet<CombinedIntegerVector> possibleActions) {
       if (child.ActionLength > 0 && random.NextDouble() < probability) {
-        UniformActionManipulator.Manipulate(random, parent, child, possibleActions);
+        UniformActionManipulator.Manipulate(random, child, possibleActions);
       }
       return child;