Changeset 16847 for branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/MetaModels/RegressionNodeTreeModel.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/MetaModels/RegressionNodeTreeModel.cs (modified) (4 diffs)

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/MetaModels/RegressionNodeTreeModel.cs

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
-  [StorableClass]
+  [StorableType("FAF1F955-82F3-4824-9759-9D2846E831AE")]
   public class RegressionNodeTreeModel : RegressionModel, IM5Model {
     public const string NumCurrentLeafsResultName = "Number of current leafs";
@@ -42 +42 @@
     #region HLConstructors & Cloning
     [StorableConstructor]
-    protected RegressionNodeTreeModel(bool deserializing) : base(deserializing) { }
+    protected RegressionNodeTreeModel(StorableConstructorFlag _) : base(_) { }
     protected RegressionNodeTreeModel(RegressionNodeTreeModel original, Cloner cloner) : base(original, cloner) {
       Root = cloner.Clone(original.Root);
@@ -97 +97 @@
     #endregion
 
-    public void BuildModelless(IReadOnlyList<int> trainingRows, IReadOnlyList<int> pruningRows, IScope statescope, ResultCollection results, CancellationToken cancellationToken) {
+    public void BuildModel(IReadOnlyList<int> trainingRows, IReadOnlyList<int> pruningRows, IScope statescope, ResultCollection results, CancellationToken cancellationToken) {
       var regressionTreeParams = (RegressionTreeParameters)statescope.Variables[M5Regression.RegressionTreeParameterVariableName].Value;
       //start with one node
@@ -109 +109 @@
     }
 
-    [StorableClass]
+    [StorableType("E84ACC40-5694-4E40-A947-190673643206")]
     private sealed class ConfidenceRegressionNodeTreeModel : RegressionNodeTreeModel, IConfidenceRegressionModel {
       #region HLConstructors & Cloning
       [StorableConstructor]
-      private ConfidenceRegressionNodeTreeModel(bool deserializing) : base(deserializing) { }
+      private ConfidenceRegressionNodeTreeModel(StorableConstructorFlag _) : base(_) { }
       private ConfidenceRegressionNodeTreeModel(ConfidenceRegressionNodeTreeModel original, Cloner cloner) : base(original, cloner) { }
       public ConfidenceRegressionNodeTreeModel(string targetVariable) : base(targetVariable) { }