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

Timestamp:

03/14/16 18:20:44 (9 years ago)

Author:

mkommend

Message:

#2590: Added flag to decide whether estimated values are averaged or summed up when evaluating a RegressionEnsembleModel.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleModel.cs (modified) (6 diffs)

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

@@ -33 +33 @@
   [StorableClass]
   [Item("RegressionEnsembleModel", "A regression model that contains an ensemble of multiple regression models")]
-  public class RegressionEnsembleModel : NamedItem, IRegressionEnsembleModel {
+  public sealed class RegressionEnsembleModel : NamedItem, IRegressionEnsembleModel {
 
     private List<IRegressionModel> models;
@@ -46 +46 @@
     }
 
+    [Storable]
+    private bool averageModelEstimates = true;
+    public bool AverageModelEstimates {
+      get { return averageModelEstimates; }
+      set {
+        if (averageModelEstimates != value) {
+          averageModelEstimates = value;
+          OnAverageModelEstimatesChanged();
+        }
+      }
+    }
+
     #region backwards compatiblity 3.3.5
     [Storable(Name = "models", AllowOneWay = true)]
@@ -54 +66 @@
 
     [StorableConstructor]
-    protected RegressionEnsembleModel(bool deserializing) : base(deserializing) { }
-    protected RegressionEnsembleModel(RegressionEnsembleModel original, Cloner cloner)
+    private RegressionEnsembleModel(bool deserializing) : base(deserializing) { }
+    private RegressionEnsembleModel(RegressionEnsembleModel original, Cloner cloner)
       : base(original, cloner) {
-      this.models = original.Models.Select(m => cloner.Clone(m)).ToList();
+      this.models = original.Models.Select(cloner.Clone).ToList();
+      this.averageModelEstimates = original.averageModelEstimates;
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new RegressionEnsembleModel(this, cloner);
     }
 
@@ -68 +84 @@
     }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new RegressionEnsembleModel(this, cloner);
-    }
-
     #region IRegressionEnsembleModel Members
     public void Add(IRegressionModel model) {
       models.Add(model);
     }
+
     public void Remove(IRegressionModel model) {
       models.Remove(model);
@@ -99 +112 @@
         int currentRow = rowsEnumerator.Current;
 
-        var filteredEstimates = models.Zip(estimatedValuesEnumerators.Current,
-          (m, e) => new { Model = m, EstimatedValue = e }).Where(f => modelSelectionPredicate(currentRow, f.Model));
+        var filteredEstimates = models.Zip(estimatedValuesEnumerators.Current, (m, e) => new { Model = m, EstimatedValue = e })
+                                      .Where(f => modelSelectionPredicate(currentRow, f.Model))
+                                      .Select(f => f.EstimatedValue).DefaultIfEmpty(double.NaN);
 
-        yield return filteredEstimates.Select(f => f.EstimatedValue).DefaultIfEmpty(double.NaN).Average();
+        yield return AggregateEstimatedValues(filteredEstimates);
       }
+    }
+
+    private double AggregateEstimatedValues(IEnumerable<double> estimatedValuesVector) {
+      if (AverageModelEstimates)
+        return estimatedValuesVector.Average();
+      else
+        return estimatedValuesVector.Sum();
+    }
+
+    public event EventHandler AverageModelEstimatesChanged;
+    private void OnAverageModelEstimatesChanged() {
+      var handler = AverageModelEstimatesChanged;
+      if (handler != null)
+        handler(this, EventArgs.Empty);
     }
     #endregion
@@ -110 +138 @@
     public IEnumerable<double> GetEstimatedValues(IDataset dataset, IEnumerable<int> rows) {
       foreach (var estimatedValuesVector in GetEstimatedValueVectors(dataset, rows)) {
-        yield return estimatedValuesVector.Average();
+        yield return AggregateEstimatedValues(estimatedValuesVector);
       }
     }