Change name to score modes

Author: stefano-maggiolo

cms/__init__.py

@@ -39,7 +39,7 @@
     "SOURCE_EXT_TO_LANGUAGE_MAP",
     "LANGUAGE_TO_SOURCE_EXT_MAP", "LANGUAGE_TO_HEADER_EXT_MAP",
     "LANGUAGE_TO_OBJ_EXT_MAP",
-    "SCORE_MODE_IOI_MAX", "SCORE_MODE_IOI_MAX_TOKENED_LAST",
+    "SCORE_MODE_MAX", "SCORE_MODE_MAX_TOKENED_LAST",
     # log
     # Nothing intended for external use, no need to advertise anything.
     # util
@@ -113,9 +113,9 @@
 # Task score modes.
 
 # Maximum score amongst all submissions.
-SCORE_MODE_IOI_MAX = "ioi_max"
+SCORE_MODE_MAX = "max"
 # Maximum score among all tokened submissions and the last submission.
-SCORE_MODE_IOI_MAX_TOKENED_LAST = "ioi_max_tokened_last"
+SCORE_MODE_MAX_TOKENED_LAST = "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,7 +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
+from cms import SCORE_MODE_MAX, SCORE_MODE_MAX_TOKENED_LAST
 
 
 class Task(Base):
@@ -194,10 +194,10 @@ class Task(Base):
 
     # Score mode for the task.
     score_mode = Column(
-        Enum(SCORE_MODE_IOI_MAX_TOKENED_LAST, SCORE_MODE_IOI_MAX,
+        Enum(SCORE_MODE_MAX_TOKENED_LAST, SCORE_MODE_MAX,
              name="score_mode"),
         nullable=False,
-        default=SCORE_MODE_IOI_MAX_TOKENED_LAST)
+        default=SCORE_MODE_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

@@ -38,7 +38,7 @@
 
 from cms import \
     LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON, LANG_PHP, LANG_JAVA, \
-    SCORE_MODE_IOI_MAX
+    SCORE_MODE_MAX
 from cms.db import Submission
 from cms.grading.Sandbox import Sandbox
 
@@ -780,8 +780,8 @@ def task_score(user, task):
 
     score = 0.0
 
-    if task.score_mode == SCORE_MODE_IOI_MAX:
-        # Modern IOI score mode: maximum score amongst all submissions.
+    if task.score_mode == SCORE_MODE_MAX:
+        # Like in IOI 2013-: maximum score amongst all submissions.
 
         # The maximum score amongst all submissions (not yet computed
         # scores count as 0.0).
@@ -796,8 +796,8 @@ def task_score(user, task):
 
         score = max_score
     else:
-        # Legacy IOI score mode: maximum score among all tokened submissions
-        # and the last submission.
+        # Like in IOI 2010-2012: maximum score among all tokened
+        # submissions and the last submission.
 
         # The score of the last submission (if computed, otherwise 0.0).
         last_score = 0.0

cms/server/templates/admin/add_task.html

@@ -14,7 +14,7 @@
 {% end %}
 
 {% block core %}
-{% from cms import plugin_list, SCORE_MODE_IOI_MAX_TOKENED_LAST, SCORE_MODE_IOI_MAX %}
+{% from cms import plugin_list, SCORE_MODE_MAX_TOKENED_LAST, SCORE_MODE_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="{{ 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>
+            <option value="{{ SCORE_MODE_MAX_TOKENED_LAST }}" selected>Use best among tokened and last submissions (IOI 2010-2012)</option>
+            <option value="{{ SCORE_MODE_MAX }}">Use best among all submissions (IOI 2013-)</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, SCORE_MODE_IOI_MAX_TOKENED_LAST, SCORE_MODE_IOI_MAX %}
+{% from cms import plugin_list, SCORE_MODE_MAX_TOKENED_LAST, SCORE_MODE_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="{{ 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>
+            <option value="{{ SCORE_MODE_MAX_TOKENED_LAST }}" {{ "selected" if task.score_mode == SCORE_MODE_MAX_TOKENED_LAST else "" }}>Use best among tokened and last submissions (IOI 2010-2012)</option>
+            <option value="{{ SCORE_MODE_MAX }}" {{ "selected" if task.score_mode == SCORE_MODE_MAX else "" }}>Use best among all submissions (IOI 2013-)</option>
           </select>
         </td>
       </tr>