Changeset 14166 for stable/HeuristicLab.Problems.DataAnalysis

Timestamp:

07/21/16 17:24:22 (8 years ago)

Author:

mkommend

Message:

#2597: Merged r14095, r14096, r14098, r14099, r14118, r14119, r14131, r14157, r14158 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConfidenceBoundRegressionSolution.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConfidenceBoundRegressionSolution.cs) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IConfidenceRegressionModel.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IConfidenceRegressionModel.cs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IConfidenceRegressionSolution.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IConfidenceRegressionSolution.cs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionModel.cs (modified) (1 diff)

stable/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

@@ -138 +138 @@
     <Compile Include="Implementation\ConstantModel.cs" />
     <Compile Include="Implementation\DataAnalysisModel.cs" />
+    <Compile Include="Implementation\Regression\ConfidenceBoundRegressionSolution.cs" />
     <Compile Include="Implementation\Regression\ConstantRegressionModel.cs" />
     <Compile Include="Implementation\Regression\ConstantRegressionSolution.cs" />
@@ -175 +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>

stable/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);
     }
 

stable/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionModel.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+
 namespace HeuristicLab.Problems.DataAnalysis {
   public interface IRegressionModel : IDataAnalysisModel {