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

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

@@ -29 +29 @@
       get {
         return string.Format(
-          "Jackson 4.60: Ef*cos(theta)*((alpha-1)/(alpha+2)*d**3/r**2-r) | {0} samples | {1}",
-          trainingSamples, noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}",noiseRatio));
+          "Jackson 4.60: Ef*cos(theta)*((alpha-1)/(alpha+2)*d**3/r**2-r) | {0}",
+          noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}",noiseRatio));
       }
     }
@@ -37 +37 @@
 
     protected override string[] VariableNames {
-      get { return new[] {"Ef", "theta", "r", "d", "alpha", noiseRatio == null ? "Volt" : "Volt_noise"}; }
+      get { return noiseRatio == null ? new[] { "Ef", "theta", "r", "d", "alpha", "Volt" } : new[] { "Ef", "theta", "r", "d", "alpha", "Volt", "Volt_noise" }; }
     }
 
@@ -74 +74 @@
       }
 
-      if (noiseRatio != null) {
-        var Volt_noise  = new List<double>();
-        var sigma_noise = (double) noiseRatio * Volt.StandardDeviationPop();
-        Volt_noise.AddRange(Volt.Select(md => md + NormalDistributedRandom.NextDouble(rand, 0, sigma_noise)));
-        data.Remove(Volt);
-        data.Add(Volt_noise);
-      }
+      var targetNoise = ValueGenerator.GenerateNoise(Volt, rand, noiseRatio);
+      if (targetNoise != null) data.Add(targetNoise);
 
       return data;