Changeset 6255 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification

Timestamp:

05/23/11 16:13:43 (14 years ago)

Author:

gkronber

Message:

#1450 Implemented changes in estimated values views for regression and classification solutions specific to ensemble solutions.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification

Files:

• ClassificationSolutionEstimatedClassValuesView.cs (modified) (3 diffs)
• DiscriminantFunctionClassificationSolutionEstimatedClassValuesView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionEstimatedClassValuesView.cs

@@ -33 +33 @@
   public partial class ClassificationSolutionEstimatedClassValuesView : ItemView, IClassificationSolutionEvaluationView {
     private const string TARGETVARIABLE_SERIES_NAME = "Target Variable";
+    private const string ESTIMATEDVALUES_SERIES_NAME = "Estimated Class Values (all)";
     private const string ESTIMATEDVALUES_TRAINING_SERIES_NAME = "Estimated Class Values (training)";
     private const string ESTIMATEDVALUES_TEST_SERIES_NAME = "Estimated Class Values (test)";
@@ -84 +85 @@
       if (InvokeRequired) Invoke((Action)UpdateEstimatedValues);
       else {
-        DoubleMatrix matrix = null;
+        StringMatrix matrix = null;
         if (Content != null) {
-          double[,] values = new double[Content.ProblemData.Dataset.Rows, 3];
-          // fill with NaN
-          for (int row = 0; row < Content.ProblemData.Dataset.Rows; row++)
-            for (int column = 0; column < 3; column++)
-              values[row, column] = double.NaN;
+          string[,] values = new string[Content.ProblemData.Dataset.Rows, 5];
 
           double[] target = Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable);
+          double[] estimated = Content.EstimatedClassValues.ToArray();
           for (int row = 0; row < target.Length; row++) {
-            values[row, 0] = target[row];
+            values[row, 0] = row.ToString();
+            values[row, 1] = target[row].ToString();
+            values[row, 2] = estimated[row].ToString();
           }
+
           var estimatedTraining = Content.EstimatedTrainingClassValues.GetEnumerator();
           estimatedTraining.MoveNext();
           foreach (var trainingRow in Content.ProblemData.TrainingIndizes) {
-            values[trainingRow, 1] = estimatedTraining.Current;
+            values[trainingRow, 3] = estimatedTraining.Current.ToString();
             estimatedTraining.MoveNext();
           }
@@ -105 +106 @@
           estimatedTest.MoveNext();
           foreach (var testRow in Content.ProblemData.TestIndizes) {
-            values[testRow, 2] = estimatedTest.Current;
+            values[testRow, 4] = estimatedTest.Current.ToString();
             estimatedTest.MoveNext();
           }
 
-          matrix = new DoubleMatrix(values);
-          matrix.ColumnNames = new string[] { TARGETVARIABLE_SERIES_NAME, ESTIMATEDVALUES_TRAINING_SERIES_NAME, ESTIMATEDVALUES_TEST_SERIES_NAME };
+          matrix = new StringMatrix(values);
+          matrix.ColumnNames = new string[] {"Id", TARGETVARIABLE_SERIES_NAME, ESTIMATEDVALUES_SERIES_NAME, ESTIMATEDVALUES_TRAINING_SERIES_NAME, ESTIMATEDVALUES_TEST_SERIES_NAME };
+          matrix.SortableView = true;
         }
         matrixView.Content = matrix;

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionEstimatedClassValuesView.cs

@@ -84 +84 @@
       if (InvokeRequired) Invoke((Action)UpdateEstimatedValues);
       else {
-        DoubleMatrix matrix = null;
+        StringMatrix matrix = null;
         if (Content != null) {
-          double[,] values = new double[Content.ProblemData.Dataset.Rows, 3];
+          string[,] values = new string[Content.ProblemData.Dataset.Rows, 5];
 
           double[] target = Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable);
@@ -92 +92 @@
           double[] estimatedValues = Content.EstimatedValues.ToArray();
           for (int row = 0; row < target.Length; row++) {
-            values[row, 0] = target[row];
-            values[row, 1] = estimatedClassValues[row];
-            values[row, 2] = estimatedValues[row];
+            values[row, 0] = row.ToString();
+            values[row, 1] = target[row].ToString();
+            values[row, 2] = estimatedClassValues[row].ToString();
+            values[row, 3] = estimatedValues[row].ToString();
           }
 
-          matrix = new DoubleMatrix(values);
-          matrix.ColumnNames = new string[] { TargetClassValuesSeriesname, EstimatedClassValuesSeriesName, EstimatedValuesSeriesName };
+          matrix = new StringMatrix(values);
+          matrix.ColumnNames = new string[] { "Id", TargetClassValuesSeriesname, EstimatedClassValuesSeriesName, EstimatedValuesSeriesName };
+          matrix.SortableView = true;
         }
         matrixView.Content = matrix;