Changeset 18086 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/FeynmanBonus9.cs
- Timestamp:
- 11/19/21 16:07:45 (2 years ago)
- 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/FeynmanBonus9.cs
r17678 r18086 29 29 get { 30 30 return string.Format( 31 "Goldstein 3.64: d*(1-alpha**2)/(1+alpha*cos(theta1-theta2)) | {0} samples | {1}",32 trainingSamples,noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}",noiseRatio));31 "Goldstein 3.64: d*(1-alpha**2)/(1+alpha*cos(theta1-theta2)) | {0}", 32 noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}",noiseRatio)); 33 33 } 34 34 } … … 37 37 38 38 protected override string[] VariableNames { 39 get { return n ew[] {"d", "alpha", "theta1", "theta2", noiseRatio == null ? "r" : "r_noise"}; }39 get { return noiseRatio == null ? new[] { "d", "alpha", "theta1", "theta2", "r" } : new[] { "d", "alpha", "theta1", "theta2", "r", "r_noise" }; } 40 40 } 41 41 … … 71 71 } 72 72 73 if (noiseRatio != null) { 74 var r_noise = new List<double>(); 75 var sigma_noise = (double) noiseRatio * r.StandardDeviationPop(); 76 r_noise.AddRange(r.Select(md => md + NormalDistributedRandom.NextDouble(rand, 0, sigma_noise))); 77 data.Remove(r); 78 data.Add(r_noise); 79 } 73 var targetNoise = ValueGenerator.GenerateNoise(r, rand, noiseRatio); 74 if (targetNoise != null) data.Add(targetNoise); 75 76 //var targetNoise = GetNoisyTarget(r, rand); 77 //if (targetNoise != null) data.Add(targetNoise); 80 78 81 79 return data;
Note: See TracChangeset
for help on using the changeset viewer.