Changeset 18086 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/Feynman92.cs

Timestamp:

11/19/21 16:07:45 (2 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes into branch.

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman

Files:

• . (copied) (copied from trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman)
• Feynman92.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/Feynman92.cs

@@ -28 +28 @@
     public override string Name {
       get {
-        return string.Format("III.12.43 n*h | {0} samples | {1}", trainingSamples,
+        return string.Format("III.12.43 n*h | {0}",
           noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}",noiseRatio));
       }
@@ -34 +34 @@
 
     protected override string TargetVariable { get { return noiseRatio == null ? "L" : "L_noise"; } }
-    protected override string[] VariableNames { get { return new[] {"n", "h", noiseRatio == null ? "L" : "L_noise"}; } }
+
+    protected override string[] VariableNames {
+      get { return noiseRatio == null ? new[] { "n", "h", "L" } : new[] { "n", "h", "L", "L_noise" }; }
+    }
     protected override string[] AllowedInputVariables { get { return new[] {"n", "h"}; } }
 
@@ -62 +65 @@
       }
 
-      if (noiseRatio != null) {
-        var L_noise     = new List<double>();
-        var sigma_noise = (double) noiseRatio * L.StandardDeviationPop();
-        L_noise.AddRange(L.Select(md => md + NormalDistributedRandom.NextDouble(rand, 0, sigma_noise)));
-        data.Remove(L);
-        data.Add(L_noise);
-      }
+      var targetNoise = ValueGenerator.GenerateNoise(L, rand, noiseRatio);
+      if (targetNoise != null) data.Add(targetNoise);
 
       return data;