Changeset 14099


Ignore:
Timestamp:
07/18/16 16:21:24 (13 months ago)
Author:
pfleck
Message:

#2597:

  • Renamed IConfidenceBoundRegressionModel/Solution+Views to IConfidenceRegressionModel/Solution+Views.
  • Moved IConfidenceRegressionModel and IConfidenceRegressionSolution into own files.
  • Moved some (helper) controls into separate sub folder.
  • Fixed typo.
Location:
trunk/sources
Files:
3 added
8 edited
14 moved

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessRegressionSolution.cs

    r14095 r14099  
    3131  [Item("GaussianProcessRegressionSolution", "Represents a Gaussian process solution for a regression problem which can be visualized in the GUI.")]
    3232  [StorableClass]
    33   public sealed class GaussianProcessRegressionSolution : ConfidenceBoundRegressionSolution, IGaussianProcessSolution {
     33  public sealed class GaussianProcessRegressionSolution : ConfidenceRegressionSolution, IGaussianProcessSolution {
    3434
    3535    public new IGaussianProcessModel Model {
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/IGaussianProcessModel.cs

    r14095 r14099  
    2626  /// Interface to represent a Gaussian process posterior
    2727  /// </summary>
    28   public interface IGaussianProcessModel : IConfidenceBoundRegressionModel {
     28  public interface IGaussianProcessModel : IConfidenceRegressionModel {
    2929    double NegativeLogLikelihood { get; }
    3030    double SigmaNoise { get; }
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/IGaussianProcessSolution.cs

    r14095 r14099  
    2626  /// Interface to represent a Gaussian process solution (either regression or classification)
    2727  /// </summary>
    28   public interface IGaussianProcessSolution : IConfidenceBoundRegressionSolution {
     28  public interface IGaussianProcessSolution : IConfidenceRegressionSolution {
    2929    new IGaussianProcessModel Model { get; }
    3030  }
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/DensityTrackbar.cs

    r14095 r14099  
    128128        LimitsChanged(this, EventArgs.Empty);
    129129    }
    130     #region Hepers
    131130
     131    #region Helpers
    132132    private decimal TickToValue(int tick) {
    133133      return TickToValue(tick, trackBar.Maximum - trackBar.Minimum, (decimal)Limits.Lower, (decimal)Limits.Upper);
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/GradientChart.cs

    r14095 r14099  
    387387      series.LegendText = series.Name;
    388388
    389       var confidenceBoundSolution = solution as IConfidenceBoundRegressionSolution;
     389      var confidenceBoundSolution = solution as IConfidenceRegressionSolution;
    390390      Series confidenceIntervalSeries = null;
    391391      if (confidenceBoundSolution != null) {
     
    454454        }
    455455
    456         var confidenceBoundSolution = solution as IConfidenceBoundRegressionSolution;
     456        var confidenceBoundSolution = solution as IConfidenceRegressionSolution;
    457457        if (confidenceBoundSolution != null) {
    458458          var confidenceIntervalSeries = ciSeriesCache[solution];
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r14095 r14099  
    120120  </ItemGroup>
    121121  <ItemGroup>
    122     <Compile Include="DensityChart.cs">
    123       <SubType>UserControl</SubType>
    124     </Compile>
    125     <Compile Include="DensityChart.Designer.cs">
     122    <Compile Include="Controls\DensityChart.cs">
     123      <SubType>UserControl</SubType>
     124    </Compile>
     125    <Compile Include="Controls\DensityChart.Designer.cs">
    126126      <DependentUpon>DensityChart.cs</DependentUpon>
    127127    </Compile>
    128     <Compile Include="DensityTrackbar.cs">
    129       <SubType>UserControl</SubType>
    130     </Compile>
    131     <Compile Include="DensityTrackbar.Designer.cs">
     128    <Compile Include="Controls\DensityTrackbar.cs">
     129      <SubType>UserControl</SubType>
     130    </Compile>
     131    <Compile Include="Controls\DensityTrackbar.Designer.cs">
    132132      <DependentUpon>DensityTrackbar.cs</DependentUpon>
    133133    </Compile>
     
    195195      <DependentUpon>FeatureCorrelationView.cs</DependentUpon>
    196196    </Compile>
    197     <Compile Include="GradientChart.cs">
    198       <SubType>UserControl</SubType>
    199     </Compile>
    200     <Compile Include="GradientChart.Designer.cs">
     197    <Compile Include="Controls\GradientChart.cs">
     198      <SubType>UserControl</SubType>
     199    </Compile>
     200    <Compile Include="Controls\GradientChart.Designer.cs">
    201201      <DependentUpon>GradientChart.cs</DependentUpon>
    202202    </Compile>
    203     <Compile Include="GradientChartConfigurationDialog.cs">
     203    <Compile Include="Controls\GradientChartConfigurationDialog.cs">
    204204      <SubType>Form</SubType>
    205205    </Compile>
    206     <Compile Include="GradientChartConfigurationDialog.Designer.cs">
     206    <Compile Include="Controls\GradientChartConfigurationDialog.Designer.cs">
    207207      <DependentUpon>GradientChartConfigurationDialog.cs</DependentUpon>
    208208    </Compile>
     
    222222      <DependentUpon>ProblemDataView.cs</DependentUpon>
    223223    </Compile>
    224     <Compile Include="Regression\ConfidenceBoundRegressionSolutionEstimatedValuesView.cs">
    225       <SubType>UserControl</SubType>
    226     </Compile>
    227     <Compile Include="Regression\ConfidenceBoundRegressionSolutionEstimatedValuesView.Designer.cs">
    228       <DependentUpon>ConfidenceBoundRegressionSolutionEstimatedValuesView.cs</DependentUpon>
    229     </Compile>
    230     <Compile Include="Regression\ConfidenceBoundRegressionSolutionLineChartView.cs">
    231       <SubType>UserControl</SubType>
    232     </Compile>
    233     <Compile Include="Regression\ConfidenceBoundRegressionSolutionLineChartView.Designer.cs">
    234       <DependentUpon>ConfidenceBoundRegressionSolutionLineChartView.cs</DependentUpon>
     224    <Compile Include="Regression\ConfidenceRegressionSolutionEstimatedValuesView.cs">
     225      <SubType>UserControl</SubType>
     226    </Compile>
     227    <Compile Include="Regression\ConfidenceRegressionSolutionEstimatedValuesView.Designer.cs">
     228      <DependentUpon>ConfidenceRegressionSolutionEstimatedValuesView.cs</DependentUpon>
     229    </Compile>
     230    <Compile Include="Regression\ConfidenceRegressionSolutionLineChartView.cs">
     231      <SubType>UserControl</SubType>
     232    </Compile>
     233    <Compile Include="Regression\ConfidenceRegressionSolutionLineChartView.Designer.cs">
     234      <DependentUpon>ConfidenceRegressionSolutionLineChartView.cs</DependentUpon>
    235235    </Compile>
    236236    <Compile Include="Regression\RegressionEnsembleSolutionModelWeightsView.cs">
     
    366366      <DependentUpon>DataAnalysisSolutionView.cs</DependentUpon>
    367367    </Compile>
    368     <Compile Include="DoubleLimitView.cs">
    369       <SubType>UserControl</SubType>
    370     </Compile>
    371     <Compile Include="DoubleLimitView.Designer.cs">
     368    <Compile Include="Controls\DoubleLimitView.cs">
     369      <SubType>UserControl</SubType>
     370    </Compile>
     371    <Compile Include="Controls\DoubleLimitView.Designer.cs">
    372372      <DependentUpon>DoubleLimitView.cs</DependentUpon>
    373373    </Compile>
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceRegressionSolutionEstimatedValuesView.Designer.cs

    r14095 r14099  
    2020#endregion
    2121namespace HeuristicLab.Algorithms.DataAnalysis.Views {
    22   partial class ConfidenceBoundRegressionSolutionEstimatedValuesView {
     22  partial class ConfidenceRegressionSolutionEstimatedValuesView {
    2323    /// <summary>
    2424    /// Required designer variable.
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceRegressionSolutionEstimatedValuesView.cs

    r14095 r14099  
    2828namespace HeuristicLab.Algorithms.DataAnalysis.Views {
    2929  [View("Estimated Values")]
    30   [Content(typeof(IConfidenceBoundRegressionSolution), false)]
    31   public partial class ConfidenceBoundRegressionSolutionEstimatedValuesView : RegressionSolutionEstimatedValuesView {
     30  [Content(typeof(IConfidenceRegressionSolution), false)]
     31  public partial class ConfidenceRegressionSolutionEstimatedValuesView : RegressionSolutionEstimatedValuesView {
    3232    private const string ESTIMATEDVARIANCES_SERIES_NAME = "Estimated Variances (all)";
    3333    private const string ESTIMATEDVARIANCES_TRAINING_SERIES_NAME = "Estimated Variances (training)";
    3434    private const string ESTIMATEDVARIANCES_TEST_SERIES_NAME = "Estimated Variances (test)";
    3535
    36     public new IConfidenceBoundRegressionSolution Content {
    37       get { return (IConfidenceBoundRegressionSolution)base.Content; }
     36    public new IConfidenceRegressionSolution Content {
     37      get { return (IConfidenceRegressionSolution)base.Content; }
    3838      set { base.Content = value; }
    3939    }
    4040
    41     public ConfidenceBoundRegressionSolutionEstimatedValuesView()
     41    public ConfidenceRegressionSolutionEstimatedValuesView()
    4242      : base() {
    4343      InitializeComponent();
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceRegressionSolutionLineChartView.Designer.cs

    r14095 r14099  
    2020#endregion
    2121namespace HeuristicLab.Algorithms.DataAnalysis.Views {
    22   partial class ConfidenceBasedRegressionSolutionLineChartView {
     22  partial class ConfidenceRegressionSolutionLineChartView {
    2323    /// <summary>
    2424    /// Required designer variable.
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceRegressionSolutionLineChartView.cs

    r14095 r14099  
    3131namespace HeuristicLab.Algorithms.DataAnalysis.Views {
    3232  [View("Line Chart (95% confidence interval)")]
    33   [Content(typeof(IConfidenceBoundRegressionSolution))]
    34   public partial class ConfidenceBasedRegressionSolutionLineChartView : DataAnalysisSolutionEvaluationView {
     33  [Content(typeof(IConfidenceRegressionSolution))]
     34  public partial class ConfidenceRegressionSolutionLineChartView : DataAnalysisSolutionEvaluationView {
    3535    private const string TARGETVARIABLE_SERIES_NAME = "Target Variable";
    3636    private const string ESTIMATEDVALUES_TRAINING_SERIES_NAME = "Estimated Values (training)";
     
    3838    private const string ESTIMATEDVALUES_ALL_SERIES_NAME = "Estimated Values (all samples)";
    3939
    40     public new IConfidenceBoundRegressionSolution Content {
    41       get { return (IConfidenceBoundRegressionSolution)base.Content; }
     40    public new IConfidenceRegressionSolution Content {
     41      get { return (IConfidenceRegressionSolution)base.Content; }
    4242      set { base.Content = value; }
    4343    }
    4444
    45     public ConfidenceBasedRegressionSolutionLineChartView()
     45    public ConfidenceRegressionSolutionLineChartView()
    4646      : base() {
    4747      InitializeComponent();
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r14095 r14099  
    176176    <Compile Include="Interfaces\ITransformation.cs" />
    177177    <Compile Include="Interfaces\ITransformationMapper.cs" />
     178    <Compile Include="Interfaces\Regression\IConfidenceRegressionModel.cs" />
     179    <Compile Include="Interfaces\Regression\IConfidenceRegressionSolution.cs" />
    178180    <Compile Include="Interfaces\Regression\IRegressionEnsembleModel.cs">
    179181      <SubType>Code</SubType>
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConfidenceBoundRegressionSolution.cs

    r14095 r14099  
    3030  /// </summary>
    3131  [StorableClass]
    32   public class ConfidenceBoundRegressionSolution : RegressionSolution, IConfidenceBoundRegressionSolution {
     32  public class ConfidenceRegressionSolution : RegressionSolution, IConfidenceRegressionSolution {
    3333    protected readonly Dictionary<int, double> varianceEvaluationCache;
    3434
    35     public new IConfidenceBoundRegressionModel Model {
    36       get { return (IConfidenceBoundRegressionModel)base.Model; }
     35    public new IConfidenceRegressionModel Model {
     36      get { return (IConfidenceRegressionModel)base.Model; }
    3737      set { base.Model = value; }
    3838    }
    3939
    4040    [StorableConstructor]
    41     protected ConfidenceBoundRegressionSolution(bool deserializing)
     41    protected ConfidenceRegressionSolution(bool deserializing)
    4242      : base(deserializing) {
    4343      varianceEvaluationCache = new Dictionary<int, double>();
    4444    }
    45     protected ConfidenceBoundRegressionSolution(ConfidenceBoundRegressionSolution original, Cloner cloner)
     45    protected ConfidenceRegressionSolution(ConfidenceRegressionSolution original, Cloner cloner)
    4646      : base(original, cloner) {
    4747      varianceEvaluationCache = new Dictionary<int, double>(original.varianceEvaluationCache);
    4848    }
    49     public ConfidenceBoundRegressionSolution(IConfidenceBoundRegressionModel model, IRegressionProblemData problemData)
     49    public ConfidenceRegressionSolution(IConfidenceRegressionModel model, IRegressionProblemData problemData)
    5050      : base(model, problemData) {
    5151      varianceEvaluationCache = new Dictionary<int, double>(problemData.Dataset.Rows);
     
    5353
    5454    public override IDeepCloneable Clone(Cloner cloner) {
    55       return new ConfidenceBoundRegressionSolution(this, cloner);
     55      return new ConfidenceRegressionSolution(this, cloner);
    5656    }
    5757
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionModel.cs

    r14095 r14099  
    2121
    2222using System.Collections.Generic;
     23
    2324namespace HeuristicLab.Problems.DataAnalysis {
    2425  public interface IRegressionModel : IDataAnalysisModel {
     
    2728    string TargetVariable { get; }
    2829  }
    29 
    30   public interface IConfidenceBoundRegressionModel : IRegressionModel {
    31     IEnumerable<double> GetEstimatedVariances(IDataset dataset, IEnumerable<int> rows);
    32   }
    3330}
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionSolution.cs

    r14095 r14099  
    4444    double TestRootMeanSquaredError { get; }
    4545  }
    46 
    47   public interface IConfidenceBoundRegressionSolution : IRegressionSolution {
    48     new IConfidenceBoundRegressionModel Model { get; }
    49 
    50     IEnumerable<double> EstimatedVariances { get; }
    51     IEnumerable<double> EstimatedTrainingVariances { get; }
    52     IEnumerable<double> EstimatedTestVariances { get; }
    53     IEnumerable<double> GetEstimatedVariances(IEnumerable<int> rows);
    54   }
    5546}
Note: See TracChangeset for help on using the changeset viewer.