Changeset 14099 for trunk/sources/HeuristicLab.Problems.DataAnalysis

Timestamp:

07/18/16 16:21:24 (8 years 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/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• Implementation/Regression/ConfidenceBoundRegressionSolution.cs (modified) (2 diffs)
• Interfaces/Regression/IConfidenceRegressionModel.cs (added)
• Interfaces/Regression/IConfidenceRegressionSolution.cs (added)
• Interfaces/Regression/IRegressionModel.cs (modified) (2 diffs)
• Interfaces/Regression/IRegressionSolution.cs (modified) (1 diff)

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

@@ -176 +176 @@
     <Compile Include="Interfaces\ITransformation.cs" />
     <Compile Include="Interfaces\ITransformationMapper.cs" />
+    <Compile Include="Interfaces\Regression\IConfidenceRegressionModel.cs" />
+    <Compile Include="Interfaces\Regression\IConfidenceRegressionSolution.cs" />
     <Compile Include="Interfaces\Regression\IRegressionEnsembleModel.cs">
       <SubType>Code</SubType>

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConfidenceBoundRegressionSolution.cs

@@ -30 +30 @@
   /// </summary>
   [StorableClass]
-  public class ConfidenceBoundRegressionSolution : RegressionSolution, IConfidenceBoundRegressionSolution {
+  public class ConfidenceRegressionSolution : RegressionSolution, IConfidenceRegressionSolution {
     protected readonly Dictionary<int, double> varianceEvaluationCache;
 
-    public new IConfidenceBoundRegressionModel Model {
-      get { return (IConfidenceBoundRegressionModel)base.Model; }
+    public new IConfidenceRegressionModel Model {
+      get { return (IConfidenceRegressionModel)base.Model; }
       set { base.Model = value; }
     }
 
     [StorableConstructor]
-    protected ConfidenceBoundRegressionSolution(bool deserializing)
+    protected ConfidenceRegressionSolution(bool deserializing)
       : base(deserializing) {
       varianceEvaluationCache = new Dictionary<int, double>();
     }
-    protected ConfidenceBoundRegressionSolution(ConfidenceBoundRegressionSolution original, Cloner cloner)
+    protected ConfidenceRegressionSolution(ConfidenceRegressionSolution original, Cloner cloner)
       : base(original, cloner) {
       varianceEvaluationCache = new Dictionary<int, double>(original.varianceEvaluationCache);
     }
-    public ConfidenceBoundRegressionSolution(IConfidenceBoundRegressionModel model, IRegressionProblemData problemData)
+    public ConfidenceRegressionSolution(IConfidenceRegressionModel model, IRegressionProblemData problemData)
       : base(model, problemData) {
       varianceEvaluationCache = new Dictionary<int, double>(problemData.Dataset.Rows);
@@ -53 +53 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new ConfidenceBoundRegressionSolution(this, cloner);
+      return new ConfidenceRegressionSolution(this, cloner);
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionModel.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+
 namespace HeuristicLab.Problems.DataAnalysis {
   public interface IRegressionModel : IDataAnalysisModel {
@@ -27 +28 @@
     string TargetVariable { get; }
   }
-
-  public interface IConfidenceBoundRegressionModel : IRegressionModel {
-    IEnumerable<double> GetEstimatedVariances(IDataset dataset, IEnumerable<int> rows);
-  }
 }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionSolution.cs

@@ -44 +44 @@
     double TestRootMeanSquaredError { get; }
   }
-
-  public interface IConfidenceBoundRegressionSolution : IRegressionSolution {
-    new IConfidenceBoundRegressionModel Model { get; }
-
-    IEnumerable<double> EstimatedVariances { get; }
-    IEnumerable<double> EstimatedTrainingVariances { get; }
-    IEnumerable<double> EstimatedTestVariances { get; }
-    IEnumerable<double> GetEstimatedVariances(IEnumerable<int> rows);
-  }
 }