Changeset 18006 for branches/3087_Ceres_Integration/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/FeynmanBonus15.cs
- Timestamp:
- 07/13/21 10:55:09 (3 years ago)
- Location:
- branches/3087_Ceres_Integration
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3087_Ceres_Integration
- Property svn:mergeinfo changed
-
branches/3087_Ceres_Integration/HeuristicLab.Problems.Instances.DataAnalysis
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.Instances.DataAnalysis (added) merged: 17804-17805,17931,17966-17967,17969,17973-17974
- Property svn:mergeinfo changed
-
branches/3087_Ceres_Integration/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/FeynmanBonus15.cs
r17678 r18006 29 29 get { 30 30 return string.Format( 31 "Jackson 3.45: q/sqrt(r**2+d**2-2*r*d*cos(alpha)) | {0} samples | {1}",32 trainingSamples,noiseRatio == null ? "no noise" : string.Format(System.Globalization.CultureInfo.InvariantCulture, "noise={0:g}",noiseRatio));31 "Jackson 3.45: q/sqrt(r**2+d**2-2*r*d*cos(alpha)) | {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[] {"q", "r", "d", "alpha", noiseRatio == null ? "Volt" : "Volt_noise"}; }39 get { return noiseRatio == null ? new[] { "q", "r", "d", "alpha", "Volt" } : new[] { "q", "r", "d", "alpha", "Volt", "Volt_noise" }; } 40 40 } 41 41 … … 72 72 } 73 73 74 if (noiseRatio != null) { 75 var Volt_noise = new List<double>(); 76 var sigma_noise = (double) noiseRatio * Volt.StandardDeviationPop(); 77 Volt_noise.AddRange(Volt.Select(md => md + NormalDistributedRandom.NextDouble(rand, 0, sigma_noise))); 78 data.Remove(Volt); 79 data.Add(Volt_noise); 80 } 74 var targetNoise = GetNoisyTarget(Volt, rand); 75 if (targetNoise != null) data.Add(targetNoise); 81 76 82 77 return data;
Note: See TracChangeset
for help on using the changeset viewer.