Switch to full name in scoreboard (#744)

Author: aobolensk

docs/user_guide/submit_work.rst

@@ -113,7 +113,7 @@ Tips for tests
 
   .. code-block:: json
 
-     { "student": { "first_name": "Имя", "last_name": "Фамилия", "middle_name": "Отчество", "group_number": "Группа", "task_number": "1" } }
+     { "student": { "full_name": "Фамилия Имя Отчество", "group_number": "Группа", "task_number": "1" } }
 
 Build and local run
 -------------------

scoreboard/assign_variant.py

@@ -5,7 +5,7 @@
 
 Algorithm:
   1) Normalize strings (NFKC, trim, lowercase, map 'ё'->'е', collapse spaces).
-  2) Build a key: "surname|name|patronymic|group|repo".
+  2) Build a key: "full_name|group|repo".
   3) SHA-256(key) -> big integer -> modulo `num_variants`.
 
 Properties:
@@ -17,9 +17,7 @@
 Usage:
     from assign_variant import assign_variant
     v = assign_variant(
-        surname="Petrov",
-        name="Pyotr",
-        patronymic="Petrovich",
+        full_name="Petrov Pyotr Petrovich",
         group="MEN-201",
         repo="learning-process/parallel_programming_course",
         num_variants=31,  # produces values in 0..30
@@ -62,23 +60,19 @@ def _hash_int(key: str) -> int:
 
 
 def assign_variant(
-    surname: str,
-    name: str,
+    full_name: str,
     group: str,
     repo: str,
-    patronymic: Optional[str] = "",
     num_variants: int = 31,
 ) -> int:
     """
     Deterministically returns a variant index in [0 .. num_variants-1]
-    based on (surname, name, patronymic, group) and the repository name (repo)
+    based on (full_name, group) and the repository name (repo)
     as the sole salt.
 
-    :param surname: Last name
-    :param name: First name
+    :param full_name: Full name (e.g., "Petrov Pyotr Petrovich")
     :param group: Group identifier (e.g., "MEN-201")
     :param repo: Repository name used as salt (e.g., "org/repo" or just "repo")
-    :param patronymic: Middle name / patronymic (optional)
     :param num_variants: Total number of variants (> 0). Output range: 0..num_variants-1
     :return: int — the variant index
     """
@@ -89,9 +83,7 @@ def assign_variant(
 
     key = "|".join(
         (
-            normalize(surname),
-            normalize(name),
-            normalize(patronymic),
+            normalize(full_name),
             normalize(group),
             normalize(repo),
         )
@@ -107,28 +99,22 @@ def demo():
         print("Demo: deterministic assignment\n")
 
         v1 = assign_variant(
-            surname="Петров",
-            name="Пётр",
-            patronymic="Петрович",
+            full_name="Петров Пётр Петрович",
             group="МЕН-201",
             repo="learning-process/parallel_programming_course",
             num_variants=31,
         )
         # Different casing/spacing/ё→е should not change the result:
         v2 = assign_variant(
-            surname="ПЕТРОВ",
-            name="петр ",
-            patronymic="пЕТРОВИЧ",
+            full_name="ПЕТРОВ   петр  пЕТРОВИЧ",
             group="  мен-201 ",
             repo="learning-process/parallel_programming_course",
             num_variants=31,
         )
         assert v1 == v2, "Normalization should make results identical"
 
         v_other_repo = assign_variant(
-            surname="Petrov",
-            name="Pyotr",
-            patronymic="Petrovich",
+            full_name="Petrov Pyotr Petrovich",
             group="MEN-201",
             repo="learning-process/ppc_2025_fall",  # different salt → likely different value
             num_variants=31,

scoreboard/main.py

@@ -36,11 +36,9 @@
 except Exception:
 
     def assign_variant(
-        surname: str,
-        name: str,
+        full_name: str,
         group: str,
         repo: str,
-        patronymic: str = "",
         num_variants: int = 1,
     ) -> int:
         return 0
@@ -549,10 +547,7 @@ def _load_student_info_label(dir_name: str):
             with open(info_path, "r") as f:
                 data = json.load(f)
             s = data.get("student", {})
-            last = s.get("last_name", "")
-            first = s.get("first_name", "")
-            middle = s.get("middle_name", "")
-            parts = [p for p in [last, first, middle] if p]
+            parts = [p for p in str(s.get("full_name", "")).strip().split() if p]
             label = "<br/>".join(parts)
             return label if label else None
         except Exception:
@@ -568,12 +563,7 @@ def _load_student_fields(dir_name: str):
             with open(info_path, "r") as f:
                 data = json.load(f)
             s = data.get("student", {})
-            return (
-                str(s.get("last_name", "")),
-                str(s.get("first_name", "")),
-                str(s.get("middle_name", "")),
-                str(s.get("group_number", "")),
-            )
+            return str(s.get("full_name", "")).strip(), str(s.get("group_number", ""))
         except Exception:
             return None
 
@@ -644,14 +634,12 @@ def _load_student_fields(dir_name: str):
         threads_vmax = int((cfg.get("threads", {}) or {}).get("variants_max", 1))
         fields = _load_student_fields(dir)
         if fields:
-            last, first, middle, group = fields
+            full_name, group = fields
             try:
                 v_idx = assign_variant(
-                    last,
-                    first,
-                    group,
-                    REPO_SALT,
-                    patronymic=middle,
+                    full_name=full_name,
+                    group=group,
+                    repo=REPO_SALT,
                     num_variants=threads_vmax,
                 )
                 variant = str(v_idx + 1)
@@ -985,9 +973,7 @@ def _load_student_info(dir_name: str):
     def _identity_key(student: dict) -> str:
         return "|".join(
             [
-                str(student.get("first_name", "")),
-                str(student.get("last_name", "")),
-                str(student.get("middle_name", "")),
+                str(student.get("full_name", "")).strip(),
                 str(student.get("group_number", "")),
             ]
         )
@@ -1051,9 +1037,7 @@ def _build_cell(dir_name: str, ttype: str, perf_map: dict[str, dict]):
 
     def _sort_identity(student: dict):
         return (
-            str(student.get("last_name", "")),
-            str(student.get("first_name", "")),
-            str(student.get("middle_name", "")),
+            str(student.get("full_name", "")).strip(),
             str(student.get("group_number", "")),
         )
 
@@ -1182,9 +1166,7 @@ def _build_process_rows(processes_dirs: list[str]):
                     proc_r_values.append(0)
 
             name_parts = [
-                str(student.get("last_name", "")),
-                str(student.get("first_name", "")),
-                str(student.get("middle_name", "")),
+                p for p in str(student.get("full_name", "")).strip().split() if p
             ]
             name_html = "<br/>".join([p for p in name_parts if p]) or "processes"
 
@@ -1193,9 +1175,7 @@ def _build_process_rows(processes_dirs: list[str]):
                 vmax = _find_process_variants_max(cfg, n)
                 try:
                     v_idx = assign_variant(
-                        surname=str(student.get("last_name", "")),
-                        name=str(student.get("first_name", "")),
-                        patronymic=str(student.get("middle_name", "")),
+                        full_name=str(student.get("full_name", "")).strip(),
                         group=str(student.get("group_number", "")),
                         repo=f"{REPO_SALT}/processes/task-{n}",
                         num_variants=vmax,
@@ -1422,9 +1402,7 @@ def _load_student_info_group(dir_name: str):
         def _id_key(stud: dict) -> str:
             return "|".join(
                 [
-                    str(stud.get("first_name", "")),
-                    str(stud.get("last_name", "")),
-                    str(stud.get("middle_name", "")),
+                    str(stud.get("full_name", "")).strip(),
                     str(stud.get("group_number", "")),
                 ]
             )

tasks/example_processes/info.json

@@ -1,9 +1,7 @@
 {
   "student": {
-    "first_name": "first_name_p",
+    "full_name": "full_name_p",
     "group_number": "2222222_p",
-    "last_name": "last_name_p",
-    "middle_name": "middle_name_p",
     "task_number": "1"
   }
 }

tasks/example_processes_2/info.json

@@ -1,9 +1,7 @@
 {
   "student": {
-    "first_name": "first_name_p",
+    "full_name": "full_name_p",
     "group_number": "2222222_p",
-    "last_name": "last_name_p",
-    "middle_name": "middle_name_p",
     "task_number": "2"
   }
 }

tasks/example_processes_3/info.json

@@ -1,9 +1,7 @@
 {
   "student": {
-    "first_name": "first_name_p",
+    "full_name": "full_name_p",
     "group_number": "2222222_p",
-    "last_name": "last_name_p",
-    "middle_name": "middle_name_p",
     "task_number": "3"
   }
 }

tasks/example_threads/info.json

@@ -1,9 +1,7 @@
 {
   "student": {
-    "first_name": "first_name_t",
+    "full_name": "full_name_t",
     "group_number": "2222222_t",
-    "last_name": "last_name_t",
-    "middle_name": "middle_name_t",
     "task_number": "1"
   }
 }