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

    r17678 r18086  
    2828    public override string Name {
    2929      get {
    30         return string.Format("III.14.14 I_0*(exp(q*Volt/(kb*T))-1) | {0} samples | {1}",
    31           trainingSamples, noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}",noiseRatio));
     30        return string.Format("III.14.14 I_0*(exp(q*Volt/(kb*T))-1) | {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[] {"I_0", "q", "Volt", "kb", "T", noiseRatio == null ? "I" : "I_noise"}; }
     38      get { return noiseRatio == null ? new[] { "I_0", "q", "Volt", "kb", "T", "I" } : new[] { "I_0", "q", "Volt", "kb", "T", "I", "I_noise" }; }
    3939    }
    4040
     
    7272      }
    7373
    74       if (noiseRatio != null) {
    75         var I_noise     = new List<double>();
    76         var sigma_noise = (double) noiseRatio * I.StandardDeviationPop();
    77         I_noise.AddRange(I.Select(md => md + NormalDistributedRandom.NextDouble(rand, 0, sigma_noise)));
    78         data.Remove(I);
    79         data.Add(I_noise);
    80       }
     74      var targetNoise = ValueGenerator.GenerateNoise(I, rand, noiseRatio);
     75      if (targetNoise != null) data.Add(targetNoise);
    8176
    8277      return data;
Note: See TracChangeset for help on using the changeset viewer.