Changeset 13856

Timestamp:

05/24/16 14:44:25 (9 years ago)

Author:

pfleck

Message:

#2597

• Generalized GaussianProcessRegressionSolution...Views to ConfidenceBasedRegressionSolution...Views.
• Added "all" column for variances.

Location:

branches/HeuristicLab.RegressionSolutionGradientView

Files:

• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceBoundRegressionSolutionEstimatedValuesView.Designer.cs (moved) (moved from branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessRegressionSolutionEstimatedValuesView.Designer.cs) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceBoundRegressionSolutionEstimatedValuesView.cs (moved) (moved from branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessRegressionSolutionEstimatedValuesView.cs) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceBoundRegressionSolutionLineChartView.Designer.cs (moved) (moved from branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessRegressionSolutionLineChartView.Designer.cs) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceBoundRegressionSolutionLineChartView.cs (moved) (moved from branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessRegressionSolutionLineChartView.cs) (2 diffs)

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj

@@ -189 +189 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GaussianProcessRegressionSolutionEstimatedValuesView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="GaussianProcessRegressionSolutionEstimatedValuesView.Designer.cs">
-      <DependentUpon>GaussianProcessRegressionSolutionEstimatedValuesView.cs</DependentUpon>
-    </Compile>
     <Compile Include="MeanProdView.cs">
       <SubType>UserControl</SubType>
@@ -244 +238 @@
     </Compile>
     <Compile Include="Plugin.cs" />
-    <Compile Include="GaussianProcessRegressionSolutionLineChartView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="GaussianProcessRegressionSolutionLineChartView.Designer.cs">
-      <DependentUpon>GaussianProcessRegressionSolutionLineChartView.cs</DependentUpon>
-    </Compile>
     <Compile Include="SupportVectorMachineModelSupportVectorsView.cs">
       <SubType>UserControl</SubType>

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -288 +288 @@
     <Compile Include="GradientChartConfigurationDialog.Designer.cs">
       <DependentUpon>GradientChartConfigurationDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Regression\ConfidenceBoundRegressionSolutionEstimatedValuesView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Regression\ConfidenceBoundRegressionSolutionEstimatedValuesView.Designer.cs">
+      <DependentUpon>ConfidenceBoundRegressionSolutionEstimatedValuesView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Regression\ConfidenceBoundRegressionSolutionLineChartView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Regression\ConfidenceBoundRegressionSolutionLineChartView.Designer.cs">
+      <DependentUpon>ConfidenceBoundRegressionSolutionLineChartView.cs</DependentUpon>
     </Compile>
     <Compile Include="Regression\RegressionSolutionGradientView.cs">

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceBoundRegressionSolutionEstimatedValuesView.Designer.cs

@@ -20 +20 @@
 #endregion
 namespace HeuristicLab.Algorithms.DataAnalysis.Views {
-  partial class GaussianProcessRegressionSolutionEstimatedValuesView {
+  partial class ConfidenceBoundRegressionSolutionEstimatedValuesView {
     /// <summary> 
     /// Required designer variable.

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceBoundRegressionSolutionEstimatedValuesView.cs

@@ -23 +23 @@
 using HeuristicLab.Data;
 using HeuristicLab.MainForm;
+using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.DataAnalysis.Views;
 
 namespace HeuristicLab.Algorithms.DataAnalysis.Views {
   [View("Estimated Values")]
-  [Content(typeof(GaussianProcessRegressionSolution), false)]
-  public partial class GaussianProcessRegressionSolutionEstimatedValuesView : RegressionSolutionEstimatedValuesView {
-    private const string ESTIMATEDVARIANCE_TRAINING_SERIES_NAME = "Estimated Variance (training)";
-    private const string ESTIMATEDVARIANCE_TEST_SERIES_NAME = "Estimated Variance (test)";
+  [Content(typeof(IConfidenceBoundRegressionSolution), false)]
+  public partial class ConfidenceBoundRegressionSolutionEstimatedValuesView : RegressionSolutionEstimatedValuesView {
+    private const string ESTIMATEDVARIANCES_SERIES_NAME = "Estimated Variances (all)";
+    private const string ESTIMATEDVARIANCES_TRAINING_SERIES_NAME = "Estimated Variances (training)";
+    private const string ESTIMATEDVARIANCES_TEST_SERIES_NAME = "Estimated Variances (test)";
 
-    public new GaussianProcessRegressionSolution Content {
-      get { return (GaussianProcessRegressionSolution)base.Content; }
+    public new IConfidenceBoundRegressionSolution Content {
+      get { return (IConfidenceBoundRegressionSolution)base.Content; }
       set { base.Content = value; }
     }
 
-    public GaussianProcessRegressionSolutionEstimatedValuesView()
+    public ConfidenceBoundRegressionSolutionEstimatedValuesView()
       : base() {
       InitializeComponent();
@@ -46 +48 @@
       var matrix = base.CreateValueMatrix();
 
-      var columnNames = matrix.ColumnNames.Concat(new[] { ESTIMATEDVARIANCE_TRAINING_SERIES_NAME, ESTIMATEDVARIANCE_TEST_SERIES_NAME }).ToList();
-      ((IStringConvertibleMatrix)matrix).Columns += 2;
+      var columnNames = matrix.ColumnNames.Concat(new[] { ESTIMATEDVARIANCES_SERIES_NAME, ESTIMATEDVARIANCES_TRAINING_SERIES_NAME, ESTIMATEDVARIANCES_TEST_SERIES_NAME }).ToList();
+      ((IStringConvertibleMatrix)matrix).Columns += 3;
       matrix.ColumnNames = columnNames;
 
@@ -53 +55 @@
       var testRows = Content.ProblemData.TestIndices;
 
+      var estimated_var = Content.EstimatedVariances.GetEnumerator();
       var estimated_var_training = Content.GetEstimatedVariances(trainingRows).GetEnumerator();
       var estimated_var_test = Content.GetEstimatedVariances(testRows).GetEnumerator();
 
+      foreach (var row in Enumerable.Range(0, Content.ProblemData.Dataset.Rows)) {
+        estimated_var.MoveNext();
+        matrix[row, 7] = estimated_var.Current.ToString();
+      }
+
       foreach (var row in Content.ProblemData.TrainingIndices) {
         estimated_var_training.MoveNext();
-        matrix[row, 7] = estimated_var_training.Current.ToString();
+        matrix[row, 8] = estimated_var_training.Current.ToString();
       }
 
       foreach (var row in Content.ProblemData.TestIndices) {
         estimated_var_test.MoveNext();
-        matrix[row, 8] = estimated_var_test.Current.ToString();
+        matrix[row, 9] = estimated_var_test.Current.ToString();
       }
 

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceBoundRegressionSolutionLineChartView.Designer.cs

@@ -20 +20 @@
 #endregion
 namespace HeuristicLab.Algorithms.DataAnalysis.Views {
-  partial class GaussianProcessRegressionSolutionLineChartView {
+  partial class ConfidenceBasedRegressionSolutionLineChartView {
     /// <summary> 
     /// Required designer variable.

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceBoundRegressionSolutionLineChartView.cs

@@ -26 +26 @@
 using System.Windows.Forms.DataVisualization.Charting;
 using HeuristicLab.MainForm;
+using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.DataAnalysis.Views;
 
 namespace HeuristicLab.Algorithms.DataAnalysis.Views {
   [View("Line Chart (95% confidence interval)")]
-  [Content(typeof(GaussianProcessRegressionSolution))]
-  public partial class GaussianProcessRegressionSolutionLineChartView : DataAnalysisSolutionEvaluationView {
+  [Content(typeof(IConfidenceBoundRegressionSolution))]
+  public partial class ConfidenceBasedRegressionSolutionLineChartView : DataAnalysisSolutionEvaluationView {
     private const string TARGETVARIABLE_SERIES_NAME = "Target Variable";
     private const string ESTIMATEDVALUES_TRAINING_SERIES_NAME = "Estimated Values (training)";
@@ -37 +38 @@
     private const string ESTIMATEDVALUES_ALL_SERIES_NAME = "Estimated Values (all samples)";
 
-    public new GaussianProcessRegressionSolution Content {
-      get { return (GaussianProcessRegressionSolution)base.Content; }
+    public new IConfidenceBoundRegressionSolution Content {
+      get { return (IConfidenceBoundRegressionSolution)base.Content; }
       set { base.Content = value; }
     }
 
-    public GaussianProcessRegressionSolutionLineChartView()
+    public ConfidenceBasedRegressionSolutionLineChartView()
       : base() {
       InitializeComponent();