Changeset 11692 for branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.cs

Timestamp:

12/17/14 11:31:26 (9 years ago)

Author:

ascheibe

Message:

#2031

• fixed a bug in Cohens d / Hedges g calculation
• fixed calculation of pairwise tests (no more columns with only zeroes)
• some refactoring

File:

• branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.cs (modified) (5 diffs)

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

@@ -303 +303 @@
 
     private void TestAllGroups() {
-      double pval = KruskalWallis.Test(data);
+      double pval = KruskalWallisTest.Test(data);
       pValTextBox.Text = pval.ToString();
       if (pval < significanceLevel) {
@@ -359 +359 @@
 
       double[][] newData = FilterDataForPairwiseTest(colIndex);
-
-      double mwuBothtails;
-      double mwuLefttail;
-      double mwuRighttail;
       int cnt = 0;
-
       for (int i = 0; i < newData.Length; i++) {
-        alglib.mannwhitneyutest(data[colIndex], data[colIndex].Length, newData[i], newData[i].Length, out mwuBothtails, out mwuLefttail, out mwuRighttail);
+        double mwuBothtails = PairwiseTest.MannWhitneyUTest(data[colIndex], newData[i]);
         if (mwuBothtails > significanceLevel) {
           cnt++;
@@ -435 +430 @@
 
       double mwuBothtails;
-      double mwuLefttail;
-      double mwuRighttail;
       double tTestBothTails;
       double[] mwuPValues = new double[newData.Length];
@@ -445 +438 @@
 
       for (int i = 0; i < newData.Length; i++) {
-        if (i != colIndex) {
-          alglib.mannwhitneyutest(data[colIndex], data[colIndex].Length, newData[i], newData[i].Length, out mwuBothtails,
-            out mwuLefttail, out mwuRighttail);
-          tTestBothTails = TTest.Test(data[colIndex], newData[i]);
-          mwuPValues[i] = mwuBothtails;
-          tTestPValues[i] = tTestBothTails;
-        }
+        mwuBothtails = PairwiseTest.MannWhitneyUTest(data[colIndex], newData[i]);
+        tTestBothTails = PairwiseTest.TTest(data[colIndex], newData[i]);
+        mwuPValues[i] = mwuBothtails;
+        tTestPValues[i] = tTestBothTails;
       }
 
@@ -458 +448 @@
 
       for (int i = 0; i < newData.Length; i++) {
-        if (i != colIndex) {
-          pValsMatrix[0, i] = mwuPValues[i];
-          pValsMatrix[1, i] = adjustedMwuPValues[i];
-          pValsMatrix[2, i] = tTestPValues[i];
-          pValsMatrix[3, i] = adjustedTtestPValues[i];
-          pValsMatrix[4, i] = SampleSizeDetermination.CalculateCohensD(data[colIndex], newData[i]);
-          pValsMatrix[5, i] = SampleSizeDetermination.CalculateHedgesG(data[colIndex], newData[i]);
-        }
+        pValsMatrix[0, i] = mwuPValues[i];
+        pValsMatrix[1, i] = adjustedMwuPValues[i];
+        pValsMatrix[2, i] = tTestPValues[i];
+        pValsMatrix[3, i] = adjustedTtestPValues[i];
+        pValsMatrix[4, i] = SampleSizeDetermination.CalculateCohensD(data[colIndex], newData[i]);
+        pValsMatrix[5, i] = SampleSizeDetermination.CalculateHedgesG(data[colIndex], newData[i]);
       }