Changeset 5664 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4

Timestamp:

03/10/11 16:27:48 (13 years ago)

Author:

gkronber

Message:

#1418 ported ROC, confusion matrix and discriminant function classification views and fixed bug in threshold calculation.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• DiscriminantFunctionClassificationSolution.cs (modified) (2 diffs)
• Interfaces/Classification/IDiscriminantFunctionClassificationSolution.cs (modified) (1 diff)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/DiscriminantFunctionClassificationSolution.cs

@@ -77 +77 @@
         return Model.Thresholds;
       }
-      protected set { Model.Thresholds = value; }
+      set { Model.Thresholds = new List<double>(value); }
     }
 
@@ -117 +117 @@
       thresholds[thresholds.Length - 1] = double.PositiveInfinity;
 
+      double thresholdIncrement = (maxEstimatedValue - minEstimatedValue) / slices;
+
       for (int i = 1; i < thresholds.Length - 1; i++) {
         double lowerThreshold = thresholds[i - 1];
-        double actualThreshold = minEstimatedValue;
-        double thresholdIncrement = (maxEstimatedValue - minEstimatedValue) / slices;
-
+        double actualThreshold = Math.Max(lowerThreshold, minEstimatedValue);
         double lowestBestThreshold = double.NaN;
         double highestBestThreshold = double.NaN;

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IDiscriminantFunctionClassificationSolution.cs

@@ -31 +31 @@
     IEnumerable<double> GetEstimatedValues(IEnumerable<int> rows);
 
-    IEnumerable<double> Thresholds { get; }
+    IEnumerable<double> Thresholds { get; set; }
 
     event EventHandler ThresholdsChanged;