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

Timestamp:

01/03/13 20:19:00 (12 years ago)

Author:

sforsten

Message:

#1980:

• included an adapted version of GA correctly
• added action set subsumption
• added deletion after GA and before covering

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3

Files:

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

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

@@ -48 +48 @@
     public IntMatrix Bounds { get { return (IntMatrix)bounds.Clone(); } }
 
+    public int ConditionLength { get { return Length - actionLength; } }
+
     [StorableConstructor]
     protected CombinedIntegerVector(bool deserializing) : base(deserializing) { }
@@ -184 +186 @@
     }
 
+    public bool IsMoreGeneral(IClassifier target) {
+      var targetVector = target as CombinedIntegerVector;
+      int curbounds;
+
+      if (this.NumberOfGeneralSymbols() <= targetVector.NumberOfGeneralSymbols()) return false;
+
+      for (int i = 0; i < ConditionLength; i++) {
+        curbounds = i % bounds.Rows;
+        if (this[i] != bounds[curbounds, 1] - 1 && this[i] != targetVector[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    private int NumberOfGeneralSymbols() {
+      int numberOfGeneralSymbols = 0;
+      int curbounds;
+
+      for (int i = 0; i < ConditionLength; i++) {
+        curbounds = i % bounds.Rows;
+        numberOfGeneralSymbols += this[i] == bounds[curbounds, 1] - 1 ? 1 : 0;
+      }
+
+      return numberOfGeneralSymbols;
+    }
+
     public override string ToString() {
       StringBuilder strBuilder = new StringBuilder(this.Length);

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

@@ -95 +95 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />