Changeset 17973 for trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/FeynmanBonus1.cs

Timestamp:

05/04/21 14:29:30 (3 years ago)

Author:

chaider

Message:

#3075

• Added target without noise to noisy instances
• Moved noise calculation to descriptor

File:

• trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/FeynmanBonus1.cs (modified) (2 diffs)

trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/FeynmanBonus1.cs

@@ -37 +37 @@
 
     protected override string[] VariableNames {
-      get { return new[] {"Z_1", "Z_2", "alpha", "hbar", "c", "E_n", "theta", noiseRatio == null ? "A" : "A_noise"}; }
+      get { return noiseRatio == null ? new[] { "Z_1", "Z_2", "alpha", "hbar", "c", "E_n", "theta", "A" } : new[] { "Z_1", "Z_2", "alpha", "hbar", "c", "E_n", "theta", "A", "A_noise" }; }
     }
 
@@ -80 +80 @@
       }
 
-      if (noiseRatio != null) {
-        var A_noise     = new List<double>();
-        var sigma_noise = (double) Math.Sqrt(noiseRatio.Value) * A.StandardDeviationPop();
-        A_noise.AddRange(A.Select(md => md + NormalDistributedRandomPolar.NextDouble(rand, 0, sigma_noise)));
-        data.Remove(A);
-        data.Add(A_noise);
-      }
+      var targetNoise = GetNoisyTarget(A, rand);
+      if (targetNoise != null) data.Add(targetNoise);
 
       return data;