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

    r17678 r18086  
    2929      get {
    3030        return string.Format(
    31           "I.41.16 h*omega**3/(pi**2 * c**2 * (exp(h*omega/(kb*T))-1)) | {0} samples | {1}",
    32           trainingSamples, noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}",noiseRatio));
     31          "I.41.16 h*omega**3/(pi**2 * c**2 * (exp(h*omega/(kb*T))-1)) | {0}",
     32          noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}",noiseRatio));
    3333      }
    3434    }
     
    3737
    3838    protected override string[] VariableNames {
    39       get { return new[] {"omega", "T", "h", "kb", "c", noiseRatio == null ? "L_rad" : "L_rad_noise"}; }
     39      get { return noiseRatio == null ? new[] { "omega", "T", "h", "kb", "c", "L_rad" } : new[] { "omega", "T", "h", "kb", "c", "L_rad", "L_rad_noise" }; }
    4040    }
    4141
     
    7575      }
    7676
    77       if (noiseRatio != null) {
    78         var L_rad_noise = new List<double>();
    79         var sigma_noise = (double) noiseRatio * L_rad.StandardDeviationPop();
    80         L_rad_noise.AddRange(L_rad.Select(md => md + NormalDistributedRandom.NextDouble(rand, 0, sigma_noise)));
    81         data.Remove(L_rad);
    82         data.Add(L_rad_noise);
    83       }
     77      var targetNoise = ValueGenerator.GenerateNoise(L_rad, rand, noiseRatio);
     78      if (targetNoise != null) data.Add(targetNoise);
    8479
    8580      return data;
Note: See TracChangeset for help on using the changeset viewer.