Changeset 5664 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationRocCurvesView.cs

Timestamp:

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

Author:

gkronber

Message:

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

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationRocCurvesView.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Classification.Views/3.3/RocCurvesView.cs) (6 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationRocCurvesView.cs

@@ -31 +31 @@
 using HeuristicLab.MainForm.WindowsForms;
 namespace HeuristicLab.Problems.DataAnalysis.Classification.Views {
-  [View("ROC Curves View")]
-  [Content(typeof(SymbolicClassificationSolution))]
-  public partial class RocCurvesView : AsynchronousContentView {
+  [View("Discriminant function classification solution ROC curves view")]
+  [Content(typeof(IDiscriminantFunctionClassificationSolution))]
+  public partial class DiscriminantFunctionClassificationRocCurvesView : AsynchronousContentView {
     private const string xAxisTitle = "False Positive Rate";
     private const string yAxisTitle = "True Positive Rate";
@@ -40 +40 @@
     private Dictionary<string, List<ROCPoint>> cachedRocPoints;
 
-    public RocCurvesView() {
+    public DiscriminantFunctionClassificationRocCurvesView() {
       InitializeComponent();
 
@@ -61 +61 @@
     }
 
-    public new SymbolicClassificationSolution Content {
-      get { return (SymbolicClassificationSolution)base.Content; }
+    public new IDiscriminantFunctionClassificationSolution Content {
+      get { return (IDiscriminantFunctionClassificationSolution)base.Content; }
       set { base.Content = value; }
     }
@@ -68 +68 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.EstimatedValuesChanged += new EventHandler(Content_EstimatedValuesChanged);
+      Content.ModelChanged += new EventHandler(Content_ModelChanged);
       Content.ProblemDataChanged += new EventHandler(Content_ProblemDataChanged);
     }
     protected override void DeregisterContentEvents() {
       base.DeregisterContentEvents();
-      Content.EstimatedValuesChanged -= new EventHandler(Content_EstimatedValuesChanged);
+      Content.ModelChanged -= new EventHandler(Content_ModelChanged);
       Content.ProblemDataChanged -= new EventHandler(Content_ProblemDataChanged);
     }
 
-    private void Content_EstimatedValuesChanged(object sender, EventArgs e) {
+    private void Content_ModelChanged(object sender, EventArgs e) {
       UpdateChart();
     }
@@ -107 +107 @@
 
         double[] estimatedValues = Content.GetEstimatedValues(rows).ToArray();
-        double[] targetClassValues = Content.ProblemData.Dataset.GetEnumeratedVariableValues(Content.ProblemData.TargetVariable.Value, rows).ToArray();
+        double[] targetClassValues = Content.ProblemData.Dataset.GetEnumeratedVariableValues(Content.ProblemData.TargetVariable, rows).ToArray();
         double minThreshold = estimatedValues.Min();
         double maxThreshold = estimatedValues.Max();
@@ -114 +114 @@
         maxThreshold += thresholdIncrement;
 
-        List<double> classValues = Content.ProblemData.SortedClassValues.ToList();
+        List<double> classValues = Content.ProblemData.ClassValues.OrderBy(x => x).ToList();
 
         foreach (double classValue in classValues) {