Changeset 11919 for stable/HeuristicLab.Analysis.Statistics.Views/3.3/ChartAnalysisView.cs

Timestamp:

02/05/15 17:29:35 (9 years ago)

Author:

ascheibe

Message:

#2031 merged revisions 11703,11704,11705,11706,11715,11717,11725,11757,11837,11914 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis.Statistics.Views (copied) (copied from trunk/sources/HeuristicLab.Analysis.Statistics.Views)
• HeuristicLab.Analysis.Statistics.Views/3.3 (modified) (2 props)
• HeuristicLab.Analysis.Statistics.Views/3.3/ChartAnalysisView.cs (modified) (5 diffs)

stable/HeuristicLab.Analysis.Statistics.Views/3.3/ChartAnalysisView.cs

@@ -177 +177 @@
 
         var fittingAlg = fittingComboBox.SelectedItem as IFitting;
-        DataRow newRow = fittingAlg.CalculateFittedLine(values, row.Name + " (" + fittingAlg + ")");
+        DataRow newRow = fittingAlg.CalculateFittedLine(values);
+        newRow.Name = row.Name + " (" + fittingAlg + ")";
 
         if (!resTable.Rows.ContainsKey(newRow.Name))
@@ -265 +266 @@
       LinearLeastSquaresFitting llsFitting = new LinearLeastSquaresFitting();
       string[] columnNames = new string[] { "Count", "Minimum", "Maximum", "Average", "Median", "Standard Deviation", "Variance", "25th Percentile", "75th Percentile",
-        "Avg. of Upper 25 %", " Avg. of Lower 25 %", "Avg. of First 25 %", "Avg. of Last 25 %", "Linear Gradient", "Average Relative Error" };
+        "Avg. of Upper 25 %", " Avg. of Lower 25 %", "Avg. of First 25 %", "Avg. of Last 25 %", "Slope", "Intercept", "Average Relative Error" };
 
       runs = Content.Where(x => x.Results.ContainsKey(resultName) && x.Visible).ToList();
@@ -277 +278 @@
         dt.SortableView = true;
         DataRow row = resTable.Rows[rowName];
-        var values = row.Values.AsEnumerable();
+        var values = row.Values.ToArray();
 
         double cnt = values.Count();
@@ -292 +293 @@
         double firstAvg = values.Take((int)(values.Count() * 0.25)).Average();
         double lastAvg = values.Skip((int)(values.Count() * 0.75)).Average();
-        double k, d, r;
-        llsFitting.Calculate(values.ToArray(), out k, out d);
-        r = llsFitting.CalculateError(values.ToArray(), k, d);
+        double slope, intercept, r;
+        llsFitting.Calculate(values, out slope, out intercept);
+        r = llsFitting.CalculateError(values, slope, intercept);
 
         dt[i, 0] = cnt;
@@ -309 +310 @@
         dt[i, 11] = firstAvg;
         dt[i, 12] = lastAvg;
-        dt[i, 13] = k;
-        dt[i, 14] = r;
+        dt[i, 13] = slope;
+        dt[i, 14] = intercept;
+        dt[i, 15] = r;
 
         i++;