Changeset 18086 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/Feynman14.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)
• Feynman14.cs (modified) (3 diffs)

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

@@ -28 +28 @@
     public override string Name {
       get {
-        return string.Format("I.13.12 G*m1*m2*(1/r2-1/r1) | {0} samples | {1}", trainingSamples,
+        return string.Format("I.13.12 G*m1*m2*(1/r2-1/r1) | {0}",
           noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}",noiseRatio));
       }
@@ -36 +36 @@
 
     protected override string[] VariableNames {
-      get { return new[] {"m1", "m2", "r1", "r2", "G", noiseRatio == null ? "U" : "U_noise"}; }
+      get { return noiseRatio == null ? new[] { "m1", "m2", "r1", "r2", "G", "U" } : new[] { "m1", "m2", "r1", "r2", "G", "U", "U_noise" }; }
     }
 
@@ -72 +72 @@
       }
 
-      if (noiseRatio != null) {
-        var U_noise     = new List<double>();
-        var sigma_noise = (double) noiseRatio * U.StandardDeviationPop();
-        U_noise.AddRange(U.Select(md => md + NormalDistributedRandom.NextDouble(rand, 0, sigma_noise)));
-        data.Remove(U);
-        data.Add(U_noise);
-      }
+      var targetNoise = ValueGenerator.GenerateNoise(U, rand, noiseRatio);
+      if (targetNoise != null) data.Add(targetNoise);
 
       return data;