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

    r17678 r18086  
    2828    public override string Name {
    2929      get {
    30         return string.Format("I.47.23 sqrt(gamma*pr/rho) | {0} samples | {1}", trainingSamples,
     30        return string.Format("I.47.23 sqrt(gamma*pr/rho) | {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", "pr", "rho", noiseRatio == null ? "c" : "c_noise"}; }
     38      get { return noiseRatio == null ? new[] { "gamma", "pr", "rho", "c" } : new[] { "gamma", "pr", "rho", "c", "c_noise" }; }
    3939    }
    4040
     
    6868      }
    6969
    70       if (noiseRatio != null) {
    71         var c_noise     = new List<double>();
    72         var sigma_noise = (double) noiseRatio * c.StandardDeviationPop();
    73         c_noise.AddRange(c.Select(md => md + NormalDistributedRandom.NextDouble(rand, 0, sigma_noise)));
    74         data.Remove(c);
    75         data.Add(c_noise);
    76       }
     70      var targetNoise = ValueGenerator.GenerateNoise(c, rand, noiseRatio);
     71      if (targetNoise != null) data.Add(targetNoise);
    7772
    7873      return data;
Note: See TracChangeset for help on using the changeset viewer.