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

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

@@ -36 +36 @@
 
     protected override string[] VariableNames {
-      get { return new[] {"m1", "m2", "G", "x1", "x2", "y1", "y2", "z1", "z2", noiseRatio == null ? "F" : "F_noise"}; }
+      get { return noiseRatio == null ? new[] { "m1", "m2", "G", "x1", "x2", "y1", "y2", "z1", "z2", "F" } : new[] { "m1", "m2", "G", "x1", "x2", "y1", "y2", "z1", "z2", "F", "F_noise" }; }
     }
 
@@ -83 +83 @@
       }
 
-      if (noiseRatio != null) {
-        var F_noise     = new List<double>();
-        var sigma_noise = (double) Math.Sqrt(noiseRatio.Value) * F.StandardDeviationPop();
-        F_noise.AddRange(F.Select(md => md + NormalDistributedRandomPolar.NextDouble(rand, 0, sigma_noise)));
-        data.Remove(F);
-        data.Add(F_noise);
-      }
+      var targetNoise = GetNoisyTarget(F, rand);
+      if (targetNoise != null) data.Add(targetNoise);
 
       return data;