Changeset 13097

Timestamp:

11/02/15 21:39:09 (9 years ago)

Author:

gkronber

Message:

#1998: reverse merge of r13089 (reused the ConstantRegressionModel as ConstantClassificationModel (OK?))

File:

• branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionModel.cs (modified) (4 diffs)

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionModel.cs

@@ -30 +30 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableClass]
-  [Item("Constant Model", "A model that always returns the same constant value regardless of the presented input data.")]
-  // TODO this class should be renamed, since it is also used to handle the classification case now
-  public class ConstantRegressionModel : NamedItem, IRegressionModel, IClassificationModel, IStringConvertibleValue {
+  [Item("Constant Regression Model", "A model that always returns the same constant value regardless of the presented input data.")]
+  public class ConstantRegressionModel : NamedItem, IRegressionModel, IStringConvertibleValue {
     [Storable]
     private double constant;
@@ -60 +59 @@
     }
 
-    public IEnumerable<double> GetEstimatedClassValues(IDataset dataset, IEnumerable<int> rows) {
-      return GetEstimatedValues(dataset, rows);
-    }
-
     public IRegressionSolution CreateRegressionSolution(IRegressionProblemData problemData) {
       return new ConstantRegressionSolution(this, new RegressionProblemData(problemData));
-    }
-
-    public IClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData) {
-      return new ConstantClassificationSolution(this, new ClassificationProblemData(problemData));
     }
 
@@ -79 +70 @@
     public bool ReadOnly { get; private set; }
     public bool Validate(string value, out string errorMessage) {
-      throw new NotSupportedException(); // changing a constant model is not supported
+      throw new NotSupportedException(); // changing a constant regression model is not supported
     }
 
@@ -87 +78 @@
 
     public bool SetValue(string value) {
-      throw new NotSupportedException(); // changing a constant model is not supported
+      throw new NotSupportedException(); // changing a constant regression model is not supported
     }
 
     public event EventHandler ValueChanged;
     #endregion
-
   }
 }