Changeset 17966 for trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/Feynman17.cs

Timestamp:

04/28/21 11:31:24 (3 years ago)

Author:

mkommend

Message:

#3075: Changed Feynman problem instances to new normal distributed RNG.

File:

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

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

@@ -10 +10 @@
     private readonly int trainingSamples;
 
-    public Feynman17() : this((int) DateTime.Now.Ticks, 10000, 10000, null) { }
+    public Feynman17() : this((int)DateTime.Now.Ticks, 10000, 10000, null) { }
 
     public Feynman17(int seed) {
-      Seed            = seed;
+      Seed = seed;
       trainingSamples = 10000;
-      testSamples     = 10000;
-      noiseRatio      = null;
+      testSamples = 10000;
+      noiseRatio = null;
     }
 
     public Feynman17(int seed, int trainingSamples, int testSamples, double? noiseRatio) {
-      Seed                 = seed;
+      Seed = seed;
       this.trainingSamples = trainingSamples;
-      this.testSamples     = testSamples;
-      this.noiseRatio      = noiseRatio;
+      this.testSamples = testSamples;
+      this.noiseRatio = noiseRatio;
     }
 
@@ -29 +29 @@
       get {
         return string.Format("I.15.3x (x-u*t)/sqrt(1-u**2/c**2) | {0}",
-          noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}",noiseRatio));
+          noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}", noiseRatio));
       }
     }
@@ -36 +36 @@
 
     protected override string[] VariableNames {
-      get { return new[] {"x", "u", "c", "t", noiseRatio == null ? "x1" : "x1_noise"}; }
+      get { return new[] { "x", "u", "c", "t", noiseRatio == null ? "x1" : "x1_noise" }; }
     }
 
-    protected override string[] AllowedInputVariables { get { return new[] {"x", "u", "c", "t"}; } }
+    protected override string[] AllowedInputVariables { get { return new[] { "x", "u", "c", "t" }; } }
 
     public int Seed { get; private set; }
@@ -49 +49 @@
 
     protected override List<List<double>> GenerateValues() {
-      var rand = new MersenneTwister((uint) Seed);
+      var rand = new MersenneTwister((uint)Seed);
 
       var data = new List<List<double>>();
-      var x    = ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 5, 10).ToList();
-      var u    = ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 1, 2).ToList();
-      var c    = ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 3, 20).ToList();
-      var t    = ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 1, 2).ToList();
+      var x = ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 5, 10).ToList();
+      var u = ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 1, 2).ToList();
+      var c = ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 3, 20).ToList();
+      var t = ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 1, 2).ToList();
 
       var x1 = new List<double>();
@@ -71 +71 @@
 
       if (noiseRatio != null) {
-        var x1_noise    = new List<double>();
-        var sigma_noise = (double) Math.Sqrt(noiseRatio.Value) * x1.StandardDeviationPop();
-        x1_noise.AddRange(x1.Select(md => md + NormalDistributedRandom.NextDouble(rand, 0, sigma_noise)));
+        var x1_noise = new List<double>();
+        var sigma_noise = (double)Math.Sqrt(noiseRatio.Value) * x1.StandardDeviationPop();
+        x1_noise.AddRange(x1.Select(md => md + NormalDistributedRandomPolar.NextDouble(rand, 0, sigma_noise)));
         data.Remove(x1);
         data.Add(x1_noise);