Changeset 8811 for branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification

Timestamp:

10/16/12 09:44:07 (12 years ago)

Author:

sforsten

Message:

#1776:

• merged r8534:8810 from trunk into branch

Location:

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views

Files:

• . (modified) (1 prop)
• 3.4/Classification/ClassificationEnsembleSolutionAccuracyToCoveredSamples.cs (modified) (1 diff)
• 3.4/Classification/ClassificationEnsembleSolutionConfidenceAccuracyDependence.cs (modified) (1 diff)
• 3.4/Classification/ClassificationEnsembleSolutionEstimatedClassValuesView.Designer.cs (modified) (7 diffs)
• 3.4/Classification/ClassificationEnsembleSolutionEstimatedClassValuesView.cs (modified) (4 diffs)
• 3.4/Classification/ClassificationFeatureCorrelationView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationFeatureCorrelationView.Designer.cs)
• 3.4/Classification/ClassificationFeatureCorrelationView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationFeatureCorrelationView.cs)
• 3.4/Classification/ClassificationTimeframeFeatureCorrelationView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationTimeframeFeatureCorrelationView.Designer.cs)
• 3.4/Classification/ClassificationTimeframeFeatureCorrelationView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationTimeframeFeatureCorrelationView.cs)
• 3.4/Classification/DiscriminantFunctionClassificationModelView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationModelView.Designer.cs)
• 3.4/Classification/DiscriminantFunctionClassificationModelView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationModelView.cs)
• 3.4/Classification/DiscriminantFunctionClassificationRocCurvesView.cs (modified) (1 diff)
• 3.4/Classification/DiscriminantFunctionClassificationSolutionThresholdView.cs (modified) (1 diff)

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionAccuracyToCoveredSamples.cs

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.MainForm;
-using HeuristicLab.Problems.DataAnalysis.Interfaces;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionConfidenceAccuracyDependence.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.MainForm;
-using HeuristicLab.Problems.DataAnalysis.Interfaces;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionEstimatedClassValuesView.Designer.cs

@@ -46 +46 @@
       this.SamplesComboBox = new System.Windows.Forms.ComboBox();
       this.CorrectClassifiedConfidenceLabel = new System.Windows.Forms.Label();
-      this.CorrectClassifiedConfidence = new System.Windows.Forms.Label();
       this.WrongClassifiedConfidenceLabel = new System.Windows.Forms.Label();
-      this.WrongClassifiedConfidence = new System.Windows.Forms.Label();
+      this.CorrectClassifiedConfidence = new System.Windows.Forms.TextBox();
+      this.WrongClassifiedConfidence = new System.Windows.Forms.TextBox();
       this.SuspendLayout();
       // 
@@ -68 +68 @@
       this.SamplesComboBox.Location = new System.Drawing.Point(4, 4);
       this.SamplesComboBox.Name = "SamplesComboBox";
-      this.SamplesComboBox.Size = new System.Drawing.Size(309, 21);
+      this.SamplesComboBox.Size = new System.Drawing.Size(230, 21);
       this.SamplesComboBox.TabIndex = 2;
       this.SamplesComboBox.SelectedIndexChanged += new System.EventHandler(this.SamplesComboBox_SelectedIndexChanged);
@@ -76 +76 @@
       this.CorrectClassifiedConfidenceLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.CorrectClassifiedConfidenceLabel.AutoSize = true;
-      this.CorrectClassifiedConfidenceLabel.Location = new System.Drawing.Point(319, 7);
+      this.CorrectClassifiedConfidenceLabel.Location = new System.Drawing.Point(240, 7);
       this.CorrectClassifiedConfidenceLabel.Name = "CorrectClassifiedConfidenceLabel";
       this.CorrectClassifiedConfidenceLabel.Size = new System.Drawing.Size(103, 13);
@@ -82 +82 @@
       this.CorrectClassifiedConfidenceLabel.Text = "Conf. Correct Class.:";
       // 
-      // CorrectClassifiedConfidence
-      // 
-      this.CorrectClassifiedConfidence.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.CorrectClassifiedConfidence.AutoSize = true;
-      this.CorrectClassifiedConfidence.Location = new System.Drawing.Point(428, 7);
-      this.CorrectClassifiedConfidence.Name = "CorrectClassifiedConfidence";
-      this.CorrectClassifiedConfidence.Size = new System.Drawing.Size(22, 13);
-      this.CorrectClassifiedConfidence.TabIndex = 4;
-      this.CorrectClassifiedConfidence.Text = "0.0";
-      // 
       // WrongClassifiedConfidenceLabel
       // 
       this.WrongClassifiedConfidenceLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.WrongClassifiedConfidenceLabel.AutoSize = true;
-      this.WrongClassifiedConfidenceLabel.Location = new System.Drawing.Point(481, 7);
+      this.WrongClassifiedConfidenceLabel.Location = new System.Drawing.Point(455, 7);
       this.WrongClassifiedConfidenceLabel.Name = "WrongClassifiedConfidenceLabel";
       this.WrongClassifiedConfidenceLabel.Size = new System.Drawing.Size(101, 13);
@@ -102 +92 @@
       this.WrongClassifiedConfidenceLabel.Text = "Conf. Wrong Class.:";
       // 
+      // CorrectClassifiedConfidence
+      // 
+      this.CorrectClassifiedConfidence.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.CorrectClassifiedConfidence.Location = new System.Drawing.Point(349, 5);
+      this.CorrectClassifiedConfidence.Name = "CorrectClassifiedConfidence";
+      this.CorrectClassifiedConfidence.ReadOnly = true;
+      this.CorrectClassifiedConfidence.Size = new System.Drawing.Size(100, 20);
+      this.CorrectClassifiedConfidence.TabIndex = 7;
+      this.CorrectClassifiedConfidence.Text = "0.0";
+      // 
       // WrongClassifiedConfidence
       // 
       this.WrongClassifiedConfidence.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.WrongClassifiedConfidence.AutoSize = true;
-      this.WrongClassifiedConfidence.Location = new System.Drawing.Point(588, 7);
+      this.WrongClassifiedConfidence.Location = new System.Drawing.Point(562, 4);
       this.WrongClassifiedConfidence.Name = "WrongClassifiedConfidence";
-      this.WrongClassifiedConfidence.Size = new System.Drawing.Size(22, 13);
-      this.WrongClassifiedConfidence.TabIndex = 6;
+      this.WrongClassifiedConfidence.ReadOnly = true;
+      this.WrongClassifiedConfidence.Size = new System.Drawing.Size(94, 20);
+      this.WrongClassifiedConfidence.TabIndex = 8;
       this.WrongClassifiedConfidence.Text = "0.0";
       // 
       // ClassificationEnsembleSolutionEstimatedClassValuesView
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.WrongClassifiedConfidence);
+      this.Controls.Add(this.CorrectClassifiedConfidence);
       this.Controls.Add(this.WrongClassifiedConfidenceLabel);
-      this.Controls.Add(this.CorrectClassifiedConfidence);
       this.Controls.Add(this.CorrectClassifiedConfidenceLabel);
       this.Controls.Add(this.SamplesComboBox);
@@ -126 +125 @@
       this.Controls.SetChildIndex(this.SamplesComboBox, 0);
       this.Controls.SetChildIndex(this.CorrectClassifiedConfidenceLabel, 0);
+      this.Controls.SetChildIndex(this.WrongClassifiedConfidenceLabel, 0);
       this.Controls.SetChildIndex(this.CorrectClassifiedConfidence, 0);
-      this.Controls.SetChildIndex(this.WrongClassifiedConfidenceLabel, 0);
       this.Controls.SetChildIndex(this.WrongClassifiedConfidence, 0);
       this.ResumeLayout(false);
@@ -138 +137 @@
     private System.Windows.Forms.ComboBox SamplesComboBox;
     private System.Windows.Forms.Label CorrectClassifiedConfidenceLabel;
-    private System.Windows.Forms.Label CorrectClassifiedConfidence;
     private System.Windows.Forms.Label WrongClassifiedConfidenceLabel;
-    private System.Windows.Forms.Label WrongClassifiedConfidence;
+    private System.Windows.Forms.TextBox CorrectClassifiedConfidence;
+    private System.Windows.Forms.TextBox WrongClassifiedConfidence;
 
   }

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionEstimatedClassValuesView.cs

@@ -19 +19 @@
  */
 #endregion
+
 using System;
 using System.Collections.Generic;
@@ -28 +29 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Problems.DataAnalysis.Interfaces;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
@@ -96 +96 @@
 
       IEnumerable<IClassificationSolution> solutions = Content.ClassificationSolutions.CheckedItems;
-      int classValuesCount = Content.ProblemData.ClassValues.Count;
+      int classValuesCount = Content.ProblemData.Classes;
       int solutionsCount = solutions.Count();
       string[,] values = new string[indizes.Length, 5 + classValuesCount + solutionsCount];
@@ -143 +143 @@
           var groups =
             estimatedValuesVector[i].GroupBy(x => x).Select(g => new { Key = g.Key, Count = g.Count() }).ToList();
-          for (int classIndex = 0; classIndex < Content.ProblemData.ClassValues.Count; classIndex++) {
-            var group = groups.Where(g => g.Key == Content.ProblemData.ClassValues[classIndex]).SingleOrDefault();
+
+          for (int classIndex = 0; classIndex < Content.ProblemData.Classes; classIndex++) {
+            var group = groups.Where(g => g.Key == Content.ProblemData.ClassValues.ElementAt(classIndex)).SingleOrDefault();
             if (group == null) values[i, 5 + classIndex] = 0.ToString();
             else values[i, 5 + classIndex] = group.Count.ToString();

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

@@ -114 +114 @@
         maxThreshold += thresholdIncrement;
 
-        List<double> classValues = Content.ProblemData.ClassValues.OrderBy(x => x).ToList();
+        List<double> classValues = Content.Model.ClassValues.ToList();
 
         foreach (double classValue in classValues) {

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionThresholdView.cs

@@ -238 +238 @@
       double[] thresholds = Content.Model.Thresholds.ToArray();
       thresholds[classIndex] = e.NewLocationY;
+      Array.Sort(thresholds);
       Content.Model.SetThresholdsAndClassValues(thresholds, Content.Model.ClassValues);
     }