Change RWS to handle new score mode subtask max

Author: stefano-maggiolo

cmsranking/Scoring.py

@@ -25,11 +25,13 @@
 from future.builtins.disabled import *  # noqa
 from future.builtins import *  # noqa
 from six import itervalues, iteritems
+from six.moves import zip_longest
 
 import heapq
 import logging
 
-from cmscommon.constants import SCORE_MODE_MAX, SCORE_MODE_MAX_TOKENED_LAST
+from cmscommon.constants import \
+    SCORE_MODE_MAX, SCORE_MODE_MAX_SUBTASK, SCORE_MODE_MAX_TOKENED_LAST
 
 
 logger = logging.getLogger(__name__)
@@ -124,6 +126,12 @@ def append_change(self, change):
             score = max([0.0] +
                         [submission.score
                          for submission in itervalues(self._submissions)])
+        elif self._score_mode == SCORE_MODE_MAX_SUBTASK:
+            scores_by_submission = (s.extra or []
+                                    for s in itervalues(self._submissions))
+            scores_by_subtask = zip_longest(*scores_by_submission,
+                                            fillvalue=0.0)
+            score = float(sum(max(s) for s in scores_by_subtask))
         elif self._score_mode == SCORE_MODE_MAX_TOKENED_LAST:
             score = max(self._released.query(),
                         self._last.score if self._last is not None else 0.0)