MDL-12312 fixed outdated aggregation help, added examples; merged from MOODLE_19_STABLE

diff --git a/admin/settings/grades.php b/admin/settings/grades.php
index 32af0dbdd7e54cce97d49b62c4acf622eab37f73..1ca7d8d565c70c748ea478289c689ca0dd4d8fbc 100644 (file)
--- a/admin/settings/grades.php
+++ b/admin/settings/grades.php
@@ -56,13 +56,13 @@ $strnoforce = get_string('noforce', 'grades');
 
 // Aggregation type
 $options = array(GRADE_AGGREGATE_MEAN            =>get_string('aggregatemean', 'grades'),
+                 GRADE_AGGREGATE_WEIGHTED_MEAN   =>get_string('aggregateweightedmean', 'grades'),
+                 GRADE_AGGREGATE_WEIGHTED_MEAN2  =>get_string('aggregateweightedmean2', 'grades'),
+                 GRADE_AGGREGATE_EXTRACREDIT_MEAN=>get_string('aggregateextracreditmean', 'grades'),
                  GRADE_AGGREGATE_MEDIAN          =>get_string('aggregatemedian', 'grades'),
                  GRADE_AGGREGATE_MIN             =>get_string('aggregatemin', 'grades'),
                  GRADE_AGGREGATE_MAX             =>get_string('aggregatemax', 'grades'),
                  GRADE_AGGREGATE_MODE            =>get_string('aggregatemode', 'grades'),
-                 GRADE_AGGREGATE_WEIGHTED_MEAN   =>get_string('aggregateweightedmean', 'grades'),
-                 GRADE_AGGREGATE_WEIGHTED_MEAN2  =>get_string('aggregateweightedmean2', 'grades'),
-                 GRADE_AGGREGATE_EXTRACREDIT_MEAN=>get_string('aggregateextracreditmean', 'grades'),
                  GRADE_AGGREGATE_SUM             =>get_string('aggregatesum', 'grades'));
 $defaults = array('value'=>GRADE_AGGREGATE_MEAN, 'forced'=>false, 'adv'=>false);
 $temp->add(new admin_setting_gradecat_combo('grade_aggregation', get_string('aggregation', 'grades'), get_string('aggregationhelp', 'grades'), $defaults, $options));

diff --git a/grade/edit/tree/category_form.php b/grade/edit/tree/category_form.php
index 7aa1a1c6ec6a60e675c6674245c7a0cc4b8715fd..5c5958f9dc4c3936ba298d4dcc88c907f13d8749 100644 (file)
--- a/grade/edit/tree/category_form.php
+++ b/grade/edit/tree/category_form.php
@@ -32,13 +32,13 @@ class edit_category_form extends moodleform {
         $mform =& $this->_form;
 
         $options = array(GRADE_AGGREGATE_MEAN            =>get_string('aggregatemean', 'grades'),
+                         GRADE_AGGREGATE_WEIGHTED_MEAN   =>get_string('aggregateweightedmean', 'grades'),
+                         GRADE_AGGREGATE_WEIGHTED_MEAN2  =>get_string('aggregateweightedmean2', 'grades'),
+                         GRADE_AGGREGATE_EXTRACREDIT_MEAN=>get_string('aggregateextracreditmean', 'grades'),
                          GRADE_AGGREGATE_MEDIAN          =>get_string('aggregatemedian', 'grades'),
                          GRADE_AGGREGATE_MIN             =>get_string('aggregatemin', 'grades'),
                          GRADE_AGGREGATE_MAX             =>get_string('aggregatemax', 'grades'),
                          GRADE_AGGREGATE_MODE            =>get_string('aggregatemode', 'grades'),
-                         GRADE_AGGREGATE_WEIGHTED_MEAN   =>get_string('aggregateweightedmean', 'grades'),
-                         GRADE_AGGREGATE_WEIGHTED_MEAN2  =>get_string('aggregateweightedmean2', 'grades'),
-                         GRADE_AGGREGATE_EXTRACREDIT_MEAN=>get_string('aggregateextracreditmean', 'grades'),
                          GRADE_AGGREGATE_SUM             =>get_string('aggregatesum', 'grades'));
 
         // visible elements

diff --git a/lang/en_utf8/help/grade/aggregation.html b/lang/en_utf8/help/grade/aggregation.html
index 5fcdc1a6b19a23dd6db41fe31cd48e56f2868115..c4f9a4db9983ffbefc4534bc56c63ab324c81af2 100644 (file)
--- a/lang/en_utf8/help/grade/aggregation.html
+++ b/lang/en_utf8/help/grade/aggregation.html
@@ -12,51 +12,67 @@ the gradebook administrator. Caution in interpreting these "empty grades" is thu
 
 <table class="generaltable boxaligncenter" cellpadding="4" cellspacing="1" summary="Aggregation strategies for grading categories">
     <tr>
-        <th class="header">Strategy</th><th class="header">Description</th>
+        <th class="header">Strategy</th><th class="header">Description</th><th class="header">Example (A1..A3 assignment grades)</th>
     </tr>
     <tr>
         <td class="cell">Mean of grades</td>
         <td class="cell">All grades summed and divided by the total number of grades.</td>
+        <td class="cell">A1 70/100, A2 20/80, A3 10/10, category max 100:<br />
+                         <code>(0.7 + 0.25 + 1.0)/3 = 0.65 --> 65/100</code></td>
+    </tr>
+    <tr>
+        <td class="cell">Weighted mean</td>
+        <td class="cell">Each grade item can be given a weight, which is then used in the arithmetic mean aggregation to influence
+                         the importance of each item in the overall mean.</td>
+        <td class="cell">A1 70/100 weight 10, A2 20/80 weight 5, A3
+                         10/10 weight 3, category max 100:<br /><code>(0.7*10 + 0.25*5 + 1.0*3)/18 = 0.625 --> 62.5/100</code></td>
+    </tr>
+    <tr>
+        <td class="cell">Simple weighted mean</td>
+        <td class="cell">The difference from <em>Weighted mean</em> is that weight is calculated as <em>Maximum grade</em> - <em>Minimum grade</em>
+                         for each item. 100 point assignment has weight 100, 10 point assignment has weight 10.</td>
+        <td class="cell">A1 70/100, A2 20/80, A3 10/10, category max 100:<br />
+                         <code>(0.7*100 + 0.25*80 + 1.0*10)/190 = 0.526 --> 52.6/100</code></td>
+    </tr>
+    <tr>
+        <td class="cell">Mean of grades (with extra credits)</td>
+        <td class="cell">Arithmetic mean with a twist. An old, now unsupported aggregation strategy provided here only
+                         for backward compatibility with old activities.</td>
+        <td class="cell">&nbsp;</td>
     </tr>
     <tr>
         <td class="cell">Median of grades</td>
         <td class="cell">The median is calculated by counting all the grades and selecting the grade that falls in the middle of that count
                          (or the mean between the two middle grades if there is an even number of grades). The advantage over the mean is
                          that it is not affected by outliers (grades which are uncommonly far from the mean).</td>
+        <td class="cell">A1 70/100, A2 20/80, A3 10/10, category max 100:<br />
+                         <code>0.7 + 0.25 + 1.0 --> 0.25 --> 25/100</code></td>
     </tr>
     <tr>
         <td class="cell">Smallest grade</td>
         <td class="cell">The result is the relatively smallest grade. It is usually used in combination with <em>Aggregate only non-empty grades</em>.</td>
+        <td class="cell">A1 70/100, A2 20/80, A3 10/10, category max 100:<br />
+                         <code>min(0.7 + 0.25 + 1.0) = 0.25 --> 25/100</code></td>
     </tr>
     <tr>
         <td class="cell">Highest grade</td>
         <td class="cell">The result is the relatively highest grade.</td>
+        <td class="cell">A1 70/100, A2 20/80, A3 10/10, category max 100:<br />
+                         <code>max(0.7 + 0.25 + 1.0) = 1.0 --> 100/100</code></td>
     </tr>
     <tr>
         <td class="cell">Mode of grades</td>
         <td class="cell">The mode is the grade that occurs the most frequently. It is more often used for non-numerical grades.
                          The advantage over the mean is that it is not affected by outliers (grades which are uncommonly far from the mean).</td>
-    </tr>
-    <tr>
-        <td class="cell">Weighted mean</td>
-        <td class="cell">Each grade item can be given a weight, which is then used in the arithmetic mean aggregation to influence
-                         the importance of each item in the overall mean.</td>
-    </tr>
-    <tr>
-        <td class="cell">Simple weighted mean</td>
-        <td class="cell">The difference from <em>Weighted mean</em> is that weight is calculated as <em>Maximun grade</em> - <em>Minumum grade</em>
-                         for each item. 100 point assignment has weight 100, 10 point assignment has weight 10.</td>
-    </tr>
-    <tr>
-        <td class="cell">Mean of grades (with extra credits)</td>
-        <td class="cell">Arithmetic mean with a twist. An old, now unsupported aggregation strategy provided here only
-                         for backward compatibility with old activities.</td>
+        <td class="cell">&nbsp;</td>
     </tr>
     <tr>
         <td class="cell">Sum of grades</td>
         <td class="cell">The sum of all grade values. Scale grades are ignored. This is the only type that does not convert the
                          grades to percentages internally. The <em>Maximum grade</em> of associated category item is calculated
                          automatically as a sum of maximums from all aggregated items.</td>
+        <td class="cell">A1 70/100, A2 20/80, A3 10/10:<br />
+                         <code>70 + 20 + 10 = 100/190</code></td>
     </tr>
 
 </table>