X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=rpl.py;h=7e865a56556110b36e871a75451c72708807e45a;hb=439c597d409c344283f8996f042daf79d3f24de2;hp=42db38cad4c430f38e8cf38f3872b82e91aa31ff;hpb=c9dbc3abf436df8af1379d04ab51159e821496f1;p=picoclvr.git
diff --git a/rpl.py b/rpl.py
index 42db38c..7e865a5 100755
--- a/rpl.py
+++ b/rpl.py
@@ -11,6 +11,7 @@ from torch.nn import functional as F
def rpl_exec(program, stack):
+ stack = stack.copy()
for op in program:
if op == "add":
if len(stack) > 1:
@@ -44,25 +45,36 @@ def rpl_exec(program, stack):
else:
raise ValueError(f"Unknown instruction {op}")
+ return stack
+
rpl_ops = ["add", "min", "max", "swp", "rep", "dup", "del"]
######################################################################
-def generate(nb_values=3, max_input=9, prog_len=6, nb_runs=5):
- prog_len = 1 + torch.randint(prog_len - 1, (1,)).item()
- prog = [rpl_ops[k] for k in torch.randint(len(rpl_ops), (prog_len,))]
+def generate(nb_starting_values=3, max_input=9, prog_len=6, nb_runs=5):
+ prog_len = (1 + torch.randint(2 * prog_len, (1,))).clamp(max=prog_len).item()
+
+ while True:
+ no_empty_stack = True
+ prog = [rpl_ops[k] for k in torch.randint(len(rpl_ops), (prog_len,))]
+
+ result = []
+ for _ in range(nb_runs):
+ stack = [
+ x.item() for x in torch.randint(max_input + 1, (nb_starting_values,))
+ ]
+ result_stack = rpl_exec(prog, stack)
+ if len(result_stack) == 0:
+ no_empty_stack = False
+ result = result + [""] + stack + ["