Support having sample subtask on output only (#19)

* Support having sample subtask on output only

* Add error alert if samples subtask index is non-zero

* Add a comment explaining why tests_map uses list

Author: jonathanirvings

scripts/internal/gen_data_parser.py

@@ -39,7 +39,7 @@ def parse_data_or_throw(gen_data, task_data, visitor):
     line_number = 0
 
     testset_index, testset_name = -1, None
-    subtask_index, subtask_counter = -1, -1
+    subtask_index, subtask_counter = -1, 0
     test_index, test_offset = 1, -1
     defined_testsets = set()
 
@@ -62,8 +62,11 @@ def parse_data_or_throw(gen_data, task_data, visitor):
                 visitor.on_testset(testset_name, line_number)
                 if command == "@subtask":
                     visitor.on_subtask(testset_name, line_number)
-                    subtask_counter += 1
-                    subtask_index = subtask_counter
+                    if testset_name != "samples":
+                        subtask_counter += 1
+                        subtask_index = subtask_counter
+                    else:
+                        subtask_index = 0
                 else:
                     subtask_index = -1
             elif command == "@include":

scripts/templates/test_name.py

@@ -2,5 +2,5 @@
 def get_test_name(task_data, testset_name, testset_index, subtask_index, test_index, test_offset, gen_line): #pylint: disable=too-many-arguments
     #pylint: disable=unused-argument
     if task_data['type'] == "OutputOnly":
-        return "%02d" % test_index
+        return "%02d" % subtask_index
     return (testset_name if subtask_index < 0 else str(subtask_index)) + "-%02d" % test_offset

scripts/verify.py

@@ -371,6 +371,8 @@ def check_validator_key(parent, key, name, parName=None):
         if Verification.problem['type'] != 'OutputOnly':
             check_keys(subtasks, ['samples'])
             hasSamples = True
+        else:
+            hasSamples = 'samples' in subtasks
     except KeyError:
         pass
 
@@ -394,6 +396,8 @@ def check_validator_key(parent, key, name, parName=None):
         elif name == 'samples':
             if data['score'] != 0:
                 error('samples subtask score is non-zero')
+            if data['index'] != 0:
+                error('samples subtask index is non-zero')
         else:
             score_sum += data['score']
 
@@ -407,8 +411,9 @@ def check_validator_key(parent, key, name, parName=None):
         error('sum of scores is {}'.format(score_sum))
 
     for i in range(len(subtasks)):
-        if i+(0 if hasSamples else 1) not in indexes:
-            error('missing index {} in subtask indexes'.format(i))
+        index = i+(0 if hasSamples else 1)
+        if index not in indexes:
+            error('missing index {} in subtask indexes'.format(index))
 
     return subtasks
 
@@ -424,18 +429,20 @@ def __init__(self):
 
         def on_testset(self, testset_name, line_number):
             self.testsets.append(testset_name)
-            self.tests_map[testset_name] = set()
+            # We use list instead of set here to detect if there is more than
+            # one test in each subtask (since they will have the same filename).
+            self.tests_map[testset_name] = []
 
         def on_subtask(self, subtask_name, line_number):
             self.subtasks.append(subtask_name)
             self.used_testsets.add(subtask_name)
 
         def on_include(self, testset_name, included_testset, line_number):
             self.used_testsets.add(included_testset)
-            self.tests_map[testset_name] |= self.tests_map[included_testset]
+            self.tests_map[testset_name] += self.tests_map[included_testset]
 
         def on_test(self, testset_name, test_name, line, line_number):
-            self.tests_map[testset_name].add(test_name)
+            self.tests_map[testset_name].append(test_name)
 
 
     gen_data = GenDataVisitor()
@@ -484,6 +491,14 @@ def on_test(self, testset_name, test_name, line, line_number):
             else:
                 warning("testset '{}' has no tests".format(testset))
 
+    #Checking for multiple tests in one subtask for output only:
+    if Verification.problem['type'] == 'OutputOnly':
+        for testset in gen_data.testsets:
+            if testset not in gen_subtasks:
+                error('testset {} must not be defined in output only'.format(testset))
+            elif len(gen_data.tests_map[testset]) != 1:
+                error('subtask {} has more than one test'.format(testset))
+
     #Checking if a testset is defined but not used:
     for ts in set(gen_data.testsets)-set(gen_data.used_testsets):
         warning("testset '{}' is not used anywhere".format(ts))