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/Feynman47.cs

    r17678 r18086  
    2828    public override string Name {
    2929      get {
    30         return string.Format("I.43.43 1/(gamma-1)*kb*v/A | {0} samples | {1}", trainingSamples,
     30        return string.Format("I.43.43 1/(gamma-1)*kb*v/A | {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[] {"gamma", "kb", "A", "v", noiseRatio == null ? "kappa" : "kappa_noise"}; }
     38      get { return noiseRatio == null ? new[] { "gamma", "kb", "A", "v", "kappa" } : new[] { "gamma", "kb", "A", "v", "kappa", "kappa_noise" }; }
    3939    }
    4040
     
    7070      }
    7171
    72       if (noiseRatio != null) {
    73         var kappa_noise = new List<double>();
    74         var sigma_noise = (double) noiseRatio * kappa.StandardDeviationPop();
    75         kappa_noise.AddRange(kappa.Select(md => md + NormalDistributedRandom.NextDouble(rand, 0, sigma_noise)));
    76         data.Remove(kappa);
    77         data.Add(kappa_noise);
    78       }
     72      var targetNoise = ValueGenerator.GenerateNoise(kappa, rand, noiseRatio);
     73      if (targetNoise != null) data.Add(targetNoise);
    7974
    8075      return data;
Note: See TracChangeset for help on using the changeset viewer.