TPS loader: support batch-and-output task type

Author: birka0

AUTHORS.txt

@@ -49,6 +49,7 @@ Benjamin Swart <Benjaminswart@email.cz>
 Andrey Vihrov <andrey.vihrov@gmail.com>
 Grace Hawkins <amoomajid99@gmail.com>
 Pasit Sangprachathanarak <ouipingpasit@gmail.com>
+Zsolt Németh <birka0@gmail.com>
 
 And many other people that didn't write code, but provided useful
 comments, suggestions and feedback. :-)

cmscontrib/loaders/tps.py

@@ -66,7 +66,7 @@ def _get_task_type_parameters(self, data, task_type, evaluation_param):
         task_type_parameters = json.loads(parameters_str)
         par_prefix = 'task_type_parameters_%s' % task_type
 
-        if task_type == 'Batch':
+        if task_type == 'Batch' or task_type == 'BatchAndOutput':
             par_compilation = '%s_compilation' % par_prefix
             par_input = '%s_io_0_inputfile' % par_prefix
             par_output = '%s_io_1_outputfile' % par_prefix
@@ -88,12 +88,15 @@ def _get_task_type_parameters(self, data, task_type, evaluation_param):
                 if not os.path.exists(pas_grader):
                     user_managers = '[\\"grader.%l\\"]'
                 task_type_parameters[par_user_managers] = user_managers
-            return [
+            param_list = [
                 task_type_parameters[par_compilation],
                 [task_type_parameters[par_input],
                  task_type_parameters[par_output]],
                 evaluation_param,
             ]
+            if task_type == 'BatchAndOutput':
+                param_list.append(','.join(data["output_only_testcases"]))
+            return param_list
 
         if task_type == 'Communication':
             par_processes = '%s_num_processes' % par_prefix
@@ -170,7 +173,19 @@ def get_task(self, get_statement=True):
         data["task_type"] = \
             data["task_type"][0].upper() + data["task_type"][1:]
 
-        # Setting the submission format
+        # Parse subtask data
+        subtasks_dir = os.path.join(self.path, 'subtasks')
+        subtask_data = {}
+        if not os.path.exists(subtasks_dir):
+            logger.warning('Subtask folder was not found')
+            subtasks = []
+        else:
+            subtasks = sorted(os.listdir(subtasks_dir))
+            for subtask in subtasks:
+                with open(os.path.join(subtasks_dir, subtask), 'rt',
+                          encoding='utf-8') as subtask_json:
+                    subtask_data[subtask] = json.load(subtask_json)
+
         # Obtaining testcases' codename
         testcases_dir = os.path.join(self.path, 'tests')
         if not os.path.exists(testcases_dir):
@@ -181,12 +196,26 @@ def get_task(self, get_statement=True):
                 filename[:-3]
                 for filename in os.listdir(testcases_dir)
                 if filename[-3:] == '.in'])
+        if data["task_type"] == 'BatchAndOutput':
+            output_only_testcases = {}
+            for cur_subtask_data in subtask_data.values():
+                is_output_only = cur_subtask_data.get('output_only', False)
+                if is_output_only:
+                    codenames = cur_subtask_data.get('testcases', list())
+                    output_only_testcases.update(codenames)
+            data["output_only_testcases"] = output_only_testcases
+        
+        # Setting the submission format
         if data["task_type"] == 'OutputOnly':
             args["submission_format"] = list()
             for codename in testcase_codenames:
                 args["submission_format"].append("output_%s.txt" % codename)
         elif data["task_type"] == 'Notice':
             args["submission_format"] = list()
+        elif data["task_type"] == "BatchAndOutput":
+            args["submission_format"] = ["%s.%%l" % name]
+            for codename in data["output_only_testcases"]:
+                args["submission_format"].append("output_%s.txt" % codename)
         else:
             args["submission_format"] = ["%s.%%l" % name]
 
@@ -240,7 +269,7 @@ def get_task(self, get_statement=True):
             logger.info("Checker found, compiling")
             checker_exe = os.path.join(checker_dir, "checker")
             ret = subprocess.call([
-                "g++", "-x", "c++", "-std=gnu++17", "-O2", "-static",
+                "g++", "-x", "c++", "-std=gnu++20", "-O2", "-static",
                 "-o", checker_exe, checker_src
             ])
             if ret != 0:
@@ -298,7 +327,7 @@ def get_task(self, get_statement=True):
             logger.info("Manager found, compiling")
             manager_exe = os.path.join(graders_dir, "manager")
             ret = subprocess.call([
-                "g++", "-x", "c++", "-std=gnu++17", "-O2", "-static",
+                "g++", "-x", "c++", "-std=gnu++20", "-O2", "-static",
                 "-o", manager_exe, manager_src
             ])
             if ret != 0:
@@ -332,13 +361,6 @@ def get_task(self, get_statement=True):
             args["testcases"][codename] = testcase
 
         # Score Type
-        subtasks_dir = os.path.join(self.path, 'subtasks')
-        if not os.path.exists(subtasks_dir):
-            logger.warning('Subtask folder was not found')
-            subtasks = []
-        else:
-            subtasks = sorted(os.listdir(subtasks_dir))
-
         if len(subtasks) == 0:
             number_tests = max(len(testcase_codenames), 1)
             args["score_type"] = "Sum"
@@ -350,22 +372,20 @@ def get_task(self, get_statement=True):
             add_optional_name = False
             for subtask in subtasks:
                 subtask_no += 1
-                with open(os.path.join(subtasks_dir, subtask), 'rt',
-                          encoding='utf-8') as subtask_json:
-                    subtask_data = json.load(subtask_json)
-                    score = int(subtask_data["score"])
-                    testcases = "|".join(
-                        re.escape(testcase)
-                        for testcase in subtask_data["testcases"]
-                    )
-                    optional_name = "Subtask %d" % subtask_no
-                    if subtask_no == 0 and score == 0:
-                        add_optional_name = True
-                        optional_name = "Samples"
-                    if add_optional_name:
-                        parsed_data.append([score, testcases, optional_name])
-                    else:
-                        parsed_data.append([score, testcases])
+                cur_subtask_data = subtask_data[subtask]
+                score = int(cur_subtask_data["score"])
+                testcases = "|".join(
+                    re.escape(testcase)
+                    for testcase in cur_subtask_data["testcases"]
+                )
+                optional_name = "Subtask %d" % subtask_no
+                if subtask_no == 0 and score == 0:
+                    add_optional_name = True
+                    optional_name = "Samples"
+                if add_optional_name:
+                    parsed_data.append([score, testcases, optional_name])
+                else:
+                    parsed_data.append([score, testcases])
             args["score_type_parameters"] = parsed_data
 
         dataset = Dataset(**args)