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

Timestamp:

01/28/13 17:54:46 (11 years ago)

Author:

sforsten

Message:

#1980:

• added necessary interface ICondition, IAction, IInput
• removed not used class MatchSelector and interface IMatchSelector
• added constructors to ItemDictionary
• added new encoding

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3

Files:

• CombinedIntegerVector.cs (modified) (10 diffs)
• CombinedIntegerVectorManipulator.cs (modified) (2 diffs)
• Covering/CombinedIntegerVectorCoveringCreator.cs (modified) (3 diffs)
• HeuristicLab.Encodings.CombinedIntegerVectorEncoding-3.3.csproj (modified) (2 diffs)
• Interfaces/ICombinedIntegerVectorManipulator.cs (modified) (1 diff)

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -33 +34 @@
   [StorableClass]
   [Item("CombinedIntegerVector", "Represents a combined vector of integer values.")]
-  public class CombinedIntegerVector : IntegerVector, IClassifier {
+  public class CombinedIntegerVector : IntegerVector, IClassifier, ICondition, IAction, IInput {
 
     [Storable]
@@ -121 +122 @@
     }
 
-    public IClassifier Condition {
+    public ICondition Condition {
       get {
         int[] condition = new int[Length - actionLength];
@@ -129 +130 @@
     }
 
-    public IClassifier Action {
+    public IAction Action {
       get {
         int[] action = new int[actionLength];
@@ -152 +153 @@
     }
 
-    public bool MatchCondition(IClassifier target) {
+    public bool MatchInput(IInput target) {
       var targetVector = target as CombinedIntegerVector;
       if (targetVector == null) return false;
-      if (targetVector.Length != this.Length) return false;
+      if (targetVector.Length - targetVector.actionLength != this.Length - this.actionLength) return false;
 
       int curbounds;
@@ -171 +172 @@
     }
 
+    public bool MatchAction(IClassifier target) {
+      return MatchAction(target.Action);
+    }
+
     // no "don't care" symbols have to be considered
-    public bool MatchAction(IClassifier target) {
+    public bool MatchAction(IAction target) {
       var targetVector = target as CombinedIntegerVector;
       if (targetVector == null) return false;
@@ -188 +193 @@
 
     public bool IsMoreGeneral(IClassifier target) {
+      return IsMoreGeneral(target as ICondition);
+    }
+
+    public bool IsMoreGeneral(ICondition target) {
       var targetVector = target as CombinedIntegerVector;
       int curbounds;
@@ -201 +210 @@
       return true;
     }
+
+    #region ICondition Members
+    public bool Match(IInput target) {
+      return MatchInput(target);
+    }
+    #endregion
+
+    #region IAction Members
+    public bool Match(IAction target) {
+      return MatchAction(target);
+    }
+    #endregion
 
     private int NumberOfGeneralSymbols() {
@@ -233 +254 @@
     }
 
-    public override bool Equals(object obj) {
-      var cast = obj as CombinedIntegerVector;
-      if (cast != null) {
-        return this.Equals(cast);
-      }
-      return false;
-    }
-
-    public bool Equals(IClassifier other) {
-      var cast = other as CombinedIntegerVector;
+    public bool Identical(IClassifier target) {
+      var cast = target as CombinedIntegerVector;
       if (cast == null) { return false; }
       for (int i = 0; i < array.Length; i++) {
@@ -252 +265 @@
     }
 
+    public override bool Equals(object obj) {
+      return base.Equals(obj);
+    }
+
     public override int GetHashCode() {
-      int result = actionLength;
-      for (int i = 0; i < array.Length; i++) {
-        result ^= array[i];
-      }
-      return result.GetHashCode();
+      return base.GetHashCode();
+    }
+
+    [StorableClass]
+    [Item("CombinedIntegerVectorComparer", "")]
+    public class CombinedIntegerVectorComparer : Item, IEqualityComparer<CombinedIntegerVector>, IClassifierComparer {
+
+      [StorableConstructor]
+      protected CombinedIntegerVectorComparer(bool deserializing) : base(deserializing) { }
+      protected CombinedIntegerVectorComparer(CombinedIntegerVectorComparer original, Cloner cloner)
+        : base(original, cloner) {
+      }
+      public override IDeepCloneable Clone(Cloner cloner) {
+        return new CombinedIntegerVectorComparer(this, cloner);
+      }
+      public CombinedIntegerVectorComparer() : base() { }
+
+      public bool Equals(CombinedIntegerVector x, CombinedIntegerVector y) {
+        for (int i = 0; i < x.array.Length; i++) {
+          if (!x.array[i].Equals(y.array[i])) {
+            return false;
+          }
+        }
+        return true;
+      }
+
+      public int GetHashCode(CombinedIntegerVector obj) {
+        int result = obj.actionLength;
+        for (int i = 0; i < obj.array.Length; i++) {
+          result ^= obj.array[i];
+        }
+        return result.GetHashCode();
+      }
+
+      public bool Equals(IAction x, IAction y) {
+        var xCast = x as CombinedIntegerVector;
+        var yCast = y as CombinedIntegerVector;
+        return x != null && y != null && Equals(xCast, yCast);
+      }
+
+      public int GetHashCode(IAction obj) {
+        var objCast = obj as CombinedIntegerVector;
+        return objCast != null ? GetHashCode(objCast) : obj.GetHashCode();
+      }
     }
   }

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

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

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

@@ -34 +34 @@
 
     #region Parameter Properties
-    public ILookupParameter<IClassifier> CoverClassifierParameter {
-      get { return (ILookupParameter<IClassifier>)Parameters["CoverClassifier"]; }
+    public ILookupParameter<IInput> CoverInputParameter {
+      get { return (ILookupParameter<IInput>)Parameters["CoverInput"]; }
     }
-    public ILookupParameter<IClassifier> ActionParameter {
-      get { return (ILookupParameter<IClassifier>)Parameters["Action"]; }
+    public ILookupParameter<IAction> ActionParameter {
+      get { return (ILookupParameter<IAction>)Parameters["Action"]; }
     }
     public IValueLookupParameter<IClassifier> CreatedClassifierParameter {
@@ -62 +62 @@
     public CombinedIntegerVectorCoveringCreator()
       : base() {
-      Parameters.Add(new LookupParameter<IClassifier>("CoverClassifier"));
-      Parameters.Add(new LookupParameter<IClassifier>("Action"));
+      Parameters.Add(new LookupParameter<IInput>("CoverInput"));
+      Parameters.Add(new LookupParameter<IAction>("Action"));
       Parameters.Add(new ValueLookupParameter<IClassifier>("CreatedClassifier"));
       Parameters.Add(new LookupParameter<PercentValue>("ChangeSymbolProbability"));
@@ -70 +70 @@
 
     public override IOperation Apply() {
-      CombinedIntegerVector newCondition = (CombinedIntegerVector)CoverClassifierParameter.ActualValue.Condition.Clone();
+      CombinedIntegerVector newCondition = (CombinedIntegerVector)CoverInputParameter.ActualValue.Clone();
 
-      CombinedIntegerVector condition = (CombinedIntegerVector)CoverClassifierParameter.ActualValue.Condition;
-      CombinedIntegerVector action = (CombinedIntegerVector)ActionParameter.ActualValue.Action;
+      CombinedIntegerVector condition = (CombinedIntegerVector)CoverInputParameter.ActualValue;
+      CombinedIntegerVector action = (CombinedIntegerVector)ActionParameter.ActualValue;
 
       newCondition = UniformSomePositionManipulator.ManipulateCondition(RandomParameter.ActualValue, condition, newCondition, ChangeSymbolProbabilityParameter.ActualValue.Value);

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

@@ -89 +89 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <Private>False</Private>
-    </Reference>
     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <Private>False</Private>
@@ -149 +146 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
+      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
+      <Name>HeuristicLab.Core-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Encodings.ConditionActionEncoding\3.3\HeuristicLab.Encodings.ConditionActionEncoding-3.3.csproj">
       <Project>{422FB262-0845-4969-8D16-12F057AA90B1}</Project>

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

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