Changeset 9090 for branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Covering

Timestamp:

12/29/12 20:15:48 (12 years ago)

Author:

sforsten

Message:

#1980: implemented covering and changed SinglePointCrossover for CombinedIntegerVectorEncoding

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3

Files:

• . (modified) (1 prop)
• Covering/CombinedIntegerVectorCoveringCreator.cs (modified) (3 diffs)

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3

@@ -1 +1 @@
 *.user
 Plugin.cs
+obj

@@ -1 +1 @@
 *.user
 Plugin.cs
+obj

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Covering/CombinedIntegerVectorCoveringCreator.cs

@@ -28 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.CombinedIntegerVectorEncoding.Covering {
+namespace HeuristicLab.Encodings.CombinedIntegerVectorEncoding {
   [Item("CombinedIntegerVectorCoveringCreator", "Description missing")]
   [StorableClass]
@@ -43 +43 @@
       get { return (IValueLookupParameter<IClassifier>)Parameters["CreatedClassifier"]; }
     }
-    public IValueLookupParameter<PercentValue> ChangeSymbolProbabilityParameter {
-      get { return (IValueLookupParameter<PercentValue>)Parameters["ChangeSymbolProbability"]; }
+    public ILookupParameter<PercentValue> ChangeSymbolProbabilityParameter {
+      get { return (ILookupParameter<PercentValue>)Parameters["ChangeSymbolProbability"]; }
     }
+    public ILookupParameter<IRandom> RandomParameter {
+      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
+    }
+
     #endregion
 
@@ -61 +65 @@
       Parameters.Add(new LookupParameter<IClassifier>("Action"));
       Parameters.Add(new ValueLookupParameter<IClassifier>("CreatedClassifier"));
-      Parameters.Add(new ValueLookupParameter<PercentValue>("ChangeSymbolProbability"));
+      Parameters.Add(new LookupParameter<PercentValue>("ChangeSymbolProbability"));
+      Parameters.Add(new LookupParameter<IRandom>("Random"));
     }
 
     public override IOperation Apply() {
+      CombinedIntegerVector newCondition = (CombinedIntegerVector)CoverClassifierParameter.ActualValue.Condition.Clone();
+
       CombinedIntegerVector condition = (CombinedIntegerVector)CoverClassifierParameter.ActualValue.Condition;
       CombinedIntegerVector action = (CombinedIntegerVector)ActionParameter.ActualValue.Action;
 
-      //TODO: manipulation
+      newCondition = UniformSomePositionInConditionManipulator.ManipulateCondition(RandomParameter.ActualValue, condition, newCondition, ChangeSymbolProbabilityParameter.ActualValue.Value);
 
-      CreatedClassifierParameter.ActualValue = new CombinedIntegerVector(condition, condition.Bounds, action, action.Bounds);
+      CreatedClassifierParameter.ActualValue = new CombinedIntegerVector(newCondition, newCondition.Bounds, action, action.Bounds);
       return base.Apply();
     }

@@ -1 +1 @@
 *.user
 Plugin.cs
+obj