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

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/Pruning

Files:

• ComplexityPruning.cs (modified) (7 diffs)
• NoPruning.cs (modified) (1 diff)

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/Pruning/ComplexityPruning.cs

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
+  [StorableType("B643D965-D13F-415D-8589-3F3527460347")]
   public class ComplexityPruning : ParameterizedNamedItem, IPruning {
     public const string PruningStateVariableName = "PruningState";
 
-    private const string PruningStrengthParameterName = "PruningStrength";
-    private const string PruningDecayParameterName = "PruningDecay";
-    private const string FastPruningParameterName = "FastPruning";
+    public const string PruningStrengthParameterName = "PruningStrength";
+    public const string PruningDecayParameterName = "PruningDecay";
+    public const string FastPruningParameterName = "FastPruning";
 
     public IFixedValueParameter<DoubleValue> PruningStrengthParameter {
@@ -51 +52 @@
     public double PruningStrength {
       get { return PruningStrengthParameter.Value.Value; }
+      set { PruningStrengthParameter.Value.Value = value; }
     }
     public double PruningDecay {
       get { return PruningDecayParameter.Value.Value; }
+      set { PruningDecayParameter.Value.Value = value; }
     }
     public bool FastPruning {
       get { return FastPruningParameter.Value.Value; }
+      set { FastPruningParameter.Value.Value = value; }
     }
 
     #region Constructors & Cloning
     [StorableConstructor]
-    protected ComplexityPruning(bool deserializing) : base(deserializing) { }
+    protected ComplexityPruning(StorableConstructorFlag _) : base(_) { }
     protected ComplexityPruning(ComplexityPruning original, Cloner cloner) : base(original, cloner) { }
     public ComplexityPruning() {
-      Parameters.Add(new FixedValueParameter<DoubleValue>(PruningStrengthParameterName, "The strength of the pruning. Higher values force the algorithm to create simpler models", new DoubleValue(2.0)));
-      Parameters.Add(new FixedValueParameter<DoubleValue>(PruningDecayParameterName, "Pruning decay allows nodes higher up in the tree to be more stable.", new DoubleValue(1.0)));
-      Parameters.Add(new FixedValueParameter<BoolValue>(FastPruningParameterName, "Accelerate Pruning by using linear models instead of leaf models", new BoolValue(true)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>(PruningStrengthParameterName, "The strength of the pruning. Higher values force the algorithm to create simpler models (default=2.0).", new DoubleValue(2.0)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>(PruningDecayParameterName, "Pruning decay allows nodes higher up in the tree to be more stable (default=1.0).", new DoubleValue(1.0)));
+      Parameters.Add(new FixedValueParameter<BoolValue>(FastPruningParameterName, "Accelerate pruning by using linear models instead of leaf models (default=true).", new BoolValue(true)));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -136 +140 @@
     }
 
-
     private static void UpdateThreshold(RegressionNodeTreeModel tree, PruningState state) {
       if (state.Code == 2) {
@@ -161 +164 @@
     }
 
-
     private static void BuildPruningModel(RegressionNodeModel regressionNode, ILeafModel leaf, IReadOnlyList<int> trainingRows, IReadOnlyList<int> pruningRows, PruningState state, RegressionTreeParameters regressionTreeParams, CancellationToken cancellationToken) {
       //create regressionProblemdata from pruning data 
-      var vars = regressionTreeParams.AllowedInputVariables.Concat(new[] {regressionTreeParams.TargetVariable}).ToArray();
+      var vars = regressionTreeParams.AllowedInputVariables.Concat(new[] { regressionTreeParams.TargetVariable }).ToArray();
       var reducedData = new Dataset(vars, vars.Select(x => regressionTreeParams.Data.GetDoubleValues(x, pruningRows).ToList()));
       var pd = new RegressionProblemData(reducedData, regressionTreeParams.AllowedInputVariables, regressionTreeParams.TargetVariable);
@@ -179 +181 @@
       state.modelErrors.Add(regressionNode, rmsModel);
       state.modelComplexities.Add(regressionNode, numModelParams);
-      if (regressionNode.IsLeaf) { state.nodeComplexities[regressionNode] = state.modelComplexities[regressionNode]; }
-      else { state.nodeComplexities.Add(regressionNode, state.nodeComplexities[regressionNode.Left] + state.nodeComplexities[regressionNode.Right] + 1); }
+      if (regressionNode.IsLeaf) { state.nodeComplexities[regressionNode] = state.modelComplexities[regressionNode]; } else { state.nodeComplexities.Add(regressionNode, state.nodeComplexities[regressionNode.Left] + state.nodeComplexities[regressionNode.Right] + 1); }
     }
 
@@ -200 +201 @@
     }
 
-    [StorableClass]
+    [StorableType("EAD60C7E-2C58-45C4-9697-6F735F518CFD")]
     public class PruningState : Item {
       [Storable]
@@ -230 +231 @@
       #region HLConstructors & Cloning
       [StorableConstructor]
-      protected PruningState(bool deserializing) : base(deserializing) { }
+      protected PruningState(StorableConstructorFlag _) : base(_) { }
       protected PruningState(PruningState original, Cloner cloner) : base(original, cloner) {
         modelComplexities = original.modelComplexities.ToDictionary(x => cloner.Clone(x.Key), x => x.Value);

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/Pruning/NoPruning.cs

@@ -24 +24 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
-  [StorableClass]
+  [StorableType("D67152AA-3533-45D2-B77B-4A0742FB4B92")]
   [Item("NoPruning", "No pruning")]
   public class NoPruning : ParameterizedNamedItem, IPruning {
     #region Constructors & Cloning
     [StorableConstructor]
-    private NoPruning(bool deserializing) : base(deserializing) { }
+    private NoPruning(StorableConstructorFlag _) : base(_) { }
     private NoPruning(NoPruning original, Cloner cloner) : base(original, cloner) { }
     public NoPruning() { }