Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/24/16 14:44:25 (8 years ago)
Author:
pfleck
Message:

#2597

  • Generalized GaussianProcessRegressionSolution...Views to ConfidenceBasedRegressionSolution...Views.
  • Added "all" column for variances.
Location:
branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4
Files:
1 edited
4 moved

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r13853 r13856  
    288288    <Compile Include="GradientChartConfigurationDialog.Designer.cs">
    289289      <DependentUpon>GradientChartConfigurationDialog.cs</DependentUpon>
     290    </Compile>
     291    <Compile Include="Regression\ConfidenceBoundRegressionSolutionEstimatedValuesView.cs">
     292      <SubType>UserControl</SubType>
     293    </Compile>
     294    <Compile Include="Regression\ConfidenceBoundRegressionSolutionEstimatedValuesView.Designer.cs">
     295      <DependentUpon>ConfidenceBoundRegressionSolutionEstimatedValuesView.cs</DependentUpon>
     296    </Compile>
     297    <Compile Include="Regression\ConfidenceBoundRegressionSolutionLineChartView.cs">
     298      <SubType>UserControl</SubType>
     299    </Compile>
     300    <Compile Include="Regression\ConfidenceBoundRegressionSolutionLineChartView.Designer.cs">
     301      <DependentUpon>ConfidenceBoundRegressionSolutionLineChartView.cs</DependentUpon>
    290302    </Compile>
    291303    <Compile Include="Regression\RegressionSolutionGradientView.cs">
  • branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceBoundRegressionSolutionEstimatedValuesView.Designer.cs

    r13855 r13856  
    2020#endregion
    2121namespace HeuristicLab.Algorithms.DataAnalysis.Views {
    22   partial class GaussianProcessRegressionSolutionEstimatedValuesView {
     22  partial class ConfidenceBoundRegressionSolutionEstimatedValuesView {
    2323    /// <summary>
    2424    /// Required designer variable.
  • branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceBoundRegressionSolutionEstimatedValuesView.cs

    r13855 r13856  
    2323using HeuristicLab.Data;
    2424using HeuristicLab.MainForm;
     25using HeuristicLab.Problems.DataAnalysis;
    2526using HeuristicLab.Problems.DataAnalysis.Views;
    2627
    2728namespace HeuristicLab.Algorithms.DataAnalysis.Views {
    2829  [View("Estimated Values")]
    29   [Content(typeof(GaussianProcessRegressionSolution), false)]
    30   public partial class GaussianProcessRegressionSolutionEstimatedValuesView : RegressionSolutionEstimatedValuesView {
    31     private const string ESTIMATEDVARIANCE_TRAINING_SERIES_NAME = "Estimated Variance (training)";
    32     private const string ESTIMATEDVARIANCE_TEST_SERIES_NAME = "Estimated Variance (test)";
     30  [Content(typeof(IConfidenceBoundRegressionSolution), false)]
     31  public partial class ConfidenceBoundRegressionSolutionEstimatedValuesView : RegressionSolutionEstimatedValuesView {
     32    private const string ESTIMATEDVARIANCES_SERIES_NAME = "Estimated Variances (all)";
     33    private const string ESTIMATEDVARIANCES_TRAINING_SERIES_NAME = "Estimated Variances (training)";
     34    private const string ESTIMATEDVARIANCES_TEST_SERIES_NAME = "Estimated Variances (test)";
    3335
    34     public new GaussianProcessRegressionSolution Content {
    35       get { return (GaussianProcessRegressionSolution)base.Content; }
     36    public new IConfidenceBoundRegressionSolution Content {
     37      get { return (IConfidenceBoundRegressionSolution)base.Content; }
    3638      set { base.Content = value; }
    3739    }
    3840
    39     public GaussianProcessRegressionSolutionEstimatedValuesView()
     41    public ConfidenceBoundRegressionSolutionEstimatedValuesView()
    4042      : base() {
    4143      InitializeComponent();
     
    4648      var matrix = base.CreateValueMatrix();
    4749
    48       var columnNames = matrix.ColumnNames.Concat(new[] { ESTIMATEDVARIANCE_TRAINING_SERIES_NAME, ESTIMATEDVARIANCE_TEST_SERIES_NAME }).ToList();
    49       ((IStringConvertibleMatrix)matrix).Columns += 2;
     50      var columnNames = matrix.ColumnNames.Concat(new[] { ESTIMATEDVARIANCES_SERIES_NAME, ESTIMATEDVARIANCES_TRAINING_SERIES_NAME, ESTIMATEDVARIANCES_TEST_SERIES_NAME }).ToList();
     51      ((IStringConvertibleMatrix)matrix).Columns += 3;
    5052      matrix.ColumnNames = columnNames;
    5153
     
    5355      var testRows = Content.ProblemData.TestIndices;
    5456
     57      var estimated_var = Content.EstimatedVariances.GetEnumerator();
    5558      var estimated_var_training = Content.GetEstimatedVariances(trainingRows).GetEnumerator();
    5659      var estimated_var_test = Content.GetEstimatedVariances(testRows).GetEnumerator();
    5760
     61      foreach (var row in Enumerable.Range(0, Content.ProblemData.Dataset.Rows)) {
     62        estimated_var.MoveNext();
     63        matrix[row, 7] = estimated_var.Current.ToString();
     64      }
     65
    5866      foreach (var row in Content.ProblemData.TrainingIndices) {
    5967        estimated_var_training.MoveNext();
    60         matrix[row, 7] = estimated_var_training.Current.ToString();
     68        matrix[row, 8] = estimated_var_training.Current.ToString();
    6169      }
    6270
    6371      foreach (var row in Content.ProblemData.TestIndices) {
    6472        estimated_var_test.MoveNext();
    65         matrix[row, 8] = estimated_var_test.Current.ToString();
     73        matrix[row, 9] = estimated_var_test.Current.ToString();
    6674      }
    6775
  • branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceBoundRegressionSolutionLineChartView.Designer.cs

    r13855 r13856  
    2020#endregion
    2121namespace HeuristicLab.Algorithms.DataAnalysis.Views {
    22   partial class GaussianProcessRegressionSolutionLineChartView {
     22  partial class ConfidenceBasedRegressionSolutionLineChartView {
    2323    /// <summary>
    2424    /// Required designer variable.
  • branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceBoundRegressionSolutionLineChartView.cs

    r13855 r13856  
    2626using System.Windows.Forms.DataVisualization.Charting;
    2727using HeuristicLab.MainForm;
     28using HeuristicLab.Problems.DataAnalysis;
    2829using HeuristicLab.Problems.DataAnalysis.Views;
    2930
    3031namespace HeuristicLab.Algorithms.DataAnalysis.Views {
    3132  [View("Line Chart (95% confidence interval)")]
    32   [Content(typeof(GaussianProcessRegressionSolution))]
    33   public partial class GaussianProcessRegressionSolutionLineChartView : DataAnalysisSolutionEvaluationView {
     33  [Content(typeof(IConfidenceBoundRegressionSolution))]
     34  public partial class ConfidenceBasedRegressionSolutionLineChartView : DataAnalysisSolutionEvaluationView {
    3435    private const string TARGETVARIABLE_SERIES_NAME = "Target Variable";
    3536    private const string ESTIMATEDVALUES_TRAINING_SERIES_NAME = "Estimated Values (training)";
     
    3738    private const string ESTIMATEDVALUES_ALL_SERIES_NAME = "Estimated Values (all samples)";
    3839
    39     public new GaussianProcessRegressionSolution Content {
    40       get { return (GaussianProcessRegressionSolution)base.Content; }
     40    public new IConfidenceBoundRegressionSolution Content {
     41      get { return (IConfidenceBoundRegressionSolution)base.Content; }
    4142      set { base.Content = value; }
    4243    }
    4344
    44     public GaussianProcessRegressionSolutionLineChartView()
     45    public ConfidenceBasedRegressionSolutionLineChartView()
    4546      : base() {
    4647      InitializeComponent();
Note: See TracChangeset for help on using the changeset viewer.