Changeset 18027 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/Feynman29.cs

Timestamp:

07/20/21 18:13:55 (3 years ago)

Author:

dpiringe

Message:

#3026

• merged trunk into branch

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/Feynman29.cs (modified) (2 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/Feynman29.cs

@@ -36 +36 @@
 
     protected override string[] VariableNames {
-      get { return new[] {"x1", "x2", "theta1", "theta2", noiseRatio == null ? "x" : "x_noise"}; }
+      get { return noiseRatio == null ? new[] { "x1", "x2", "theta1", "theta2", "x" } : new[] { "x1", "x2", "theta1", "theta2", "x", "x_noise" }; }
     }
 
@@ -71 +71 @@
       }
 
-      if (noiseRatio != null) {
-        var x_noise     = new List<double>();
-        var sigma_noise = (double) Math.Sqrt(noiseRatio.Value) * x.StandardDeviationPop();
-        x_noise.AddRange(x.Select(md => md + NormalDistributedRandom.NextDouble(rand, 0, sigma_noise)));
-        data.Remove(x);
-        data.Add(x_noise);
-      }
+      var targetNoise = GetNoisyTarget(x, rand);
+      if (targetNoise != null) data.Add(targetNoise);
 
       return data;