Changeset 16847 for branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/Spliting/SplitterBase.cs

Timestamp:

04/19/19 13:06:11 (5 years ago)

Author:

gkronber

Message:

#2847: made some minor changes while reviewing

File:

• branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/Spliting/SplitterBase.cs (modified) (6 diffs)

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/Spliting/SplitterBase.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
-  [StorableClass]
-  [Item("SplitterBase", "A split selector that uses the ratio between Variances^(1/Order) to determine good splits")]
+  [StorableType("22DCCF28-8943-4622-BBD3-B2AB04F28C36")]
+  [Item("SplitterBase", "Abstract base class for splitters")]
   public abstract class SplitterBase : ParameterizedNamedItem, ISplitter {
     public const string SplittingStateVariableName = "RuleSetState";
@@ -37 +37 @@
     #region Constructors & Cloning
     [StorableConstructor]
-    protected SplitterBase(bool deserializing) { }
+    protected SplitterBase(StorableConstructorFlag _) { }
     protected SplitterBase(SplitterBase original, Cloner cloner) : base(original, cloner) { }
     public SplitterBase() { }
@@ -46 +46 @@
       states.Variables.Add(new Variable(SplittingStateVariableName, new SplittingState()));
     }
+
     public void Split(RegressionNodeTreeModel tree, IReadOnlyList<int> trainingRows, IScope stateScope, CancellationToken cancellationToken) {
       var regressionTreeParams = (RegressionTreeParameters)stateScope.Variables[M5Regression.RegressionTreeParameterVariableName].Value;
@@ -87 +88 @@
       if (splitData.Dataset.Rows < minLeafSize) return false;
 
-      //find best Attribute for the Splitter
+      // find best attribute for the splitter
       foreach (var attr in splitData.AllowedInputVariables) {
         int pos;
@@ -109 +110 @@
     #endregion
 
-    [StorableClass]
+    [StorableType("BC1149FD-370E-4F3A-92F5-6E519736D09A")]
     public class SplittingState : Item {
       [Storable]
@@ -124 +125 @@
       #region HLConstructors & Cloning
       [StorableConstructor]
-      protected SplittingState(bool deserializing) : base(deserializing) { }
+      protected SplittingState(StorableConstructorFlag _) : base(_) { }
       protected SplittingState(SplittingState original, Cloner cloner) : base(original, cloner) {
         nodeQueue = new Queue<RegressionNodeModel>(original.nodeQueue.Select(cloner.Clone));