Changeset 8521

Timestamp:

08/23/12 11:21:29 (12 years ago)

Author:

ascheibe

Message:

#1886 added gradient to statistical tabular view

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3

Files:

• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (2 diffs)
• LinearLeastSquaresFitting.cs (added)
• RunCollectionStatisticalTabularView.cs (modified) (3 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj

@@ -38 +38 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <Private>False</Private>
@@ -114 +117 @@
   <ItemGroup>
     <Compile Include="AlgorithmBehaviorHelpers.cs" />
+    <Compile Include="LinearLeastSquaresFitting.cs" />
     <Compile Include="RunCollectionStatisticalTabularView.cs">
       <SubType>UserControl</SubType>

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/RunCollectionStatisticalTabularView.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Analysis.AlgorithmBehavior.Analyzers;
 using HeuristicLab.Common;
 using HeuristicLab.Core.Views;
@@ -155 +156 @@
       string rowName = (string)dataRowComboBox.SelectedItem;
 
-      string[] columnNames = new string[] { "Count", "Minimum", "Maximum", "Average", "Median", "Standard Deviation", "Variance", "25th Percentile", "75th Percentile" };
+      string[] columnNames = new string[] { "Count", "Minimum", "Maximum", "Average", "Median", "Standard Deviation", "Variance", "25th Percentile", "75th Percentile", "Gradient", "Absolut Error" };
 
       var runs = Content.Where(x => x.Results.ContainsKey(resultName));
@@ -178 +179 @@
         double percentile25 = values.Percentile(0.25);
         double percentile75 = values.Percentile(0.75);
-
-        dt[i,0] = cnt.ToString();
-        dt[i,1] = min.ToString();
-        dt[i,2] = max.ToString();
-        dt[i,3] = avg.ToString();
-        dt[i,4] = median.ToString();
-        dt[i,5] = stdDev.ToString();
-        dt[i,6] = variance.ToString();
-        dt[i,7] = percentile25.ToString();
-        dt[i,8] = percentile75.ToString();
+        double k, d, r;
+        LinearLeastSquaresFitting.Calculate(values.ToArray(), out k, out d);
+        r = LinearLeastSquaresFitting.CalculateError(values.ToArray(), k, d);
+
+        dt[i, 0] = cnt.ToString();
+        dt[i, 1] = min.ToString();
+        dt[i, 2] = max.ToString();
+        dt[i, 3] = avg.ToString();
+        dt[i, 4] = median.ToString();
+        dt[i, 5] = stdDev.ToString();
+        dt[i, 6] = variance.ToString();
+        dt[i, 7] = percentile25.ToString();
+        dt[i, 8] = percentile75.ToString();
+        dt[i, 9] = k.ToString();
+        dt[i, 10] = r.ToString();
 
         i++;