Permalink
Browse files

Merge branch 'MDL-35667_extra_credit_loop_23' of git://github.com/and…

…yjdavis/moodle into MOODLE_23_STABLE
  • Loading branch information...
2 parents b855945 + 7ad8f46 commit f605b97aa4f5f755be87e8226afe879934076b25 Sam Hemelryk committed Oct 7, 2012
Showing with 18 additions and 2 deletions.
  1. +3 −2 lib/grade/grade_category.php
  2. +15 −0 lib/grade/tests/grade_category_test.php
@@ -911,7 +911,10 @@ public function apply_limit_rules(&$grade_values, $items) {
$i = 1;
while ($originalindex+$i < count($grade_keys)) {
+
$possibleitemid = $grade_keys[$originalindex+$i];
+ $i++;
+
if ($grade_values[$founditemid] != $grade_values[$possibleitemid]) {
// The next grade item has a different grade. Stop looking.
break;
@@ -928,8 +931,6 @@ public function apply_limit_rules(&$grade_values, $items) {
$founditemid = $possibleitemid;
// Continue searching to see if there is an even higher grademax...
}
-
- $i++;
}
// Now drop whatever grade item we have found
@@ -516,6 +516,21 @@ protected function sub_test_grade_category_apply_limit_rules() {
$this->assertEquals(count($grades), 1);
$this->assertEquals($grades[$this->grade_items[2]->id], 6);
+ // MDL-35667 - There was an infinite loop if several items had the same grade and at least one was extra credit
+ $category = new grade_category();
+ $category->droplow = 1;
+ $category->aggregation = GRADE_AGGREGATE_WEIGHTED_MEAN2; // simple weighted mean
+ $items[$this->grade_items[1]->id]->aggregationcoef = 1; // Mark grade item 1 as "extra credit"
+ $grades = array($this->grade_items[0]->id=>1, // 1 out of 110. Should be excluded from aggregation.
+ $this->grade_items[1]->id=>1, // 1 out of 100. Extra credit. Should be retained.
+ $this->grade_items[2]->id=>1, // 1 out of 6. Should be retained.
+ $this->grade_items[4]->id=>1);// 1 out of 100. Should be retained.
+ $category->apply_limit_rules($grades, $items);
+ $this->assertEquals(count($grades), 3);
+ $this->assertEquals($grades[$this->grade_items[1]->id], 1);
+ $this->assertEquals($grades[$this->grade_items[2]->id], 1);
+ $this->assertEquals($grades[$this->grade_items[4]->id], 1);
+
}
/**

0 comments on commit f605b97

Please sign in to comment.