Changeset 6238 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views

Timestamp:

05/20/11 15:07:45 (13 years ago)

Author:

gkronber

Message:

#1450 adapted views for regression solution to work for ensembles of regression solutions as well.

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (2 diffs)
• Regression/RegressionEnsembleSolutionLineChartView.Designer.cs (deleted)
• Regression/RegressionEnsembleSolutionLineChartView.cs (deleted)
• Regression/RegressionEnsembleSolutionScatterPlotView.Designer.cs (deleted)
• Regression/RegressionEnsembleSolutionScatterPlotView.cs (deleted)
• Regression/RegressionSolutionEstimatedValuesView.cs (modified) (2 diffs)
• Regression/RegressionSolutionLineChartView.cs (modified) (5 diffs)
• Regression/RegressionSolutionScatterPlotView.cs (modified) (1 diff)
• RegressionEnsembleSolutionView.Designer.cs (deleted)
• RegressionEnsembleSolutionView.cs (deleted)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -158 +158 @@
       <DependentUpon>ClusteringSolutionView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Interfaces\IRegressionEnsembleSolutionEvaluationView.cs" />
-    <Compile Include="RegressionEnsembleSolutionView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="RegressionEnsembleSolutionView.Designer.cs">
-      <DependentUpon>RegressionEnsembleSolutionView.cs</DependentUpon>
-    </Compile>
     <Compile Include="DiscriminantFunctionClassificationSolutionView.cs">
       <SubType>UserControl</SubType>
@@ -193 +186 @@
     <Compile Include="RegressionSolutionView.Designer.cs">
       <DependentUpon>RegressionSolutionView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Regression\RegressionEnsembleSolutionLineChartView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Regression\RegressionEnsembleSolutionLineChartView.Designer.cs">
-      <DependentUpon>RegressionEnsembleSolutionLineChartView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Regression\RegressionEnsembleSolutionScatterPlotView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Regression\RegressionEnsembleSolutionScatterPlotView.Designer.cs">
-      <DependentUpon>RegressionEnsembleSolutionScatterPlotView.cs</DependentUpon>
     </Compile>
     <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs">

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionEstimatedValuesView.cs

@@ -32 +32 @@
   [Content(typeof(IRegressionSolution))]
   public partial class RegressionSolutionEstimatedValuesView : ItemView, IRegressionSolutionEvaluationView {
-    private const string TARGETVARIABLE_SERIES_NAME = "TargetVariable";
-    private const string ESTIMATEDVALUES_SERIES_NAME = "EstimatedValues";
+    private const string TARGETVARIABLE_SERIES_NAME = "Target Variable";
+    private const string ESTIMATEDVALUES_TRAINING_SERIES_NAME = "Estimated Values (training)";
+    private const string ESTIMATEDVALUES_TEST_SERIES_NAME = "Estimated Values (test)";
 
     public new IRegressionSolution Content {
@@ -85 +86 @@
         DoubleMatrix matrix = null;
         if (Content != null) {
-          double[,] values = new double[Content.ProblemData.Dataset.Rows, 4];
+          double[,] values = new double[Content.ProblemData.Dataset.Rows, 5];
+          // initialize to double.NaN
+          for (int row = 0; row < Content.ProblemData.Dataset.Rows; row++)
+            for (int column = 0; column < 5; column++)
+              values[row, column] = double.NaN;
 
           double[] target = Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable);
-          double[] estimated = Content.EstimatedValues.ToArray();
+          var estimated_training = Content.EstimatedTrainingValues.GetEnumerator();
+          var estimated_test = Content.EstimatedTestValues.GetEnumerator();
+
+          foreach (var row in Content.ProblemData.TrainingIndizes) {
+            estimated_training.MoveNext();
+            values[row, 1] = estimated_training.Current;
+          }
+
+          foreach (var row in Content.ProblemData.TestIndizes) {
+            estimated_test.MoveNext();
+            values[row, 2] = estimated_test.Current;
+          }
+
           for (int row = 0; row < target.Length; row++) {
             values[row, 0] = target[row];
-            values[row, 1] = estimated[row];
-            values[row, 2] = Math.Abs(estimated[row] - target[row]);
-            values[row, 3] = Math.Abs(values[row, 2] / target[row]);
+            double est = values[row, 1];
+            if (!double.IsNaN(est)) {
+              values[row, 3] = Math.Abs(est - target[row]);
+              values[row, 4] = Math.Abs(values[row, 3] / target[row]);
+            }
           }
 
           matrix = new DoubleMatrix(values);
-          matrix.ColumnNames = new string[] { TARGETVARIABLE_SERIES_NAME, ESTIMATEDVALUES_SERIES_NAME, "Absolute Error", "Relative Error" };
+          matrix.ColumnNames = new string[] { TARGETVARIABLE_SERIES_NAME, ESTIMATEDVALUES_TRAINING_SERIES_NAME, ESTIMATEDVALUES_TEST_SERIES_NAME, "Absolute Error (training)", "Relative Error (training)" };
         }
         matrixView.Content = matrix;

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs

@@ -32 +32 @@
   [Content(typeof(IRegressionSolution))]
   public partial class RegressionSolutionLineChartView : ItemView, IRegressionSolutionEvaluationView {
-    private const string TARGETVARIABLE_SERIES_NAME = "TargetVariable";
-    private const string ESTIMATEDVALUES_SERIES_NAME = "EstimatedValues";
+    private const string TARGETVARIABLE_SERIES_NAME = "Target Variable";
+    private const string ESTIMATEDVALUES_TRAINING_SERIES_NAME = "Estimated Values (training)";
+    private const string ESTIMATEDVALUES_TEST_SERIES_NAME = "Estimated Values (test)";
 
     public new IRegressionSolution Content {
@@ -47 +48 @@
       this.chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
       this.chart.ChartAreas[0].AxisX.ScaleView.Zoomable = true;
+      this.chart.ChartAreas[0].AxisX.IsStartedFromZero = true;
       this.chart.ChartAreas[0].CursorX.Interval = 1;
 
@@ -57 +59 @@
       this.chart.Series.Clear();
       if (Content != null) {
+        this.chart.ChartAreas[0].AxisX.Minimum = 0;
+        this.chart.ChartAreas[0].AxisX.Maximum = Content.ProblemData.Dataset.Rows - 1;
+
         this.chart.Series.Add(TARGETVARIABLE_SERIES_NAME);
         this.chart.Series[TARGETVARIABLE_SERIES_NAME].LegendText = Content.ProblemData.TargetVariable;
         this.chart.Series[TARGETVARIABLE_SERIES_NAME].ChartType = SeriesChartType.FastLine;
-        this.chart.Series[TARGETVARIABLE_SERIES_NAME].Points.DataBindY(Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable));
+        this.chart.Series[TARGETVARIABLE_SERIES_NAME].Points.DataBindXY(Enumerable.Range(0, Content.ProblemData.Dataset.Rows).ToArray(),
+          Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable));
+
+        this.chart.Series.Add(ESTIMATEDVALUES_TRAINING_SERIES_NAME);
+        this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].LegendText = ESTIMATEDVALUES_TRAINING_SERIES_NAME;
+        this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].ChartType = SeriesChartType.FastLine;
+        this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].Points.DataBindXY(Content.ProblemData.TrainingIndizes.ToArray(),
+          Content.EstimatedTrainingValues.ToArray());
+        this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].Tag = Content;
+
+        this.chart.Series.Add(ESTIMATEDVALUES_TEST_SERIES_NAME);
+        this.chart.Series[ESTIMATEDVALUES_TEST_SERIES_NAME].LegendText = ESTIMATEDVALUES_TEST_SERIES_NAME;
+        this.chart.Series[ESTIMATEDVALUES_TEST_SERIES_NAME].ChartType = SeriesChartType.FastLine;
+        this.chart.Series[ESTIMATEDVALUES_TEST_SERIES_NAME].Points.DataBindXY(Content.ProblemData.TestIndizes.ToArray(),
+          Content.EstimatedTestValues.ToArray());
+        this.chart.Series[ESTIMATEDVALUES_TEST_SERIES_NAME].Tag = Content;
+        UpdateCursorInterval();
         this.UpdateStripLines();
-
-        this.chart.Series.Add(ESTIMATEDVALUES_SERIES_NAME);
-        this.chart.Series[ESTIMATEDVALUES_SERIES_NAME].LegendText = Content.ItemName;
-        this.chart.Series[ESTIMATEDVALUES_SERIES_NAME].ChartType = SeriesChartType.FastLine;
-        this.chart.Series[ESTIMATEDVALUES_SERIES_NAME].Points.DataBindY(Content.EstimatedValues.ToArray());
-        this.chart.Series[ESTIMATEDVALUES_SERIES_NAME].Tag = Content;
-        UpdateCursorInterval();
       }
     }
 
     private void UpdateCursorInterval() {
-      var estimatedValues = this.chart.Series[ESTIMATEDVALUES_SERIES_NAME].Points.Select(x => x.YValues[0]).DefaultIfEmpty(1.0);
+      var estimatedValues = this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].Points.Select(x => x.YValues[0]).DefaultIfEmpty(1.0);
       var targetValues = this.chart.Series[TARGETVARIABLE_SERIES_NAME].Points.Select(x => x.YValues[0]).DefaultIfEmpty(1.0);
       double estimatedValuesRange = estimatedValues.Max() - estimatedValues.Min();
@@ -112 +126 @@
       else {
         if (this.chart.Series.Count > 0) {
-          Series s = this.chart.Series.SingleOrDefault(x => x.Tag == Content);
+          Series s = this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME];
           if (s != null) {
-            s.Points.DataBindY(Content.EstimatedValues.ToArray());
-            s.LegendText = Content.ItemName;
-            this.UpdateStripLines();
-            UpdateCursorInterval();
+            s.Points.DataBindXY(Content.ProblemData.TrainingIndizes.ToArray(), Content.EstimatedTrainingValues.ToArray());
+            s.LegendText = ESTIMATEDVALUES_TRAINING_SERIES_NAME;
           }
+          s = this.chart.Series[ESTIMATEDVALUES_TEST_SERIES_NAME];
+          if (s != null) {
+            s.Points.DataBindXY(Content.ProblemData.TestIndizes.ToArray(), Content.EstimatedTestValues.ToArray());
+            s.LegendText = ESTIMATEDVALUES_TEST_SERIES_NAME;
+          }
+          this.UpdateStripLines();
+          UpdateCursorInterval();
         }
       }
@@ -136 +155 @@
     private void UpdateStripLines() {
       this.chart.ChartAreas[0].AxisX.StripLines.Clear();
-      this.CreateAndAddStripLine("Training", Color.FromArgb(20, Color.Green),
-        Content.ProblemData.TrainingPartition.Start,
-        Content.ProblemData.TrainingPartition.End);
-      this.CreateAndAddStripLine("Test", Color.FromArgb(20, Color.Red),
-        Content.ProblemData.TestPartition.Start,
-        Content.ProblemData.TestPartition.End);
-    }
-
-    private void CreateAndAddStripLine(string title, Color c, int start, int end) {
+
+      int[] attr = new int[Content.ProblemData.Dataset.Rows + 1]; // add a virtual last row that is again empty to simplify loop further down
+      foreach (var row in Content.ProblemData.TrainingIndizes) {
+        attr[row] += 1;
+      }
+      foreach (var row in Content.ProblemData.TestIndizes) {
+        attr[row] += 2;
+      }
+      int start = 0;
+      int curAttr = attr[start];
+      for (int row = 0; row < attr.Length; row++) {
+        if (attr[row] != curAttr) {
+          switch (curAttr) {
+            case 0: break;
+            case 1:
+              this.CreateAndAddStripLine("Training", start, row, Color.FromArgb(40, Color.Green), Color.Transparent);
+              break;
+            case 2:
+              this.CreateAndAddStripLine("Test", start, row, Color.FromArgb(40, Color.Red), Color.Transparent);
+              break;
+            case 3:
+              this.CreateAndAddStripLine("Training and Test", start, row, Color.FromArgb(40, Color.Green), Color.FromArgb(40, Color.Red), ChartHatchStyle.WideUpwardDiagonal);
+              break;
+            default:
+              // should not happen
+              break;
+          }
+          curAttr = attr[row];
+          start = row;
+        }
+      }
+    }
+
+    private void CreateAndAddStripLine(string title, int start, int end, Color color, Color secondColor, ChartHatchStyle hatchStyle = ChartHatchStyle.None) {
       StripLine stripLine = new StripLine();
-      stripLine.BackColor = c;
+      stripLine.BackColor = color;
+      stripLine.BackSecondaryColor = secondColor;
+      stripLine.BackHatchStyle = hatchStyle;
       stripLine.Text = title;
       stripLine.Font = new Font("Times New Roman", 12, FontStyle.Bold);
-      stripLine.StripWidth = end - start;
+      stripLine.StripWidth = end - start - 1; // strip range is [start .. end] inclusive, but we evaluate [start..end[ (end is exclusive)
       stripLine.IntervalOffset = start;
       this.chart.ChartAreas[0].AxisX.StripLines.Add(stripLine);

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionScatterPlotView.cs

@@ -139 +139 @@
            dataset.GetEnumeratedVariableValues(targetVariableName, Content.ProblemData.TestIndizes).ToArray(), "");
 
-        double max = Math.Max(Content.EstimatedValues.Max(), dataset.GetVariableValues(targetVariableName).Max());
-        double min = Math.Min(Content.EstimatedValues.Min(), dataset.GetVariableValues(targetVariableName).Min());
+        double max = Content.EstimatedTrainingValues.Concat(Content.EstimatedTestValues.Concat(Content.EstimatedValues.Concat(dataset.GetVariableValues(targetVariableName)))).Max();
+        double min = Content.EstimatedTrainingValues.Concat(Content.EstimatedTestValues.Concat(Content.EstimatedValues.Concat(dataset.GetVariableValues(targetVariableName)))).Min();
 
         max = max + 0.2 * Math.Abs(max);