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

Timestamp:

06/19/16 19:56:11 (8 years ago)

Author:

bburlacu

Message:

#2604: Revert changes to DataAnalysisSolution and IDataAnalysisSolution and implement the desired properties in model classes that implement IDataAnalysisModel, IRegressionModel and IClassificationModel.

Location:

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

Files:

• ConstantRegressionModel.cs (modified) (3 diffs)
• RegressionEnsembleModel.cs (modified) (1 diff)

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

@@ -33 +33 @@
   [Obsolete]
   public class ConstantRegressionModel : NamedItem, IRegressionModel, IStringConvertibleValue {
+    public IEnumerable<string> VariablesUsedForPrediction { get { return Enumerable.Empty<string>(); } }
+
+    [Storable]
+    private readonly string targetVariable;
+    public string TargetVariable {
+      get { return targetVariable; }
+    }
+
     [Storable]
     private double constant;
@@ -45 +53 @@
       : base(original, cloner) {
       this.constant = original.constant;
+      this.targetVariable = original.targetVariable;
     }
+
     public override IDeepCloneable Clone(Cloner cloner) { return new ConstantRegressionModel(this, cloner); }
 
-    public ConstantRegressionModel(double constant)
+    public ConstantRegressionModel(double constant, string targetVariable = "Target")
       : base() {
       this.name = ItemName;
@@ -54 +64 @@
       this.constant = constant;
       this.ReadOnly = true; // changing a constant regression model is not supported
+      this.targetVariable = targetVariable;
     }
 

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

@@ -34 +34 @@
   [Item("RegressionEnsembleModel", "A regression model that contains an ensemble of multiple regression models")]
   public sealed class RegressionEnsembleModel : NamedItem, IRegressionEnsembleModel {
+    public IEnumerable<string> VariablesUsedForPrediction {
+      get { return models.SelectMany(x => x.VariablesUsedForPrediction).Distinct().OrderBy(x => x); }
+    }
 
     private List<IRegressionModel> models;
     public IEnumerable<IRegressionModel> Models {
       get { return new List<IRegressionModel>(models); }
+    }
+
+    [Storable]
+    private readonly string target;
+    public string TargetVariable {
+      get { return models.First().TargetVariable; }
     }