Changeset 9175 for branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding

Timestamp:

01/21/13 16:33:47 (12 years ago)

Author:

sforsten

Message:

#1980:

• added BestTrainingXCSSolutionAnalyzer and CurrentXCSSolutionAnalyzer
• fixed bug: Equals method was not correct in CombinedIntegerVector

File:

• branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/CombinedIntegerVector.cs (modified) (4 diffs)

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

@@ -142 +142 @@
       IntMatrix actionBounds = new IntMatrix(actionPartLength, bounds.Columns);
       int start = length - actionPartLength;
+      int rows = bounds.Rows;
       for (int i = start; i < length; i++) {
-        int pos = i % bounds.Rows;
+        int pos = i % rows;
         for (int j = 0; j < bounds.Columns; j++) {
           actionBounds[i - start, j] = bounds[pos, j];
@@ -160 +161 @@
         curbounds = i % bounds.Rows;
         //if don't care symbol is matched, next indices can be checked
-        if (this[i].Equals(bounds[curbounds, 1] - 1)) {
+        if (this[i] == bounds[curbounds, 1] - 1) {
           continue;
         }
-        if (!this[i].Equals(targetVector[i])) {
+        if (this[i] != targetVector[i]) {
           return false;
         }
@@ -241 +242 @@
 
     public bool Equals(IClassifier other) {
-      return this.MatchAction(other) && this.MatchCondition(other);
+      var cast = other as CombinedIntegerVector;
+      if (cast == null) { return false; }
+      for (int i = 0; i < array.Length; i++) {
+        if (!array[i].Equals(cast.array[i])) {
+          return false;
+        }
+      }
+      return true;
     }
 
@@ -251 +259 @@
       return result.GetHashCode();
     }
-
-    public bool Identical(IClassifier classifier) {
-      var cast = classifier as CombinedIntegerVector;
-      if (cast != null) {
-        for (int i = 0; i < array.Length; i++) {
-          if (!array[i].Equals(cast.array[i])) {
-            return false;
-          }
-        }
-      }
-      return true;
-    }
   }
 }