Changeset 11919 for stable/HeuristicLab.Analysis/3.3/Statistics/BonferroniHolm.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 (modified) (1 prop)
• HeuristicLab.Analysis/3.3/Statistics/BonferroniHolm.cs (copied) (copied from trunk/sources/HeuristicLab.Analysis/3.3/Statistics/BonferroniHolm.cs) (1 diff)

stable/HeuristicLab.Analysis/3.3/Statistics/BonferroniHolm.cs

@@ -41 +41 @@
         pValuesIndizes.Add(i, pValues[i]);
       }
-      var sortedPValues = pValuesIndizes.OrderBy(x => x.Value);
+      var sortedPValues = pValuesIndizes.OrderBy(x => x.Value).ToArray();
 
       for (int i = 1; i < k + 1; i++) {
         alphaNiveau[i - 1] = globalAlpha / (k - i + 1);
-        int idx = sortedPValues.ElementAt(i - 1).Key;
+        int idx = sortedPValues[i - 1].Key;
 
         if (i == 1) {
           //true means reject
-          decision[idx] = sortedPValues.ElementAt(i - 1).Value < alphaNiveau[i - 1];
-          adjustedPValues[idx] = sortedPValues.ElementAt(i - 1).Value * (k - i + 1);
+          decision[idx] = sortedPValues[i - 1].Value < alphaNiveau[i - 1];
+          adjustedPValues[idx] = sortedPValues[i - 1].Value * (k - i + 1);
         } else {
-          decision[idx] = decision[sortedPValues.ElementAt(i - 2).Key] ? (sortedPValues.ElementAt(i - 1).Value < alphaNiveau[i - 1]) : false;
-          adjustedPValues[idx] = Math.Max(adjustedPValues[sortedPValues.ElementAt(i - 2).Key], sortedPValues.ElementAt(i - 1).Value * (k - i + 1));
+          decision[idx] = decision[sortedPValues[i - 2].Key] && (sortedPValues[i - 1].Value < alphaNiveau[i - 1]);
+          adjustedPValues[idx] = Math.Max(adjustedPValues[sortedPValues[i - 2].Key], sortedPValues[i - 1].Value * (k - i + 1));
         }
         if (adjustedPValues[idx] > 1.0) {