Rename variables multipass to multi_pass

Author: mpsijm

bin/constraints.py

@@ -22,7 +22,7 @@ def check_validators(problem):
     if not in_constraints:
         warn("No constraint validation of input values found in input validators.")
     problem.validate_data(validate.Mode.ANSWER, constraints=ans_constraints)
-    if not problem.interactive and not problem.multipass and not ans_constraints:
+    if not problem.interactive and not problem.multi_pass and not ans_constraints:
         log("No constraint validation of answer values found in answer or output validators.")
     print()
 

bin/export.py

@@ -74,11 +74,11 @@ def build_samples_zip(problems, output, statement_language):
         outputdir = Path(problem.label)
 
         attachments_dir = problem.path / "attachments"
-        if (problem.interactive or problem.multipass) and not attachments_dir.is_dir():
+        if (problem.interactive or problem.multi_pass) and not attachments_dir.is_dir():
             interactive = "interactive " if problem.interactive else ""
-            multipass = "multi-pass " if problem.multipass else ""
+            multi_pass = "multi-pass " if problem.multi_pass else ""
             util.error(
-                f"{interactive}{multipass}problem {problem.name} does not have an attachments/ directory."
+                f"{interactive}{multi_pass}problem {problem.name} does not have an attachments/ directory."
             )
             continue
 
@@ -96,7 +96,7 @@ def build_samples_zip(problems, output, statement_language):
                     util.error(f"Cannot include broken file {f}.")
 
         # Add samples for non-interactive and non-multi-pass problems.
-        if not problem.interactive and not problem.multipass:
+        if not problem.interactive and not problem.multi_pass:
             samples = problem.testcases(only_samples=True)
             if samples:
                 for i in range(0, len(samples)):
@@ -128,15 +128,15 @@ def build_problem_zip(problem, output):
         ("problem_statement/*", True),
         ("submissions/accepted/**/*", True),
         ("submissions/*/**/*", False),
-        ("attachments/**/*", problem.interactive or problem.multipass),
+        ("attachments/**/*", problem.interactive or problem.multi_pass),
     ]
 
     testcases = [
         ("data/secret/**/*.in", True),
-        ("data/sample/**/*.in", not problem.interactive and not problem.multipass),
+        ("data/sample/**/*.in", not problem.interactive and not problem.multi_pass),
     ]
 
-    if problem.interactive or problem.multipass:
+    if problem.interactive or problem.multi_pass:
         # .interaction files don't need a corresponding .in
         # therefore we can handle them like all other files
         files += [("data/sample/**/*.interaction", False)]

bin/fuzz.py

@@ -72,7 +72,7 @@ def _run(self, bar):
         localbar.done()
 
         # Generate .ans.
-        if not self.fuzz.problem.interactive and not self.fuzz.problem.multipass:
+        if not self.fuzz.problem.interactive and not self.fuzz.problem.multi_pass:
             if self.solution and not testcase.ans_path.is_file():
                 if testcase.ans_path.is_file():
                     testcase.ans_path.unlink()

bin/generate.py

@@ -706,11 +706,11 @@ def validate_ans(t, problem, testcase, meta_yaml, bar):
         ansfile = problem.tmpdir / "data" / t.hash / "testcase.ans"
         assert ansfile.is_file()
 
-        if problem.interactive or problem.multipass:
+        if problem.interactive or problem.multi_pass:
             if ansfile.stat().st_size != 0:
                 interactive = "interaction " if problem.interactive else ""
-                multipass = "multipass " if problem.multipass else ""
-                bar.warn(f".ans file for {interactive}{multipass}problem is expected to be empty.")
+                multi_pass = "multi-pass " if problem.multi_pass else ""
+                bar.warn(f".ans file for {interactive}{multi_pass}problem is expected to be empty.")
         else:
             size = ansfile.stat().st_size
             if (
@@ -958,8 +958,8 @@ def needed(ext):
 
             used_solution = False
             changed_ans = False
-            if problem.interactive or problem.multipass:
-                # Generate empty ans file for interactive/multipass problems
+            if problem.interactive or problem.multi_pass:
+                # Generate empty ans file for interactive/multi-pass problems
                 if ".ans" not in meta_yaml["generated_extensions"]:
                     if not ansfile.is_file() or ansfile.stat().st_size != 0:
                         ansfile.write_text("")
@@ -1829,7 +1829,7 @@ def build_program(p):
         build_programs(program.Visualizer, visualizers_used)
 
         self.problem.validators(validate.InputValidator)
-        if not self.problem.interactive and not self.problem.multipass:
+        if not self.problem.interactive and not self.problem.multi_pass:
             self.problem.validators(validate.AnswerValidator)
         self.problem.validators(validate.OutputValidator)
 

bin/interactive.py

@@ -64,7 +64,7 @@ def get_validator_command():
     validator_dir = output_validator.tmpdir
     submission_dir = run.submission.tmpdir
 
-    nextpass = run.feedbackdir / "nextpass.in" if run.problem.multipass else False
+    nextpass = run.feedbackdir / "nextpass.in" if run.problem.multi_pass else False
 
     if config.args.verbose >= 2:
         print("Validator:  ", *get_validator_command(), file=sys.stderr)
@@ -132,7 +132,7 @@ def get_validator_command():
                         _feedback(run, validator_err),
                         exec_res.err,
                         verdict,
-                        pass_id if run.problem.multipass else None,
+                        pass_id if run.problem.multi_pass else None,
                     )
                 else:
                     tle_result.timeout_expired |= max_duration >= timeout
@@ -170,7 +170,7 @@ def get_validator_command():
                 _feedback(run, validator_err),
                 exec_res.err,
                 verdict,
-                pass_id if run.problem.multipass else None,
+                pass_id if run.problem.multi_pass else None,
             )
         else:
             tle_result.duration = max_duration
@@ -401,7 +401,7 @@ def kill_handler_function():
                     val_err,
                     team_err,
                     verdict,
-                    pass_id if run.problem.multipass else None,
+                    pass_id if run.problem.multi_pass else None,
                 )
             else:
                 tle_result.timeout_expired |= aborted
@@ -433,7 +433,7 @@ def kill_handler_function():
             val_err,
             team_err,
             verdict,
-            pass_id if run.problem.multipass else None,
+            pass_id if run.problem.multi_pass else None,
         )
     else:
         tle_result.duration = max_duration

bin/latex.py

@@ -104,10 +104,10 @@ def flush():
                         last = line[0]
                 flush()
             else:
-                assert problem.multipass
+                assert problem.multi_pass
 
-                multipass_dir = builddir / "multipass"
-                multipass_dir.mkdir(exist_ok=True)
+                multi_pass_dir = builddir / "multi_pass"
+                multi_pass_dir.mkdir(exist_ok=True)
 
                 lines = sample.read_text()
                 last = "<"
@@ -121,8 +121,8 @@ def flush():
                 def flush():
                     nonlocal current_sample
 
-                    in_path = multipass_dir / f"{sample_name}-{pass_id:02}.in"
-                    out_path = multipass_dir / f"{sample_name}-{pass_id:02}.out"
+                    in_path = multi_pass_dir / f"{sample_name}-{pass_id:02}.in"
+                    out_path = multi_pass_dir / f"{sample_name}-{pass_id:02}.out"
                     in_path.write_text(cur_in)
                     out_path.write_text(cur_out)
 

bin/problem.py

@@ -309,15 +309,15 @@ def _read_settings(self):
         # Aliasing fields makes life easier for us 😛
         self.limits: ProblemLimits = self.settings.limits
         self.interactive: bool = self.settings.interactive
-        self.multipass: bool = self.settings.multi_pass
+        self.multi_pass: bool = self.settings.multi_pass
         self.custom_output: bool = self.settings.custom_output
 
         # Handle dependencies...
         has_validation_passes = self.limits.validation_passes is not None
-        if self.multipass and not has_validation_passes:
+        if self.multi_pass and not has_validation_passes:
             self.limits.validation_passes = 2
-        if not self.multipass and has_validation_passes:
-            warn("limit: validation_passes is only used for multipass problems. SKIPPED.")
+        if not self.multi_pass and has_validation_passes:
+            warn("limit: validation_passes is only used for multi_pass problems. SKIPPED.")
 
     def _parse_testdata_yaml(p, path, bar):
         assert path.is_relative_to(p.path / "data")
@@ -470,14 +470,14 @@ def testcases(
         for f in in_paths:
             t = testcase.Testcase(p, f, print_warn=True)
             if (
-                (p.interactive or p.multipass)
+                (p.interactive or p.multi_pass)
                 and mode == validate.Mode.INVALID
                 and t.root in ["invalid_answers", "invalid_outputs"]
             ):
                 msg = ""
                 if p.interactive:
                     msg += " interactive"
-                if p.multipass:
+                if p.multi_pass:
                     msg += " multi-pass"
                 warn(f"Found file {f} for {mode} validation in{msg} problem. Skipping.")
                 continue
@@ -530,7 +530,7 @@ def statement_samples(p) -> list[Path | tuple[Path, Path]]:
         # Non-interactive and Non-multi-pass problems should not have .interaction files.
         # On the other hand, interactive problems are allowed to have .{in,ans}.statement files,
         # so that they can emulate a non-interactive problem with on-the-fly generated input.
-        if not p.interactive and not p.multipass:
+        if not p.interactive and not p.multi_pass:
             if len(interaction_paths) != 0:
                 warn(
                     f"Non-interactive/Non-multi-pass problem {p.name} should not have data/sample/*.interaction files."
@@ -934,12 +934,12 @@ def validate_data(problem, mode: validate.Mode, constraints: dict | bool | None
             constraints = {}
         assert constraints is None or isinstance(constraints, dict)
 
-        if (problem.interactive or problem.multipass) and mode == validate.Mode.ANSWER:
+        if (problem.interactive or problem.multi_pass) and mode == validate.Mode.ANSWER:
             if (problem.path / "answer_validators").exists():
                 msg = ""
                 if problem.interactive:
                     msg += " interactive"
-                if problem.multipass:
+                if problem.multi_pass:
                     msg += " multi-pass"
                 log(f"Not running answer_validators for{msg} problems.")
             return True
@@ -953,12 +953,12 @@ def validate_data(problem, mode: validate.Mode, constraints: dict | bool | None
                 testcases = problem.testcases(mode=mode)
             case validate.Mode.ANSWER:
                 assert not problem.interactive
-                assert not problem.multipass
+                assert not problem.multi_pass
                 problem.validators(validate.AnswerValidator, check_constraints=check_constraints)
                 testcases = problem.testcases(mode=mode)
             case validate.Mode.INVALID:
                 problem.validators(validate.InputValidator)
-                if not problem.interactive and not problem.multipass:
+                if not problem.interactive and not problem.multi_pass:
                     problem.validators(validate.AnswerValidator)
                 testcases = problem.testcases(mode=mode)
             case _:

bin/run.py

@@ -76,7 +76,7 @@ def run(self, bar, *, interaction=None, submission_args=None):
             if interaction:
                 assert not interaction.is_relative_to(self.tmpdir)
                 interaction = interaction.open("a")
-            nextpass = self.feedbackdir / "nextpass.in" if self.problem.multipass else False
+            nextpass = self.feedbackdir / "nextpass.in" if self.problem.multi_pass else False
             pass_id = 0
             max_duration = 0
             tle_result = None
@@ -103,7 +103,7 @@ def run(self, bar, *, interaction=None, submission_args=None):
                     result.verdict = Verdict.TIME_LIMIT_EXCEEDED
                     if tle_result is None:
                         tle_result = result
-                        tle_result.pass_id = pass_id if self.problem.multipass else None
+                        tle_result.pass_id = pass_id if self.problem.multi_pass else None
                     else:
                         tle_result.timeout_expired |= result.timeout_expired
                     if not self._continue_with_tle(result.verdict, result.timeout_expired):
@@ -163,7 +163,7 @@ def run(self, bar, *, interaction=None, submission_args=None):
             if interaction:
                 interaction.close()
 
-            if self.problem.multipass:
+            if self.problem.multi_pass:
                 result.pass_id = pass_id
 
             if tle_result is not None:
@@ -180,15 +180,15 @@ def run(self, bar, *, interaction=None, submission_args=None):
                 self.out_path.unlink()
 
         if result.verdict and (self.feedbackdir / "nextpass.in").is_file():
-            assert not self.problem.multipass
+            assert not self.problem.multi_pass
             bar.warn("Validator created nextpass.in for non multi-pass problem. Ignored.")
 
         self.result = result
         return result
 
     # check if we should continue after tle
     def _continue_with_tle(self, verdict, timeout_expired):
-        if not self.problem.multipass:
+        if not self.problem.multi_pass:
             return False
         if verdict != Verdict.TIME_LIMIT_EXCEEDED:
             return False
@@ -374,7 +374,7 @@ def run_testcases(
     ):
         runs = [Run(self.problem, self, testcase) for testcase in testcases]
         max_testcase_len = max(len(run.name) for run in runs)
-        if self.problem.multipass:
+        if self.problem.multi_pass:
             max_testcase_len += 2
         max_item_len = max_testcase_len + max_submission_name_len - len(self.name)
         padding_len = max_submission_name_len - len(self.name)
@@ -463,7 +463,7 @@ def process_run(run: Run):
             timeout = result.duration >= self.limits["timeout"]
             duration_style = Style.BRIGHT if timeout else ""
             passmsg = (
-                f":{Fore.CYAN}{result.pass_id}{Style.RESET_ALL}" if self.problem.multipass else ""
+                f":{Fore.CYAN}{result.pass_id}{Style.RESET_ALL}" if self.problem.multi_pass else ""
             )
             testcase = f"{run.name}{Style.RESET_ALL}{passmsg}"
             style_len = len(f"{Style.RESET_ALL}")

bin/stats.py

@@ -173,7 +173,7 @@ def count(path):
         def value(x):
             if x[0] == "  time" or x[0] == "subs":
                 return x[1](problem)
-            if x[0] == "A" and (problem.interactive or problem.multipass):
+            if x[0] == "A" and (problem.interactive or problem.multi_pass):
                 return None  # Do not show an entry for the answer validator if it is not required
             if x[0] == "O" and not problem.custom_output:
                 return None  # Do not show an entry for the output validator if it is not required

bin/testcase.py

@@ -218,7 +218,7 @@ def validate_format(
                     return ok
 
                 assert not self.problem.interactive
-                assert not self.problem.multipass
+                assert not self.problem.multi_pass
 
                 ok = self.validate_format(
                     validate.Mode.ANSWER,