Changeset 13089 for branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis

Timestamp:

10/29/15 19:48:17 (8 years ago)

Author:

gkronber

Message:

#1998

• deleted obsolete version of OneR algorithm (also does perform worse than mkommend's implementation in my tests)
• reused the ConstantRegressionModel as ConstantClassificationModel (OK?)
• fixed a few strings here and there

Location:

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• Implementation/Classification/ConstantClassificationModel.cs (deleted)
• Implementation/Classification/ConstantClassificationSolution.cs (modified) (2 diffs)
• Implementation/Regression/ConstantRegressionModel.cs (modified) (4 diffs)

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

@@ -172 +172 @@
     <Compile Include="Implementation\Classification\ConstantClassificationSolution.cs" />
     <Compile Include="Implementation\Classification\DiscriminantFunctionClassificationSolutionBase.cs" />
-    <Compile Include="Implementation\Classification\ConstantClassificationModel.cs" />
     <Compile Include="Implementation\Clustering\ClusteringProblem.cs" />
     <Compile Include="Implementation\Clustering\ClusteringProblemData.cs" />

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ConstantClassificationSolution.cs

@@ -28 +28 @@
   [Item(Name = "Constant Classification Solution", Description = "Represents a constant classification solution (model + data).")]
   public class ConstantClassificationSolution : ClassificationSolution {
-    public new ConstantClassificationModel Model {
-      get { return (ConstantClassificationModel)base.Model; }
+    public new ConstantRegressionModel Model {
+      get { return (ConstantRegressionModel)base.Model; }
       set { base.Model = value; }
     }
@@ -36 +36 @@
     protected ConstantClassificationSolution(bool deserializing) : base(deserializing) { }
     protected ConstantClassificationSolution(ConstantClassificationSolution original, Cloner cloner) : base(original, cloner) { }
-    public ConstantClassificationSolution(ConstantClassificationModel model, IClassificationProblemData problemData)
+    public ConstantClassificationSolution(ConstantRegressionModel model, IClassificationProblemData problemData)
       : base(model, problemData) {
       RecalculateResults();

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

@@ -30 +30 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableClass]
-  [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 {
+  [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 {
     [Storable]
     private double constant;
@@ -59 +60 @@
     }
 
+    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));
     }
 
@@ -70 +79 @@
     public bool ReadOnly { get; private set; }
     public bool Validate(string value, out string errorMessage) {
-      throw new NotSupportedException(); // changing a constant regression model is not supported
+      throw new NotSupportedException(); // changing a constant model is not supported
     }
 
@@ -78 +87 @@
 
     public bool SetValue(string value) {
-      throw new NotSupportedException(); // changing a constant regression model is not supported
+      throw new NotSupportedException(); // changing a constant model is not supported
     }
 
     public event EventHandler ValueChanged;
     #endregion
+
   }
 }