use multipass dir

Author: mzuenni

bin/run.py

@@ -208,7 +208,9 @@ def _continue_with_tle(self, verdict, timeout_expired):
     def _prepare_nextpass(self, nextpass):
         if not nextpass or not nextpass.is_file():
             return False
-        # clear all files outside of feedbackdir
+        # TODO: keep feedback files and concatenate them?
+        #  - judgemessage.txt
+        #  - judgeerror.txt
         for f in self.tmpdir.iterdir():
             if f == self.feedbackdir:
                 continue
@@ -217,7 +219,15 @@ def _prepare_nextpass(self, nextpass):
             elif f.exists():
                 shutil.rmtree(f)
         # use nextpass.in as next input
-        shutil.move(nextpass, self.in_path)
+        nextpass.rename(self.in_path)
+        # clear all files outside of "feedbackdir / multipass"
+        for f in self.feedbackdir.iterdir():
+            if f == self.feedbackdir / "multipass":
+                continue
+            if f.is_file():
+                f.unlink()
+            elif f.exists():
+                shutil.rmtree(f)
         return True
 
     def _validate_output(self, bar: BAR_TYPE) -> Optional[ExecResult]:
@@ -443,7 +453,7 @@ def process_run(run: Run):
             for f in run.feedbackdir.iterdir():
                 if f.name.startswith("."):
                     continue  # skip "hidden" files
-                if f.name in ["judgemessage.txt", "judgeerror.txt"]:
+                if f.name in ["judgemessage.txt", "judgeerror.txt", "multipass"]:
                     continue
                 if f.name.startswith("judgeimage.") or f.name.startswith("teamimage."):
                     data += f"{f.name}: {shorten_path(self.problem, f.parent) / f.name}\n"

bin/validate.py

@@ -403,6 +403,9 @@ def run(
         cwd, constraints_path, arglist = self._run_helper(testcase, constraints, args)
         if not isinstance(mode, Mode):
             cwd = mode.feedbackdir
+        if self.problem.multi_pass:
+            multipassdir = cwd / "multipass"
+            multipassdir.mkdir(parents=True, exist_ok=True)
         invocation = self.run_command + [in_path, ans_path, cwd]
 
         with path.open("rb") as file:

test/problems/alternativeencryption/.gitignore

@@ -0,0 +1,3 @@
+#GENERATED BY BAPCtools
+data/*
+!data/sample/

test/problems/alternativeencryption/data/sample/001.ans

@@ -0,0 +1,5 @@
+encrypt
+3
+plaintext
+nwerc
+correct

test/problems/alternativeencryption/data/sample/001.in

@@ -0,0 +1,17 @@
+<encrypt
+<3
+<plaintext
+<nwerc
+<correct
+>encrypted
+>delft
+>balloon
+---
+<decrypt
+<3
+<encrypted
+<delft
+<balloon
+>plaintext
+>nwerc
+>correct

test/problems/alternativeencryption/data/sample/001.interaction

@@ -0,0 +1,19 @@
+#!/usr/bin/python3
+from random import seed, choice
+from string import ascii_lowercase as sigma
+import sys
+
+
+def randstr(n):
+    return "".join([choice(sigma) for _ in range(n)])
+
+
+# Init seed with first argument
+seed(int(sys.argv[1]))
+n = int(sys.argv[2])
+command = " ".join(sys.argv[3:]).encode("ascii").decode("unicode_escape")
+
+print("encrypt")
+print(n)
+for i in range(n):
+    print(eval(command))

test/problems/alternativeencryption/generators/eval.py

@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+import sys
+import random
+
+maxlen = 100
+
+random.seed(int(sys.argv[1]))
+
+
+def letter(i):
+    return chr(ord("a") + i)
+
+
+def randomstring(len):
+    letters = [letter(random.randint(0, 25)) for _ in range(len)]
+    string = "".join(letters)
+    return string
+
+
+strings = []
+
+# Single letter
+for i in range(0, 26):
+    strings.append(letter(i))
+
+# Fixed strings
+strings.append("aaaaaaaaaa")
+strings.append("abcdefghijklmnopqrstuvwxyz")
+strings.append("dejavu")
+strings.append("dejavu")
+strings.append("dejavu")
+
+# Random strings, random length
+for _ in range(100):
+    n = random.randint(10, maxlen)
+    strings.append(randomstring(n))
+
+# Random strings, max length
+for _ in range(20):
+    strings.append(randomstring(maxlen))
+
+
+# Print strings
+print(len(strings))
+for string in strings:
+    print(string)

test/problems/alternativeencryption/generators/generator.py

@@ -0,0 +1,34 @@
+solution: /submissions/accepted/mzuenni_sample.cpp
+
+testdata.yaml:
+  output_validator_args:
+    - case_sensitive
+data:
+  sample:
+    data:
+      - "":
+          in: |
+            encrypt
+            3
+            plaintext
+            nwerc
+            correct
+
+  secret:
+    data:
+      - min:
+          in: |
+            encrypt
+            1
+            a
+      - letters: eval.py 0 26 sigma[i % 26]
+      - letters: eval.py 0 1000 sigma[i % 26]
+      - random_equal: eval.py {seed} 1000 sigma[i % 26] * randrange(1, 101)
+      - max_equal: eval.py 0 1000 sigma[i % 26] * 100
+      - random2: eval.py {seed} 1000 randstr(2)
+      - random3: eval.py {seed} 1000 randstr(3)
+      - max_random: eval.py {seed} 1000 randstr(100)
+
+      - random:
+          generate: eval.py {seed} 1000 randstr(randrange(1, 101))
+          count: 100

test/problems/alternativeencryption/generators/generators.yaml

@@ -0,0 +1,17 @@
+#include "validation.h"
+
+// Check the grammar of the input files.
+// You should also check properties of the input.
+// E.g., check that a graph is connected.
+
+int main(int argc, char* argv[]) {
+	InputValidator v(argc, argv);
+	v.test_strings({"encrypt", "decrypt"}, "action");
+	v.newline();
+	int n = v.read_integer("n", 1, 1000);
+	v.newline();
+	for(int i = 0; i < n; i++) {
+		v.read_string("s", 1, 100, "abcdefghijklmnopqrstuvwxyz");
+		v.newline();
+	}
+}