Changeset 16847 for branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/MetaModels

Timestamp:

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

Author:

gkronber

Message:

#2847: made some minor changes while reviewing

Location:

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

Files:

• RegressionNodeModel.cs (modified) (3 diffs)
• RegressionNodeTreeModel.cs (modified) (4 diffs)
• RegressionRuleModel.cs (modified) (6 diffs)
• RegressionRuleSetModel.cs (modified) (5 diffs)

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;                                                  
 using HeuristicLab.Problems.DataAnalysis;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
-  [StorableClass]
+  [StorableType("C20C7DF1-CE33-4CCD-88D3-E145CFE239AC")]
   public class RegressionNodeModel : RegressionModel {
     #region Properties
@@ -65 +65 @@
     #region HLConstructors
     [StorableConstructor]
-    protected RegressionNodeModel(bool deserializing) : base(deserializing) { }
+    protected RegressionNodeModel(StorableConstructorFlag _) : base(_) { }
     protected RegressionNodeModel(RegressionNodeModel original, Cloner cloner) : base(original, cloner) {
       IsLeaf = original.IsLeaf;
@@ -147 +147 @@
     #endregion
 
-    [StorableClass]
+    [StorableType("1FF9E216-6AF1-4282-A7EF-3FA0C1DB29C8")]
     private sealed class ConfidenceRegressionNodeModel : RegressionNodeModel, IConfidenceRegressionModel {
       #region HLConstructors
       [StorableConstructor]
-      private ConfidenceRegressionNodeModel(bool deserializing) : base(deserializing) { }
+      private ConfidenceRegressionNodeModel(StorableConstructorFlag _) : base(_) { }
       private ConfidenceRegressionNodeModel(ConfidenceRegressionNodeModel original, Cloner cloner) : base(original, cloner) { }
       public ConfidenceRegressionNodeModel(string targetAttr) : base(targetAttr) { }

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) { }

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

@@ -28 +28 @@
 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("425AF262-A756-4E9A-B76F-4D2480BEA4FD")]
   public class RegressionRuleModel : RegressionModel, IM5Model {
     #region Properties
@@ -49 +49 @@
     #region HLConstructors
     [StorableConstructor]
-    protected RegressionRuleModel(bool deserializing) : base(deserializing) { }
+    protected RegressionRuleModel(StorableConstructorFlag _) : base(_) { }
     protected RegressionRuleModel(RegressionRuleModel original, Cloner cloner) : base(original, cloner) {
       if (original.SplitAttributes != null) SplitAttributes = original.SplitAttributes.ToArray();
@@ -88 +88 @@
       //build tree and select node with maximum coverage
       var tree = RegressionNodeTreeModel.CreateTreeModel(regressionTreeParams.TargetVariable, regressionTreeParams);
-      tree.BuildModelless(trainingRows, pruningRows, statescope, results, cancellationToken);
+      tree.BuildModel(trainingRows, pruningRows, statescope, results, cancellationToken);
       var nodeModel = tree.Root.EnumerateNodes().Where(x => x.IsLeaf).MaxItems(x => x.NumSamples).First();
 
@@ -95 +95 @@
       var reops = new List<Comparison>();
 
-      //extract Splits
+      //extract splits
       for (var temp = nodeModel; temp.Parent != null; temp = temp.Parent) {
         satts.Add(temp.Parent.SplitAttribute);
@@ -137 +137 @@
     }
 
-    [StorableClass]
+    [StorableType("7302AA30-9F58-42F3-BF6A-ECF1536508AB")]
     private sealed class ConfidenceRegressionRuleModel : RegressionRuleModel, IConfidenceRegressionModel {
       #region HLConstructors
       [StorableConstructor]
-      private ConfidenceRegressionRuleModel(bool deserializing) : base(deserializing) { }
+      private ConfidenceRegressionRuleModel(StorableConstructorFlag _) : base(_) { }
       private ConfidenceRegressionRuleModel(ConfidenceRegressionRuleModel original, Cloner cloner) : base(original, cloner) { }
       public ConfidenceRegressionRuleModel(string targetAttr) : base(targetAttr) { }
@@ -159 +159 @@
   }
 
+  [StorableType("152DECE4-2692-4D53-B290-974806ADCD72")]
   internal enum Comparison {
     LessEqual,

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

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
-  [StorableClass]
+  [StorableType("7B4D9AE9-0456-4029-80A6-CCB5E33CE356")]
   public class RegressionRuleSetModel : RegressionModel, IM5Model {
     private const string NumRulesResultName = "Number of rules";
@@ -45 +45 @@
     #region HLConstructors & Cloning
     [StorableConstructor]
-    protected RegressionRuleSetModel(bool deserializing) : base(deserializing) { }
+    protected RegressionRuleSetModel(StorableConstructorFlag _) : base(_) { }
     protected RegressionRuleSetModel(RegressionRuleSetModel original, Cloner cloner) : base(original, cloner) {
       if (original.Rules != null) Rules = original.Rules.Select(cloner.Clone).ToList();
@@ -123 +123 @@
     #endregion
 
-    [StorableClass]
+    [StorableType("E114F3C9-3C1F-443D-8270-0E10CE12F2A0")]
     public class RuleSetState : Item {
       [Storable]
@@ -140 +140 @@
       #region HLConstructors & Cloning
       [StorableConstructor]
-      protected RuleSetState(bool deserializing) : base(deserializing) { }
+      protected RuleSetState(StorableConstructorFlag _) : base(_) { }
       protected RuleSetState(RuleSetState original, Cloner cloner) : base(original, cloner) {
         Rules = original.Rules.Select(cloner.Clone).ToList();
@@ -155 +155 @@
     }
 
-    [StorableClass]
+    [StorableType("52E7992B-94CC-4960-AA82-1A399BE735C6")]
     private sealed class ConfidenceRegressionRuleSetModel : RegressionRuleSetModel, IConfidenceRegressionModel {
       #region HLConstructors & Cloning
       [StorableConstructor]
-      private ConfidenceRegressionRuleSetModel(bool deserializing) : base(deserializing) { }
+      private ConfidenceRegressionRuleSetModel(StorableConstructorFlag _) : base(_) { }
       private ConfidenceRegressionRuleSetModel(ConfidenceRegressionRuleSetModel original, Cloner cloner) : base(original, cloner) { }
       public ConfidenceRegressionRuleSetModel(string targetVariable) : base(targetVariable) { }