Changeset 18006 for branches/3087_Ceres_Integration/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman/FeynmanBonus8.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/FeynmanBonus8.cs
r17678 r18006 29 29 get { 30 30 return string.Format( 31 "Goldstein 3.55: m*k_G/L**2*(1+sqrt(1+2*E_n*L**2/(m*k_G**2))*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.55: m*k_G/L**2*(1+sqrt(1+2*E_n*L**2/(m*k_G**2))*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[] {"m", "k_G", "L", "E_n", "theta1", "theta2", noiseRatio == null ? "k" : "k_noise"}; }39 get { return noiseRatio == null ? new[] { "m", "k_G", "L", "E_n", "theta1", "theta2", "k" } : new[] { "m", "k_G", "L", "E_n", "theta1", "theta2", "k", "k_noise" }; } 40 40 } 41 41 … … 79 79 } 80 80 81 if (noiseRatio != null) { 82 var k_noise = new List<double>(); 83 var sigma_noise = (double) noiseRatio * k.StandardDeviationPop(); 84 k_noise.AddRange(k.Select(md => md + NormalDistributedRandom.NextDouble(rand, 0, sigma_noise))); 85 data.Remove(k); 86 data.Add(k_noise); 87 } 81 var targetNoise = GetNoisyTarget(k, rand); 82 if (targetNoise != null) data.Add(targetNoise); 88 83 89 84 return data;
Note: See TracChangeset
for help on using the changeset viewer.