Changeset 9119 for branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/OneR.cs

Timestamp:

01/07/13 17:33:56 (11 years ago)

Author:

sforsten

Message:

#1998:

• added OneRClassificationModelView
• added ClassificationSolutionComparisonView
• added several calculators (ConfusionMatrixCalculator, FOneScoreCalculator, MatthewsCorrelationCoefficientCalculator)
• fixed bug in OneR
• added StorableClass and Item attribute to several classes

File:

• branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/OneR.cs (modified) (3 diffs)

branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/OneR.cs

@@ -95 +95 @@
         double curSplit = Double.NegativeInfinity;
         Dictionary<double, double> splits = new Dictionary<double, double>();
-        int curBucketSize = 0;
+        bool newBucket = true;
         bool done = false;
-        for (int curRow = 0; curRow < inputVariableValues.Length; curRow++) {
-          if (curBucketSize < minBucketSize) {
-            curSplit = inputVariableValues[curRow];
-            classCount[classValuesInDataset[curRow]] += 1;
-            curBucketSize++;
-            continue;
-          }
+        int curRow = 0;
+        while (curRow < inputVariableValues.Length) {
+          if (newBucket) {
+            for (int i = 0; i < minBucketSize && curRow + i < inputVariableValues.Length; i++) {
+              classCount[classValuesInDataset[curRow + i]] += 1;
+            }
+            curRow += minBucketSize;
+            if (curRow >= inputVariableValues.Length) {
+              break;
+            }
+            curSplit = inputVariableValues[curRow];
+            curRow = SetCurRowCorrectly(curRow, inputVariableValues, classValuesInDataset, classCount, curSplit);
+            newBucket = false;
+          }
+
 
           if (ExistsDominatingClass(classCount, out dominatingClass)) {
-            int i = 1;
-            while (curRow + i < classValuesInDataset.Length
-              && classValuesInDataset[curRow + i] == dominatingClass) {
-              curSplit = inputVariableValues[curRow + i];
-              classCount[classValuesInDataset[curRow]] += 1;
-              i++;
+            while (curRow + 1 < classValuesInDataset.Length &&
+              IsNextSplitStillDominationClass(curRow, inputVariableValues, classValuesInDataset, curSplit, dominatingClass)) {
+              // curRow + i < classValuesInDataset.Length && classValuesInDataset[curRow + i] == dominatingClass) {
+              curSplit = inputVariableValues[curRow + 1];
+              classCount[classValuesInDataset[curRow + 1]] += 1;
+              curRow++;
+              curRow = SetCurRowCorrectly(curRow, inputVariableValues, classValuesInDataset, classCount, curSplit);
             }
 
             curCorrectClassified += classCount[dominatingClass];
-            done = curRow + i >= inputVariableValues.Length;
+            done = curRow >= inputVariableValues.Length - 1;
 
             if (done) {
@@ -123 +132 @@
             }
 
+            curRow++;
             //intervals exclude end
-            curSplit = inputVariableValues[curRow + i];
+            curSplit = inputVariableValues[curRow];
             splits.Add(curSplit, dominatingClass);
 
-            //intervals exclude start
-            curSplit = inputVariableValues[curRow + i - 1];
+            //intervals include start
+            curSplit = inputVariableValues[curRow];
             classCount = PrepareClassCountDictionary(classValues);
-            curBucketSize = 0;
-            curRow += i - 1;
-
+            newBucket = true;
           } else {
             curSplit = inputVariableValues[curRow];
             classCount[classValuesInDataset[curRow]] += 1;
-            curBucketSize++;
+            curRow = SetCurRowCorrectly(curRow, inputVariableValues, classValuesInDataset, classCount, curSplit);
           }
         }
@@ -173 +181 @@
 
       return solution;
+    }
+
+    private static bool IsNextSplitStillDominationClass(int curRow, double[] inputVariableValues, double[] classValuesInDataset, double curSplit, double dominatingClass) {
+      if (curRow >= classValuesInDataset.Length) {
+        return false;
+      }
+      double nextSplit = inputVariableValues[curRow + 1];
+      int i = 1;
+      while (curRow + i < classValuesInDataset.Length
+        && inputVariableValues[curRow + i] == nextSplit
+        && classValuesInDataset[curRow + i] == dominatingClass) {
+        i++;
+      }
+      if (curRow + i >= classValuesInDataset.Length) {
+        return true;
+      }
+      if (inputVariableValues[curRow + i] != nextSplit) {
+        return true;
+      }
+      // the next split would also contain values of a class which 
+      // is not dominating (classValuesInDataset[curRow + i] != dominatingClass)
+      return false;
+    }
+
+    private static int SetCurRowCorrectly(int curRow, double[] inputVariableValues, double[] classValuesInDataset, Dictionary<double, int> classCount, double curSplit) {
+      while (curRow + 1 < inputVariableValues.Length && inputVariableValues[curRow + 1] == curSplit) {
+        curRow++;
+        classCount[classValuesInDataset[curRow]] += 1;
+      }
+      return curRow;
     }