Fix comments, made score modes constants instead of strings

Author: artikz

cms/__init__.py

@@ -38,6 +38,7 @@
     "LANGUAGE_NAMES", "LANGUAGES", "DEFAULT_LANGUAGES",
     "SOURCE_EXT_TO_LANGUAGE_MAP",
     "LANGUAGE_TO_SOURCE_EXT_MAP", "LANGUAGE_TO_HEADER_EXT_MAP",
+    "SCORE_MODE_IOI_MAX", "SCORE_MODE_IOI_MAX_TOKENED_LAST",
     # log
     # Nothing intended for external use, no need to advertise anything.
     # util
@@ -103,6 +104,12 @@
     LANG_PASCAL: "lib.pas",
 }
 
+# Task score modes.
+
+# Maximum score amongst all submissions.
+SCORE_MODE_IOI_MAX = "ioi_max"
+# Maximum score among all tokened submissions and the last submission.
+SCORE_MODE_IOI_MAX_TOKENED_LAST = "ioi_max_tokened_last"
 
 from .util import ConfigError, mkdir, utf8_decoder, Address, ServiceCoord, \
     get_safe_shard, get_service_address, get_service_shards, \

cms/db/task.py

@@ -40,6 +40,7 @@
 
 from . import Base, Contest
 from .smartmappedcollection import smart_mapped_collection
+from cms import SCORE_MODE_IOI_MAX, SCORE_MODE_IOI_MAX_TOKENED_LAST
 
 
 class Task(Base):
@@ -192,12 +193,10 @@ class Task(Base):
         default=0)
 
     # Score mode for the task.
-    # - ioi_max_tokened_last: score = max(last_score, max_tokened_score).
-    # - ioi_max: score = max(scores).
     score_mode = Column(
-        Enum("ioi_max_tokened_last", "ioi_max", name="score_mode"),
+        Enum(SCORE_MODE_IOI_MAX_TOKENED_LAST, SCORE_MODE_IOI_MAX, name="score_mode"),
         nullable=False,
-        default="ioi_max_tokened_last")
+        default=SCORE_MODE_IOI_MAX_TOKENED_LAST)
 
     # Active Dataset (id and object) currently being used for scoring.
     # The ForeignKeyConstraint for this column is set at table-level.

cms/grading/__init__.py

@@ -777,10 +777,10 @@ def task_score(user, task):
 
     score = 0.0
 
-    if task.score_mode == "ioi_max":
+    if task.score_mode == SCORE_MODE_IOI_MAX:
         # Modern IOI score mode: maximum score amongst all submissions.
 
-        # The maximum score amongst all submissions (invalid
+        # The maximum score amongst all submissions (not yet computed
         # scores count as 0.0).
         max_score = 0.0
 
@@ -796,9 +796,9 @@ def task_score(user, task):
         # Legacy IOI score mode: maximum score among all tokened submissions
         # and the last submission.
 
-        # The score of the last submission (if valid, otherwise 0.0).
+        # The score of the last submission (if computed, otherwise 0.0).
         last_score = 0.0
-        # The maximum score amongst the tokened submissions (invalid
+        # The maximum score amongst the tokened submissions (not yet computed
         # scores count as 0.0).
         max_tokened_score = 0.0
 

cms/server/templates/admin/add_task.html

@@ -14,7 +14,7 @@
 {% end %}
 
 {% block core %}
-{% from cms import plugin_list %}
+{% from cms import plugin_list, SCORE_MODE_IOI_MAX_TOKENED_LAST, SCORE_MODE_IOI_MAX %}
 {% set task_type_list = plugin_list("cms.grading.tasktypes", "tasktypes") %}
 {% set score_type_list = plugin_list("cms.grading.scoretypes", "scoretypes") %}
 
@@ -196,8 +196,8 @@ <h2 id="title_score_options" class="toggling_on">Score Options</h2>
         <td>Score mode</td>
         <td>
           <select name="score_mode">
-            <option value="ioi_max_tokened_last" selected>Legacy IOI (maximum score among all tokened submissions and the last submission)</option>
-            <option value="ioi_max">Modern IOI (maximum score amongst all submissions)</option>
+            <option value="{{ SCORE_MODE_IOI_MAX_TOKENED_LAST }}" selected>Legacy IOI (maximum score among all tokened submissions and the last submission)</option>
+            <option value="{{ SCORE_MODE_IOI_MAX }}">Modern IOI (maximum score amongst all submissions)</option>
           </select>
         </td>
       </tr>

cms/server/templates/admin/task.html

@@ -19,7 +19,7 @@
 
 {% block core %}
 {% from cms.server import format_dataset_attrs %}
-{% from cms import plugin_list %}
+{% from cms import plugin_list, SCORE_MODE_IOI_MAX_TOKENED_LAST, SCORE_MODE_IOI_MAX %}
 {% set task_type_list = plugin_list("cms.grading.tasktypes", "tasktypes") %}
 {% set score_type_list = plugin_list("cms.grading.scoretypes", "scoretypes") %}
 
@@ -356,8 +356,8 @@ <h2 id="title_score_options" class="toggling_on">Score Options</h2>
         <td>Score mode</td>
         <td>
           <select name="score_mode">
-            <option value="ioi_max_tokened_last" {{ "selected" if task.score_mode == "ioi_max_tokened_last" else "" }}>Legacy IOI (maximum score among all tokened submissions and the last submission)</option>
-            <option value="ioi_max" {{ "selected" if task.score_mode == "ioi_max" else "" }}>Modern IOI (maximum score amongst all submissions)</option>
+            <option value="{{ SCORE_MODE_IOI_MAX_TOKENED_LAST }}" {{ "selected" if task.score_mode == SCORE_MODE_IOI_MAX_TOKENED_LAST else "" }}>Legacy IOI (maximum score among all tokened submissions and the last submission)</option>
+            <option value="{{ SCORE_MODE_IOI_MAX }}" {{ "selected" if task.score_mode == SCORE_MODE_IOI_MAX else "" }}>Modern IOI (maximum score amongst all submissions)</option>
           </select>
         </td>
       </tr>

cmsranking/Scoring.py

@@ -76,7 +76,7 @@ class Score(object):
     # On the other hand, different subchanges may have the same time
     # but cms assures that the order in which the subchanges have to
     # be processed is the ascending order of their keys (actually,
-    # this is enforced only for suchanges with the same time).
+    # this is enforced only for subchanges with the same time).
     def __init__(self, score_mode="ioi_max_tokened_last"):
         # The submissions in their current status.
         self._submissions = dict()