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

Timestamp:

02/18/13 16:51:42 (12 years ago)

Author:

sforsten

Message:

#1980:

• made classes in Problems.ConditionActionClassification abstract
• added Problems.VariableVectorClassification and Problems.CombinedIntegerVectorClassification
• LCS works now with arbitrary problems, which implement ConditionActionClassificationProblem

Location:

branches/LearningClassifierSystems

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/CombinedIntegerVector.cs (modified) (2 diffs)
• HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/CombinedIntegerVectorComparer.cs (added)
• HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/HeuristicLab.Encodings.CombinedIntegerVectorEncoding-3.3.csproj (modified) (1 diff)

branches/LearningClassifierSystems

@@ -1 +1 @@
 *.suo
+bin

@@ -1 +1 @@
 *.suo
+bin

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -264 +263 @@
       return true;
     }
-
-    public override bool Equals(object obj) {
-      return base.Equals(obj);
-    }
-
-    public override int 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/HeuristicLab.Encodings.CombinedIntegerVectorEncoding-3.3.csproj

@@ -121 +121 @@
   <ItemGroup>
     <Compile Include="CombinedIntegerVector.cs" />
+    <Compile Include="CombinedIntegerVectorComparer.cs" />
     <Compile Include="CombinedIntegerVectorCreator.cs" />
     <Compile Include="CombinedIntegerVectorCrossover.cs" />

@@ -1 +1 @@
 *.suo
+bin