Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/19/21 16:07:45 (2 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/Feynman43.cs

    r17678 r18086  
    2828    public override string Name {
    2929      get {
    30         return string.Format("I.40.1 n_0*exp(-m*g*x/(kb*T)) | {0} samples | {1}", trainingSamples,
     30        return string.Format("I.40.1 n_0*exp(-m*g*x/(kb*T)) | {0}",
    3131          noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}",noiseRatio));
    3232      }
     
    3636
    3737    protected override string[] VariableNames {
    38       get { return new[] {"n_0", "m", "x", "T", "g", "kb", noiseRatio == null ? "n" : "n_noise"}; }
     38      get { return noiseRatio == null ? new[] { "n_0", "m", "x", "T", "g", "kb", "n" } : new[] { "n_0", "m", "x", "T", "g", "kb", "n", "n_noise" }; }
    3939    }
    4040
     
    7474      }
    7575
    76       if (noiseRatio != null) {
    77         var n_noise     = new List<double>();
    78         var sigma_noise = (double) noiseRatio * n.StandardDeviationPop();
    79         n_noise.AddRange(n.Select(md => md + NormalDistributedRandom.NextDouble(rand, 0, sigma_noise)));
    80         data.Remove(n);
    81         data.Add(n_noise);
    82       }
     76      var targetNoise = ValueGenerator.GenerateNoise(n, rand, noiseRatio);
     77      if (targetNoise != null) data.Add(targetNoise);
    8378
    8479      return data;
Note: See TracChangeset for help on using the changeset viewer.