Changeset 17388 for branches/3044_variableScaling/HeuristicLab.Problems.DataAnalysis

Timestamp:

12/20/19 11:37:00 (5 years ago)

Author:

djoedick

Message:

#3044: Added parameter for input variable scaling for regression problems.

Location:

branches/3044_variableScaling/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• Implementation/Regression/RegressionProblemData.cs (modified) (5 diffs)
• Interfaces/Regression/IRegressionProblemData.cs (modified) (1 diff)

branches/3044_variableScaling/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -1 @@
-#region License Information
+#region License Information
 /* HeuristicLab
  * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -34 +34 @@
   public class RegressionProblemData : DataAnalysisProblemData, IRegressionProblemData, IStorableContent {
     protected const string TargetVariableParameterName = "TargetVariable";
+    protected const string ScaleInputsParameterName = "Scale Inputs";
     public string Filename { get; set; }
 
@@ -110 +111 @@
     }
 
+    public IFixedValueParameter<BoolValue> ScaleInputsParameter {
+      get { return (IFixedValueParameter<BoolValue>)Parameters[ScaleInputsParameterName]; }
+    }
+
+    public bool ScaleInputs {
+      get { return ScaleInputsParameter.Value.Value; }
+      set { ScaleInputsParameter.Value.Value = value; }
+    }
+
     public IEnumerable<double> TargetVariableValues {
       get { return Dataset.GetDoubleValues(TargetVariable); }
@@ -120 +130 @@
     }
 
-
     [StorableConstructor]
     protected RegressionProblemData(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
+      if (!Parameters.ContainsKey(ScaleInputsParameterName)) {
+        Parameters.Add(new FixedValueParameter<BoolValue>(ScaleInputsParameterName, "If enabled input features are scaled by a standard transformation (µ=0, σ=1)", new BoolValue(false)));
+      }
       RegisterParameterEvents();
     }
@@ -152 +164 @@
       var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
       Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>(variables), variables.Where(x => x.Value == targetVariable).First()));
+      Parameters.Add(new FixedValueParameter<BoolValue>(ScaleInputsParameterName, "If enabled input features are scaled by a standard transformation (µ=0, σ=1)", new BoolValue(false)));
       RegisterParameterEvents();
     }

branches/3044_variableScaling/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs

@@ -31 +31 @@
     IEnumerable<double> TargetVariableTrainingValues { get; }
     IEnumerable<double> TargetVariableTestValues { get; }
+
+    bool ScaleInputs { get; set; }
   }
 }