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

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/LeafTypes/ComponentReductionLinearLeaf.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 {
-  [StorableClass]
+  [StorableType("5730B54C-7A8B-4CA7-8F37-7FF3F9848CD2")]
   [Item("ComponentReductionLinearLeaf", "A leaf type that uses principle component analysis to create smaller linear models as leaf models")]
   public class ComponentReductionLinearLeaf : LeafBase {
-    public const string NoComponentsParameterName = "NoComponents";
-    public IFixedValueParameter<IntValue> NoComponentsParameter {
-      get { return Parameters[NoComponentsParameterName] as IFixedValueParameter<IntValue>; }
+    public const string NumberOfComponentsParameterName = "NoComponents";
+    public IFixedValueParameter<IntValue> NumberOfCompontentsParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters[NumberOfComponentsParameterName]; }
     }
-    public int NoComponents {
-      get { return NoComponentsParameter.Value.Value; }
+    public int NumberOfComponents {
+      get { return NumberOfCompontentsParameter.Value.Value; }
+      set { NumberOfCompontentsParameter.Value.Value = value; }
     }
 
     #region Constructors & Cloning
     [StorableConstructor]
-    protected ComponentReductionLinearLeaf(bool deserializing) : base(deserializing) { }
+    protected ComponentReductionLinearLeaf(StorableConstructorFlag _) : base(_) { }
     protected ComponentReductionLinearLeaf(ComponentReductionLinearLeaf original, Cloner cloner) : base(original, cloner) { }
     public ComponentReductionLinearLeaf() {
-      Parameters.Add(new FixedValueParameter<IntValue>(NoComponentsParameterName, "The maximum number of principle components used", new IntValue(10)));
+      Parameters.Add(new FixedValueParameter<IntValue>(NumberOfComponentsParameterName, "The maximum number of principle components used (default=10)", new IntValue(10)));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -59 +60 @@
       get { return false; }
     }
+
     public override IRegressionModel Build(IRegressionProblemData pd, IRandom random,
-      CancellationToken cancellationToken, out int noParameters) {
-      var pca = PrincipleComponentTransformation.CreateProjection(pd.Dataset, pd.TrainingIndices, pd.AllowedInputVariables, true);
+      CancellationToken cancellationToken, out int numberOfParameters) {
+      var pca = PrincipleComponentTransformation.CreateProjection(pd.Dataset, pd.TrainingIndices, pd.AllowedInputVariables, normalize: true);
       var pcdata = pca.TransformProblemData(pd);
       ComponentReducedLinearModel bestModel = null;
       var bestCvrmse = double.MaxValue;
-      noParameters = 1;
-      for (var i = 1; i <= Math.Min(NoComponents, pd.AllowedInputVariables.Count()); i++) {
+      numberOfParameters = 1;
+      for (var i = 1; i <= Math.Min(NumberOfComponents, pd.AllowedInputVariables.Count()); i++) {
         var pd2 = (IRegressionProblemData)pcdata.Clone();
         var inputs = new HashSet<string>(pca.ComponentNames.Take(i));
@@ -75 +77 @@
         if (rmse > bestCvrmse) continue;
         bestModel = new ComponentReducedLinearModel(pd2.TargetVariable, model, pca);
-        noParameters = i + 1;
+        numberOfParameters = i + 1;
         bestCvrmse = rmse;
       }
@@ -82 +84 @@
 
     public override int MinLeafSize(IRegressionProblemData pd) {
-      return NoComponents + 2;
+      return NumberOfComponents + 2;
     }
     #endregion