- Timestamp:
- 02/05/15 17:29:35 (10 years ago)
- Location:
- stable
- Files:
-
- 3 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 11703-11705,11715,11717,11725,11757,11837,11914
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Analysis.Statistics.Views/3.3
-
Property
svn:global-ignores
set to
obj
-
Property
svn:ignore
set to
Plugin.cs
-
Property
svn:global-ignores
set to
-
stable/HeuristicLab.Analysis.Statistics.Views/3.3/ChartAnalysisView.cs
r11705 r11919 177 177 178 178 var fittingAlg = fittingComboBox.SelectedItem as IFitting; 179 DataRow newRow = fittingAlg.CalculateFittedLine(values, row.Name + " (" + fittingAlg + ")"); 179 DataRow newRow = fittingAlg.CalculateFittedLine(values); 180 newRow.Name = row.Name + " (" + fittingAlg + ")"; 180 181 181 182 if (!resTable.Rows.ContainsKey(newRow.Name)) … … 265 266 LinearLeastSquaresFitting llsFitting = new LinearLeastSquaresFitting(); 266 267 string[] columnNames = new string[] { "Count", "Minimum", "Maximum", "Average", "Median", "Standard Deviation", "Variance", "25th Percentile", "75th Percentile", 267 "Avg. of Upper 25 %", " Avg. of Lower 25 %", "Avg. of First 25 %", "Avg. of Last 25 %", " Linear Gradient", "Average Relative Error" };268 "Avg. of Upper 25 %", " Avg. of Lower 25 %", "Avg. of First 25 %", "Avg. of Last 25 %", "Slope", "Intercept", "Average Relative Error" }; 268 269 269 270 runs = Content.Where(x => x.Results.ContainsKey(resultName) && x.Visible).ToList(); … … 277 278 dt.SortableView = true; 278 279 DataRow row = resTable.Rows[rowName]; 279 var values = row.Values. AsEnumerable();280 var values = row.Values.ToArray(); 280 281 281 282 double cnt = values.Count(); … … 292 293 double firstAvg = values.Take((int)(values.Count() * 0.25)).Average(); 293 294 double lastAvg = values.Skip((int)(values.Count() * 0.75)).Average(); 294 double k, d, r;295 llsFitting.Calculate(values .ToArray(), out k, out d);296 r = llsFitting.CalculateError(values .ToArray(), k, d);295 double slope, intercept, r; 296 llsFitting.Calculate(values, out slope, out intercept); 297 r = llsFitting.CalculateError(values, slope, intercept); 297 298 298 299 dt[i, 0] = cnt; … … 309 310 dt[i, 11] = firstAvg; 310 311 dt[i, 12] = lastAvg; 311 dt[i, 13] = k; 312 dt[i, 14] = r; 312 dt[i, 13] = slope; 313 dt[i, 14] = intercept; 314 dt[i, 15] = r; 313 315 314 316 i++;
Note: See TracChangeset
for help on using the changeset viewer.