Changeset 13100 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression

Timestamp:

11/02/15 22:32:59 (9 years ago)

Author:

gkronber

Message:

#1998: merged changes from the branch to trunk (btw. this branch was difficult to merge back to trunk because of it's specific structure)

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis

Files:

• . (modified) (1 prop)
• 3.4/Implementation/Regression/ConstantModel.cs (copied) (copied from branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantModel.cs)
• 3.4/Implementation/Regression/ConstantRegressionModel.cs (modified) (2 diffs)
• 3.4/Implementation/Regression/ConstantRegressionSolution.cs (modified) (2 diffs)

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

@@ -31 +31 @@
   [StorableClass]
   [Item("Constant Regression Model", "A model that always returns the same constant value regardless of the presented input data.")]
+  [Obsolete]
   public class ConstantRegressionModel : NamedItem, IRegressionModel, IStringConvertibleValue {
     [Storable]
@@ -60 +61 @@
 
     public IRegressionSolution CreateRegressionSolution(IRegressionProblemData problemData) {
-      return new ConstantRegressionSolution(this, new RegressionProblemData(problemData));
+      return new ConstantRegressionSolution(new ConstantModel(constant), new RegressionProblemData(problemData));
     }
 

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

@@ -28 +28 @@
   [Item(Name = "Constant Regression Solution", Description = "Represents a constant regression solution (model + data).")]
   public class ConstantRegressionSolution : RegressionSolution {
-    public new ConstantRegressionModel Model {
-      get { return (ConstantRegressionModel)base.Model; }
+    public new ConstantModel Model {
+      get { return (ConstantModel)base.Model; }
       set { base.Model = value; }
     }
@@ -36 +36 @@
     protected ConstantRegressionSolution(bool deserializing) : base(deserializing) { }
     protected ConstantRegressionSolution(ConstantRegressionSolution original, Cloner cloner) : base(original, cloner) { }
-    public ConstantRegressionSolution(ConstantRegressionModel model, IRegressionProblemData problemData)
+    public ConstantRegressionSolution(ConstantModel model, IRegressionProblemData problemData)
       : base(model, problemData) {
       RecalculateResults();