Changeset 9475 for branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/Manipulator

Timestamp:

05/09/13 18:57:22 (12 years ago)

Author:

sforsten

Message:

#1980: several small bug fixes

Location:

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

Files:

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

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

@@ -52 +52 @@
     }
 
-    protected override VariableVector Manipulate(IRandom random, VariableVectorInput input, VariableVector child) {
+    protected override VariableVector Manipulate(IRandom random, VariableVectorInput input, VariableVector child, double spreadpercentage) {
       return Manipulate(random, child, PossibleActionsParameter.ActualValue);
     }

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

@@ -45 +45 @@
     }
 
-    protected override VariableVector Manipulate(IRandom random, VariableVectorInput input, VariableVector child) {
-      return Manipulate(random, input, child, random.Next(child.Condition.VirtualLength));
+    protected override VariableVector Manipulate(IRandom random, VariableVectorInput input, VariableVector child, double spreadPercentage) {
+      return Manipulate(random, input, child, random.Next(child.Condition.VirtualLength), spreadPercentage);
     }
 
-    public static VariableVector Manipulate(IRandom random, VariableVectorInput input, VariableVector child, int index) {
+    public static VariableVector Manipulate(IRandom random, VariableVectorInput input, VariableVector child, int index, double spreadPercentage) {
       VariableVectorCondition condition = child.Condition;
       if (index >= condition.VirtualLength) {
@@ -61 +61 @@
         keyEnumerator.MoveNext();
       }
-      condition.VariableDictionary[keyEnumerator.Current].Manipulate(random, input.InputDictionary[keyEnumerator.Current], index - count);
+      condition.VariableDictionary[keyEnumerator.Current].Manipulate(random, input.InputDictionary[keyEnumerator.Current], index - count, spreadPercentage);
       return child;
     }

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

@@ -55 +55 @@
     }
 
-    protected override VariableVector Manipulate(IRandom random, VariableVectorInput input, VariableVector child) {
-      return Manipulate(random, input, child, ProbabilityParameter.ActualValue.Value, PossibleActionsParameter.ActualValue);
+    protected override VariableVector Manipulate(IRandom random, VariableVectorInput input, VariableVector child, double spreadPercentage) {
+      return Manipulate(random, input, child, ProbabilityParameter.ActualValue.Value, PossibleActionsParameter.ActualValue, spreadPercentage);
     }
 
-    public static VariableVector Manipulate(IRandom random, VariableVectorInput input, VariableVector child, double probability, IItemSet<VariableVectorAction> possibleActions) {
-      child = ManipulateCondition(random, input, child, probability);
+    public static VariableVector Manipulate(IRandom random, VariableVectorInput input, VariableVector child, double probability, IItemSet<VariableVectorAction> possibleActions, double spreadPercentage) {
+      child = ManipulateCondition(random, input, child, probability, spreadPercentage);
       return ManipulateAction(random, child, probability, possibleActions);
     }
 
-    public static VariableVector ManipulateCondition(IRandom random, VariableVectorInput input, VariableVector child, double probability) {
+    public static VariableVector ManipulateCondition(IRandom random, VariableVectorInput input, VariableVector child, double probability, double spreadPercentage) {
       for (int index = 0; index < child.Condition.VirtualLength; index++) {
         if (random.NextDouble() < probability) {
-          child = UniformOnePositionInConditionManipulator.Manipulate(random, input, child, index);
+          child = UniformOnePositionInConditionManipulator.Manipulate(random, input, child, index, spreadPercentage);
         }
       }