X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=tasks.py;h=2f3db6a9a23797d48db39e4442006c789db879e8;hb=49218a3e2adb19d2ec98a454e0076c3461ab1c69;hp=dba6e13c5414408abeb7fa18ec131fe7756f999a;hpb=a85b2f79ae551da3454daa7b90554be5ca3c5bf6;p=picoclvr.git

diff --git a/tasks.py b/tasks.py
index dba6e13..2f3db6a 100755
--- a/tasks.py
+++ b/tasks.py
@@ -1885,20 +1885,15 @@ class Escape(Task):
         self.width = width
 
         states, actions, rewards = escape.generate_episodes(
-            nb_train_samples + nb_test_samples, height, width, T
+            nb_train_samples + nb_test_samples, height, width, 3 * T
         )
-        seq = escape.episodes2seq(states, actions, rewards)
+        seq = escape.episodes2seq(states, actions, rewards, lookahead_delta=T)
+        seq = seq[:, seq.size(1) // 3 : 2 * seq.size(1) // 3]
         self.train_input = seq[:nb_train_samples].to(self.device)
         self.test_input = seq[nb_train_samples:].to(self.device)
 
         self.nb_codes = max(self.train_input.max(), self.test_input.max()) + 1
 
-        # if logger is not None:
-        # for s, a in zip(self.train_input[:100], self.train_ar_mask[:100]):
-        # logger(f"train_sequences {self.problem.seq2str(s)}")
-        # a = "".join(["01"[x.item()] for x in a])
-        # logger(f"                {a}")
-
     def batches(self, split="train", nb_to_use=-1, desc=None):
         assert split in {"train", "test"}
         input = self.train_input if split == "train" else self.test_input
@@ -1918,6 +1913,23 @@ class Escape(Task):
         self, n_epoch, model, result_dir, logger, deterministic_synthesis, nmax=1000
     ):
         result = self.test_input[:100].clone()
+
+        # Saving the ground truth
+
+        s, a, r, lr = escape.seq2episodes(
+            result, self.height, self.width, lookahead=True
+        )
+        str = escape.episodes2str(
+            s, a, r, lookahead_rewards=lr, unicode=True, ansi_colors=True
+        )
+
+        filename = os.path.join(result_dir, f"test_true_seq_{n_epoch:04d}.txt")
+        with open(filename, "w") as f:
+            f.write(str)
+            logger(f"wrote {filename}")
+
+        # Re-generating from the first frame
+
         ar_mask = (
             torch.arange(result.size(1), device=result.device)
             > self.height * self.width + 2
@@ -1934,8 +1946,14 @@ class Escape(Task):
             device=self.device,
         )
 
-        s, a, r = escape.seq2episodes(result, self.height, self.width)
-        str = escape.episodes2str(s, a, r, unicode=True, ansi_colors=True)
+        # Saving the generated sequences
+
+        s, a, r, lr = escape.seq2episodes(
+            result, self.height, self.width, lookahead=True
+        )
+        str = escape.episodes2str(
+            s, a, r, lookahead_rewards=lr, unicode=True, ansi_colors=True
+        )
 
         filename = os.path.join(result_dir, f"test_seq_{n_epoch:04d}.txt")
         with open(filename, "w") as f: