Changeset 17973 for trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/FeynmanBonus4.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/FeynmanBonus4.cs (modified) (2 diffs)

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

@@ -37 +37 @@
 
     protected override string[] VariableNames {
-      get { return new[] {"G", "c", "m1", "m2", "r", noiseRatio == null ? "Pwr" : "Pwr_noise"}; }
+      get { return noiseRatio == null ? new[] { "G", "c", "m1", "m2", "r", "Pwr" } : new[] { "G", "c", "m1", "m2", "r", "Pwr", "Pwr_noise" }; }
     }
 
@@ -74 +74 @@
       }
 
-      if (noiseRatio != null) {
-        var Pwr_noise   = new List<double>();
-        var sigma_noise = (double) Math.Sqrt(noiseRatio.Value) * Pwr.StandardDeviationPop();
-        Pwr_noise.AddRange(Pwr.Select(md => md + NormalDistributedRandomPolar.NextDouble(rand, 0, sigma_noise)));
-        data.Remove(Pwr);
-        data.Add(Pwr_noise);
-      }
+      var targetNoise = GetNoisyTarget(Pwr, rand);
+      if (targetNoise != null) data.Add(targetNoise);
 
       return data;