Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/19/21 16:07:45 (3 years ago)
Author:
mkommend
Message:

#2521: Merged trunk changes into branch.

Location:
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/Feynman18.cs

    r17678 r18086  
    2828    public override string Name {
    2929      get {
    30         return string.Format("I.15.3t (t-u*x/c**2)/sqrt(1-u**2/c**2) | {0} samples | {1}",
    31           trainingSamples, noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}",noiseRatio));
     30        return string.Format("I.15.3t (t-u*x/c**2)/sqrt(1-u**2/c**2) | {0}",
     31          noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}",noiseRatio));
    3232      }
    3333    }
     
    3636
    3737    protected override string[] VariableNames {
    38       get { return new[] {"x", "c", "u", "t", noiseRatio == null ? "t1" : "t1_noise"}; }
     38      get { return noiseRatio == null ? new[] { "x", "c", "u", "t", "t1" } : new[] { "x", "c", "u", "t", "t1", "t1_noise" }; }
    3939    }
    4040
     
    7070      }
    7171
    72       if (noiseRatio != null) {
    73         var t1_noise    = new List<double>();
    74         var sigma_noise = (double) noiseRatio * t1.StandardDeviationPop();
    75         t1_noise.AddRange(t1.Select(md => md + NormalDistributedRandom.NextDouble(rand, 0, sigma_noise)));
    76         data.Remove(t1);
    77         data.Add(t1_noise);
    78       }
     72      var targetNoise = ValueGenerator.GenerateNoise(t1, rand, noiseRatio);
     73      if (targetNoise != null) data.Add(targetNoise);
    7974
    8075      return data;
Note: See TracChangeset for help on using the changeset viewer.