Changeset 15470 for branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/Spliting/OrderImpurityCalculator.cs

Timestamp:

11/10/17 12:56:36 (6 years ago)

Author:

bwerth

Message:

#2847 worked on M5Regression

File:

• branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/Spliting/OrderImpurityCalculator.cs (modified) (3 diffs)

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/Spliting/OrderImpurityCalculator.cs

@@ -27 +27 @@
 namespace HeuristicLab.Algorithms.DataAnalysis {
   /// <summary>
-  /// Helper class for incremental impurity calculation.
+  /// Helper class for incremental split calculation.
   /// Used while moving a potential Split along the ordered training Instances
   /// </summary>
-  internal class OrderImpurityCalculator : IImpurityCalculator {
+  internal class OrderImpurityCalculator {
+    internal enum IncrementType {
+      Left,
+      Right,
+      None
+    }
+
     #region Properties
     private double SqSumLeft { get; set; }
@@ -99 +105 @@
       VarRight = NoRight <= 0 ? 0 : Math.Abs(NoRight * SqSumRight - SumRight * SumRight) / (NoRight * NoRight);
 
-      if (Order <= 0) throw new ArgumentException("Impurity order must be larger than 0");
+      if (Order <= 0) throw new ArgumentException("Split order must be larger than 0");
       if (Order.IsAlmost(1)) {
         y = VarTotal;
@@ -111 +117 @@
       }
       var t = NoRight + NoLeft;
-      if (NoLeft <= 0.0 || NoRight <= 0.0) Impurity = double.MinValue; //Impurity = 0;
-      else Impurity = y - NoLeft / t * yl - NoRight / t * yr; //  Impurity = y - NoLeft / NoRight * yl - NoRight / NoLeft * yr
+      if (NoLeft <= 0.0 || NoRight <= 0.0) Impurity = double.MinValue; //Split = 0;
+      else Impurity = y - NoLeft / t * yl - NoRight / t * yr; //  Split = y - NoLeft / NoRight * yl - NoRight / NoLeft * yr
     }
     #endregion