Changeset 9706

Timestamp:

07/15/13 16:33:13 (9 years ago)

Author:

ascheibe

Message:

#2031

• added exponential fitting
• added logarithmic fitting
• refactored fitting code
• updated license headers

Location:

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3

Files:

• ChartAnalysisView.cs (modified) (5 diffs)
• ChartAnalysisView.designer.cs (modified) (4 diffs)
• CorrelationView.cs (modified) (1 diff)
• CorrelationView.designer.cs (modified) (1 diff)
• ExpFitting.cs (added)
• HeuristicLab.Analysis.Statistics-3.3.csproj (modified) (1 diff)
• IFitting.cs (added)
• KruskalWallis.cs (modified) (1 diff)
• LinearLeastSquaresFitting.cs (modified) (4 diffs)
• LogFitting.cs (added)
• Plugin.cs.frame (modified) (1 diff)
• Properties/AssemblyInfo.cs.frame (modified) (2 diffs)
• SampleSizeChecker.cs (modified) (1 diff)
• SampleSizeChecker.designer.cs (modified) (1 diff)
• SampleSizeDetermination.cs (modified) (1 diff)
• SampleSizeInfluenceView.Designer.cs (modified) (1 diff)
• SampleSizeInfluenceView.cs (modified) (1 diff)
• StatisticalTestingView.cs (modified) (1 diff)
• StatisticalTestingView.designer.cs (modified) (1 diff)
• TTest.cs (modified) (1 diff)

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/ChartAnalysisView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29 +29 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Analysis.Statistics {
@@ -49 +50 @@
       InitializeComponent();
       stringConvertibleMatrixView.DataGridView.RowHeaderMouseDoubleClick += new DataGridViewCellMouseEventHandler(DataGridView_RowHeaderMouseDoubleClick);
+
+      var fittingAlgs = ApplicationManager.Manager.GetInstances<IFitting>();
+      foreach (var fit in fittingAlgs) {
+        fittingComboBox.Items.Add(fit);
+      }
+      fittingComboBox.SelectedIndex = 0;
     }
 
@@ -137 +144 @@
         DataRow row = resTable.Rows[rowName];
         var values = row.Values.ToArray();
-        double k, d;
-        LinearLeastSquaresFitting.Calculate(values, out k, out d);
-
-        DataRow newRow = new DataRow(row.Name + " Fitted Line");
-        for (int i = 0; i < values.Count(); i++) {
-          newRow.Values.Add(k * i + d);
-        }
+
+        var fittingAlg = fittingComboBox.SelectedItem as IFitting;
+        DataRow newRow = fittingAlg.CalculateFittedLine(values, row.Name + " (" + fittingAlg.ToString() + ")");
 
         if (!resTable.Rows.ContainsKey(newRow.Name))
@@ -224 +227 @@
         double percentile75 = values.Percentile(0.75);
         double k, d, r;
-        LinearLeastSquaresFitting.Calculate(values.ToArray(), out k, out d);
-        r = LinearLeastSquaresFitting.CalculateError(values.ToArray(), k, d);
+        LinearLeastSquaresFitting llsf = new LinearLeastSquaresFitting();
+        llsf.Calculate(values.ToArray(), out k, out d);
+        r = llsf.CalculateError(values.ToArray(), k, d);
         double lowerAvg = values.OrderBy(x => x).Take((int)(values.Count() * 0.25)).Average();
         double upperAvg = values.OrderByDescending(x => x).Take((int)(values.Count() * 0.25)).Average();

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/ChartAnalysisView.designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -34 +34 @@
     /// </summary>
     private void InitializeComponent() {
-      this.stringConvertibleMatrixView = new HeuristicLab.Data.Views.StringConvertibleMatrixView();
+      this.fittingComboBox = new System.Windows.Forms.ComboBox();
+      this.addValuesButton = new System.Windows.Forms.Button();
+      this.addLineToChart = new System.Windows.Forms.Button();
       this.dataRowComboBox = new System.Windows.Forms.ComboBox();
       this.label2 = new System.Windows.Forms.Label();
       this.label1 = new System.Windows.Forms.Label();
       this.dataTableComboBox = new System.Windows.Forms.ComboBox();
-      this.addLineToChart = new System.Windows.Forms.Button();
-      this.addValuesButton = new System.Windows.Forms.Button();
+      this.stringConvertibleMatrixView = new HeuristicLab.Data.Views.StringConvertibleMatrixView();
       this.SuspendLayout();
       // 
-      // stringConvertibleMatrixView
+      // fittingComboBox
       // 
-      this.stringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.stringConvertibleMatrixView.Caption = "StringConvertibleMatrix View";
-      this.stringConvertibleMatrixView.Content = null;
-      this.stringConvertibleMatrixView.Location = new System.Drawing.Point(3, 59);
-      this.stringConvertibleMatrixView.Name = "stringConvertibleMatrixView";
-      this.stringConvertibleMatrixView.ReadOnly = true;
-      this.stringConvertibleMatrixView.ShowRowsAndColumnsTextBox = true;
-      this.stringConvertibleMatrixView.ShowStatisticalInformation = true;
-      this.stringConvertibleMatrixView.Size = new System.Drawing.Size(492, 294);
-      this.stringConvertibleMatrixView.TabIndex = 0;
+      this.fittingComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+      this.fittingComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.fittingComboBox.FormattingEnabled = true;
+      this.fittingComboBox.Location = new System.Drawing.Point(147, 359);
+      this.fittingComboBox.Name = "fittingComboBox";
+      this.fittingComboBox.Size = new System.Drawing.Size(200, 21);
+      this.fittingComboBox.TabIndex = 12;
+      // 
+      // addValuesButton
+      // 
+      this.addValuesButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+      this.addValuesButton.Location = new System.Drawing.Point(8, 359);
+      this.addValuesButton.Name = "addValuesButton";
+      this.addValuesButton.Size = new System.Drawing.Size(133, 23);
+      this.addValuesButton.TabIndex = 10;
+      this.addValuesButton.Text = "Add Values to Results";
+      this.addValuesButton.UseVisualStyleBackColor = true;
+      this.addValuesButton.Click += new System.EventHandler(this.addValuesButton_Click);
+      // 
+      // addLineToChart
+      // 
+      this.addLineToChart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+      this.addLineToChart.Location = new System.Drawing.Point(353, 359);
+      this.addLineToChart.Name = "addLineToChart";
+      this.addLineToChart.Size = new System.Drawing.Size(133, 23);
+      this.addLineToChart.TabIndex = 9;
+      this.addLineToChart.Text = "Fit Line to Chart";
+      this.addLineToChart.UseVisualStyleBackColor = true;
+      this.addLineToChart.Click += new System.EventHandler(this.addLineToChart_Click);
       // 
       // dataRowComboBox
@@ -100 +118 @@
       this.dataTableComboBox.SelectedIndexChanged += new System.EventHandler(this.dataTableComboBox_SelectedIndexChanged);
       // 
-      // addLineToChart
+      // stringConvertibleMatrixView
       // 
-      this.addLineToChart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.addLineToChart.Location = new System.Drawing.Point(353, 359);
-      this.addLineToChart.Name = "addLineToChart";
-      this.addLineToChart.Size = new System.Drawing.Size(133, 23);
-      this.addLineToChart.TabIndex = 9;
-      this.addLineToChart.Text = "Fit Line to Chart";
-      this.addLineToChart.UseVisualStyleBackColor = true;
-      this.addLineToChart.Click += new System.EventHandler(this.addLineToChart_Click);
-      // 
-      // addValuesButton
-      // 
-      this.addValuesButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.addValuesButton.Location = new System.Drawing.Point(214, 359);
-      this.addValuesButton.Name = "addValuesButton";
-      this.addValuesButton.Size = new System.Drawing.Size(133, 23);
-      this.addValuesButton.TabIndex = 10;
-      this.addValuesButton.Text = "Add Values to Results";
-      this.addValuesButton.UseVisualStyleBackColor = true;
-      this.addValuesButton.Click += new System.EventHandler(this.addValuesButton_Click);
+      this.stringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.stringConvertibleMatrixView.Caption = "StringConvertibleMatrix View";
+      this.stringConvertibleMatrixView.Content = null;
+      this.stringConvertibleMatrixView.Location = new System.Drawing.Point(3, 59);
+      this.stringConvertibleMatrixView.Name = "stringConvertibleMatrixView";
+      this.stringConvertibleMatrixView.ReadOnly = true;
+      this.stringConvertibleMatrixView.ShowRowsAndColumnsTextBox = true;
+      this.stringConvertibleMatrixView.ShowStatisticalInformation = true;
+      this.stringConvertibleMatrixView.Size = new System.Drawing.Size(492, 294);
+      this.stringConvertibleMatrixView.TabIndex = 0;
       // 
       // ChartAnalysisView
       // 
+      this.Controls.Add(this.fittingComboBox);
       this.Controls.Add(this.addValuesButton);
       this.Controls.Add(this.addLineToChart);
@@ -146 +158 @@
     private System.Windows.Forms.Button addLineToChart;
     private System.Windows.Forms.Button addValuesButton;
+    private System.Windows.Forms.ComboBox fittingComboBox;
   }
 }

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/CorrelationView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/CorrelationView.designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/HeuristicLab.Analysis.Statistics-3.3.csproj

@@ -114 +114 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ExpFitting.cs" />
+    <Compile Include="IFitting.cs" />
     <Compile Include="LinearLeastSquaresFitting.cs" />
+    <Compile Include="LogFitting.cs" />
     <Compile Include="Resources.Designer.cs">
       <AutoGen>True</AutoGen>

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/KruskalWallis.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/LinearLeastSquaresFitting.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -24 +24 @@
 
 namespace HeuristicLab.Analysis.Statistics {
-  public class LinearLeastSquaresFitting {
-    public static void Calculate(double[] dataPoints, out double a1, out double a0) {
+  public class LinearLeastSquaresFitting : IFitting {
+    public void Calculate(double[] dataPoints, out double p0, out double p1) {
+      var stdX = Enumerable.Range(0, dataPoints.Count()).Select(x => (double)x).ToArray();
+      Calculate(dataPoints, stdX, out p0, out p1);
+    }
+
+    public void Calculate(double[] y, double[] x, out double p0, out double p1) {
+      if (y.Count() != x.Count()) {
+        throw new ArgumentException("The lenght of x and y needs do be equal. ");
+      }
+
       double sxy = 0.0;
       double sxx = 0.0;
-      int n = dataPoints.Count();
-      double sy = dataPoints.Sum();
+      int n = y.Count();
+      double sy = y.Sum();
       double sx = ((n - 1) * n) / 2;
       double avgy = sy / n;
@@ -35 +44 @@
 
       for (int i = 0; i < n; i++) {
-        sxy += i * dataPoints[i];
-        sxx += i * i;
+        sxy += x[i] * y[i];
+        sxx += x[i] * x[i];
       }
 
-      a1 = (sxy - (n * avgx * avgy)) / (sxx - (n * avgx * avgx));
-      a0 = avgy - a1 * avgx;
+      p0 = (sxy - (n * avgx * avgy)) / (sxx - (n * avgx * avgx));
+      p1 = avgy - p0 * avgx;
     }
 
-    public static double CalculateError(double[] dataPoints, double a1, double a0) {
+    //TODO: adapt or remove
+    public double CalculateError(double[] dataPoints, double a1, double a0) {
       double r = 0.0;
       double avgy = dataPoints.Average();
@@ -58 +68 @@
       return r;
     }
+
+    public DataRow CalculateFittedLine(double[] y, double[] x, string rowName) {
+      double k, d;
+      Calculate(y, x, out k, out d);
+
+      DataRow newRow = new DataRow(rowName);
+      for (int i = 0; i < x.Count(); i++) {
+        newRow.Values.Add(k * x[i] + d);
+      }
+      return newRow;
+    }
+
+    public DataRow CalculateFittedLine(double[] dataPoints, string rowName) {
+      DataRow newRow = new DataRow(rowName);
+      double c0, c1;
+      Calculate(dataPoints, out c0, out c1);
+      var stdX = Enumerable.Range(0, dataPoints.Count()).Select(x => (double)x).ToArray();
+
+      for (int i = 0; i < stdX.Count(); i++) {
+        newRow.Values.Add(c0 * stdX[i] + c1);
+      }
+
+      return newRow;
+    }
+
+    public override string ToString() {
+      return "Linear Fitting";
+    }
   }
 }

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2013 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/SampleSizeChecker.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/SampleSizeChecker.designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/SampleSizeDetermination.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/SampleSizeInfluenceView.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/SampleSizeInfluenceView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/TTest.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.