Changeset 14710 for branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.Problems.DataAnalysis

Timestamp:

03/02/17 14:10:57 (7 years ago)

Author:

jzenisek

Message:

#2719 implemented ensemble model rating by introducing the new type RatedEnsembleModel; introduced performance indicator calculation in results;

Location:

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• Implementation/Regression/RatedRegressionEnsembleModel.cs (copied) (copied from branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleModel.cs) (4 diffs)
• Implementation/Regression/RegressionEnsembleModel.cs (modified) (1 diff)

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

@@ -173 +173 @@
     <Compile Include="Implementation\Regression\ConstantRegressionModel.cs" />
     <Compile Include="Implementation\Regression\ConstantRegressionSolution.cs" />
+    <Compile Include="Implementation\Regression\RatedRegressionEnsembleModel.cs" />
     <Compile Include="Implementation\Regression\RegressionEnsembleProblemData.cs" />
     <Compile Include="Implementation\Regression\RegressionEnsembleModel.cs">

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RatedRegressionEnsembleModel.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -32 +33 @@
   /// </summary>
   [StorableClass]
-  [Item("Regression Ensemble Model", "A regression model that contains an ensemble of multiple regression models")]
+  [Item("Rated Regression Ensemble Model", "A regression model that contains an ensemble of multiple regression models")]
   [Creatable(CreatableAttribute.Categories.DataAnalysisEnsembles, Priority = 100)]
-  public sealed class RegressionEnsembleModel : RegressionModel, IRegressionEnsembleModel {
+  public sealed class RatedRegressionEnsembleModel : RegressionModel, IRegressionEnsembleModel {
     public override IEnumerable<string> VariablesUsedForPrediction {
       get { return models.SelectMany(x => x.VariablesUsedForPrediction).Distinct().OrderBy(x => x); }
@@ -59 +60 @@
       get { return modelWeights; }
       set { modelWeights = value.ToList(); }
+    }
+
+    private DoubleRange qualityThreshold;
+    public DoubleRange QualityThreshold {
+      get { return qualityThreshold; }      
+      set { qualityThreshold = value; }
+    }
+    [Storable(Name = "QualityThreshold")]
+    private DoubleRange StorableQualityThreshold {
+      get { return qualityThreshold; }
+      set { qualityThreshold = value; }
+    }
+
+    private DoubleRange confidenceThreshold;
+    public DoubleRange ConfidenceThreshold
+    {
+      get { return confidenceThreshold; }
+      set { confidenceThreshold = value; }
+    }
+    [Storable(Name = "QualityThreshold")]
+    private DoubleRange StorableConfidenceThreshold
+    {
+      get { return confidenceThreshold; }
+      set { confidenceThreshold = value; }
     }
 
@@ -90 +115 @@
 
     [StorableConstructor]
-    private RegressionEnsembleModel(bool deserializing) : base(deserializing) { }
-    private RegressionEnsembleModel(RegressionEnsembleModel original, Cloner cloner)
+    private RatedRegressionEnsembleModel(bool deserializing) : base(deserializing) { }
+    private RatedRegressionEnsembleModel(RatedRegressionEnsembleModel original, Cloner cloner)
       : base(original, cloner) {
       this.models = original.Models.Select(cloner.Clone).ToList();
       this.modelWeights = new List<double>(original.ModelWeights);
+      this.qualityThreshold = cloner.Clone(original.qualityThreshold);
+      this.confidenceThreshold = cloner.Clone(original.confidenceThreshold);
       this.averageModelEstimates = original.averageModelEstimates;
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new RegressionEnsembleModel(this, cloner);
-    }
-
-    public RegressionEnsembleModel() : this(Enumerable.Empty<IRegressionModel>()) { }
-    public RegressionEnsembleModel(IEnumerable<IRegressionModel> models) : this(models, models.Select(m => 1.0)) { }
-    public RegressionEnsembleModel(IEnumerable<IRegressionModel> models, IEnumerable<double> modelWeights)
+      return new RatedRegressionEnsembleModel(this, cloner);
+    }
+
+    public RatedRegressionEnsembleModel() : this(Enumerable.Empty<IRegressionModel>()) { }
+    public RatedRegressionEnsembleModel(IEnumerable<IRegressionModel> models) : this(models, models.Select(m => 1.0)) { }
+    public RatedRegressionEnsembleModel(IEnumerable<IRegressionModel> models, IEnumerable<double> modelWeights)
       : base(string.Empty) {
       this.name = ItemName;

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleModel.cs

@@ -33 +33 @@
   [StorableClass]
   [Item("Regression Ensemble Model", "A regression model that contains an ensemble of multiple regression models")]
-  [Creatable(CreatableAttribute.Categories.DataAnalysisEnsembles, Priority = 100)]
   public sealed class RegressionEnsembleModel : RegressionModel, IRegressionEnsembleModel {
     public override IEnumerable<string> VariablesUsedForPrediction {