Changeset 9110 for branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3

Timestamp:

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

Author:

sforsten

Message:

#1980:

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

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3

Files:

• CombinedIntegerVectorManipulator.cs (modified) (2 diffs)
• Covering/CombinedIntegerVectorCoveringCreator.cs (modified) (1 diff)
• HeuristicLab.Encodings.CombinedIntegerVectorEncoding-3.3.csproj (modified) (1 diff)
• Interfaces/ICombinedIntegerVectorManipulator.cs (modified) (1 diff)
• Manipulator/UniformSomePositionManipulator.cs (moved) (moved from branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Manipulator/UniformSomePositionInConditionManipulator.cs) (2 diffs)

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/CombinedIntegerVectorManipulator.cs

@@ -39 +39 @@
       get { return (ILookupParameter<CombinedIntegerVector>)Parameters["Child"]; }
     }
-    public ILookupParameter<CombinedIntegerVector> ParentParameter {
+    public ILookupParameter<CombinedIntegerVector> FetchedClassifierParameter {
       get { return (ILookupParameter<CombinedIntegerVector>)Parameters["Parent"]; }
     }
@@ -57 +57 @@
 
     public sealed override IOperation Apply() {
-      ChildParameter.ActualValue = Manipulate(RandomParameter.ActualValue, ChildParameter.ActualValue, ParentParameter.ActualValue);
+      ChildParameter.ActualValue = Manipulate(RandomParameter.ActualValue, FetchedClassifierParameter.ActualValue, ChildParameter.ActualValue);
       return base.Apply();
     }

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

@@ -75 +75 @@
       CombinedIntegerVector action = (CombinedIntegerVector)ActionParameter.ActualValue.Action;
 
-      newCondition = UniformSomePositionInConditionManipulator.ManipulateCondition(RandomParameter.ActualValue, condition, newCondition, ChangeSymbolProbabilityParameter.ActualValue.Value);
+      newCondition = UniformSomePositionManipulator.ManipulateCondition(RandomParameter.ActualValue, condition, newCondition, ChangeSymbolProbabilityParameter.ActualValue.Value);
 
       CreatedClassifierParameter.ActualValue = new CombinedIntegerVector(newCondition, newCondition.Bounds, action, action.Bounds);

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/HeuristicLab.Encodings.CombinedIntegerVectorEncoding-3.3.csproj

@@ -119 +119 @@
     </Compile>
     <Compile Include="Manipulator\UniformOnePositionInConditionManipulator.cs" />
-    <Compile Include="Manipulator\UniformSomePositionInConditionManipulator.cs" />
+    <Compile Include="Manipulator\UniformSomePositionManipulator.cs" />
     <Compile Include="Plugin.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Interfaces/ICombinedIntegerVectorManipulator.cs

@@ -29 +29 @@
   public interface ICombinedIntegerVectorManipulator : IManipulator, ICombinedIntegerVectorOperator {
     ILookupParameter<CombinedIntegerVector> ChildParameter { get; }
-    ILookupParameter<CombinedIntegerVector> ParentParameter { get; }
+    ILookupParameter<CombinedIntegerVector> FetchedClassifierParameter { get; }
   }
 }

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

@@ -27 +27 @@
 
 namespace HeuristicLab.Encodings.CombinedIntegerVectorEncoding {
-  public class UniformSomePositionInConditionManipulator : CombinedIntegerVectorManipulator {
+  public class UniformSomePositionManipulator : CombinedIntegerVectorManipulator {
 
     public IValueLookupParameter<PercentValue> ProbabilityParameter {
@@ -37 +37 @@
 
     [StorableConstructor]
-    protected UniformSomePositionInConditionManipulator(bool deserializing) : base(deserializing) { }
-    protected UniformSomePositionInConditionManipulator(UniformSomePositionInConditionManipulator original, Cloner cloner)
+    protected UniformSomePositionManipulator(bool deserializing) : base(deserializing) { }
+    protected UniformSomePositionManipulator(UniformSomePositionManipulator original, Cloner cloner)
       : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new UniformSomePositionInConditionManipulator(this, cloner);
+      return new UniformSomePositionManipulator(this, cloner);
     }
-    public UniformSomePositionInConditionManipulator()
+    public UniformSomePositionManipulator()
       : base() {
       Parameters.Add(new ValueLookupParameter<PercentValue>("Probability", "The probability for each dimension to be manipulated.", new PercentValue(0.5)));