Changeset 8573 for trunk/sources/HeuristicLab.Problems.DataAnalysis

Timestamp:

09/05/12 10:26:22 (12 years ago)

Author:

mkommend

Message:

#1928: Corrected bug in AccuracyMaximizationThresholdCalculator regarding multi-class classification.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ThresholdCalculators/AccuracyMaximizationThresholdCalculator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ThresholdCalculators/AccuracyMaximizationThresholdCalculator.cs

@@ -94 +94 @@
               //all negatives
             else {
+              //false positive
               if (pair.EstimatedValue > lowerThreshold && pair.EstimatedValue <= actualThreshold)
-                //false positive
                 classificationScore += problemData.GetClassificationPenalty(pair.TargetClassValue, classValues[i - 1]);
-              else
-                //true negative, consider only upper class
-                classificationScore += problemData.GetClassificationPenalty(pair.TargetClassValue, pair.TargetClassValue);
+              else if (pair.EstimatedValue <= lowerThreshold)
+                classificationScore += problemData.GetClassificationPenalty(pair.TargetClassValue, classValues[i - 2]);
+              else if (pair.EstimatedValue > actualThreshold) {
+                if (pair.TargetClassValue < classValues[i - 1]) //negative in wrong class, consider upper class
+                  classificationScore += problemData.GetClassificationPenalty(pair.TargetClassValue, classValues[i]);
+                else //true negative, must be optimized by the other thresholds
+                  classificationScore += problemData.GetClassificationPenalty(pair.TargetClassValue, pair.TargetClassValue);
+              }
             }
           }