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

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/LeafTypes/LeafBase.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -28 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
-  [StorableClass]
+  [StorableType("F3A9CCD4-975F-4F55-BE24-3A3E932591F6")]
   public abstract class LeafBase : ParameterizedNamedItem, ILeafModel {
     public const string LeafBuildingStateVariableName = "LeafBuildingState";
     public const string UseDampeningParameterName = "UseDampening";
-    private const string DampeningParameterName = "DampeningStrenght";
+    public const string DampeningParameterName = "DampeningStrength";
 
     public IFixedValueParameter<DoubleValue> DampeningParameter {
-      get { return Parameters[DampeningParameterName] as IFixedValueParameter<DoubleValue>; }
+      get { return (IFixedValueParameter<DoubleValue>)Parameters[DampeningParameterName]; }
     }
     public IFixedValueParameter<BoolValue> UseDampeningParameter {
@@ -47 +46 @@
     public bool UseDampening {
       get { return UseDampeningParameter.Value.Value; }
+      set { UseDampeningParameter.Value.Value = value; }
     }
     public double Dampening {
       get { return DampeningParameter.Value.Value; }
+      set { DampeningParameter.Value.Value = value; }
     }
 
     #region Constructors & Cloning
     [StorableConstructor]
-    protected LeafBase(bool deserializing) : base(deserializing) { }
+    protected LeafBase(StorableConstructorFlag _) : base(_) { }
     protected LeafBase(LeafBase original, Cloner cloner) : base(original, cloner) { }
     protected LeafBase() {
-      Parameters.Add(new FixedValueParameter<BoolValue>(UseDampeningParameterName, "Whether logistic dampening should be used to prevent extreme extrapolation", new BoolValue(false)));
-      Parameters.Add(new FixedValueParameter<DoubleValue>(DampeningParameterName, "Determines the strenght of the logistic dampening. Must be > 0.0. Larger numbers make more conservative predictions.", new DoubleValue(1.5)));
+      Parameters.Add(new FixedValueParameter<BoolValue>(UseDampeningParameterName, "Whether logistic dampening should be used to prevent extreme extrapolation (default=false)", new BoolValue(false)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>(DampeningParameterName, "Determines the strength of logistic dampening. Must be > 0.0. Larger numbers lead to more conservative predictions. (default=1.5)", new DoubleValue(1.5)));
     }
     #endregion
@@ -65 +66 @@
     public abstract bool ProvidesConfidence { get; }
     public abstract int MinLeafSize(IRegressionProblemData pd);
+
     public void Initialize(IScope states) {
       states.Variables.Add(new Variable(LeafBuildingStateVariableName, new LeafBuildingState()));
     }
+
     public void Build(RegressionNodeTreeModel tree, IReadOnlyList<int> trainingRows, IScope stateScope, CancellationToken cancellationToken) {
       var parameters = (RegressionTreeParameters)stateScope.Variables[M5Regression.RegressionTreeParameterVariableName].Value;
@@ -86 +89 @@
     }
 
-    public IRegressionModel BuildModel(IReadOnlyList<int> rows, RegressionTreeParameters parameters, CancellationToken cancellation, out int numParams) {
+    public IRegressionModel BuildModel(IReadOnlyList<int> rows, RegressionTreeParameters parameters, CancellationToken cancellation, out int numberOfParameters) {
       var reducedData = RegressionTreeUtilities.ReduceDataset(parameters.Data, rows, parameters.AllowedInputVariables.ToArray(), parameters.TargetVariable);
       var pd = new RegressionProblemData(reducedData, parameters.AllowedInputVariables.ToArray(), parameters.TargetVariable);
@@ -98 +101 @@
       }
 
-      numParams = numP;
+      numberOfParameters = numP;
       cancellation.ThrowIfCancellationRequested();
       return model;
     }
 
-    public abstract IRegressionModel Build(IRegressionProblemData pd, IRandom random, CancellationToken cancellationToken, out int noParameters);
+    public abstract IRegressionModel Build(IRegressionProblemData pd, IRandom random, CancellationToken cancellationToken, out int numberOfParameters);
     #endregion
 
-    [StorableClass]
+    [StorableType("495243C0-6C15-4328-B30D-FFBFA0F54DCB")]
     public class LeafBuildingState : Item {
       [Storable]
@@ -115 +118 @@
       //State.Code values denote the current action (for pausing)
       //0...nothing has been done;
-      //1...building Models;
+      //1...building models;
       [Storable]
       public int Code = 0;
@@ -121 +124 @@
       #region HLConstructors & Cloning
       [StorableConstructor]
-      protected LeafBuildingState(bool deserializing) : base(deserializing) { }
+      protected LeafBuildingState(StorableConstructorFlag _) : base(_) { }
       protected LeafBuildingState(LeafBuildingState original, Cloner cloner) : base(original, cloner) {
         nodeQueue = new Queue<RegressionNodeModel>(original.nodeQueue.Select(cloner.Clone));