X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=main.py;h=2339dcf7e64a4cd330ada22bde57f830f07a4d8e;hb=aa21f7edd3969ca509dfc1378fb5d1a1f7ebf9d1;hp=b4f831f8047dc4bf793a26c3f710b85844d318d9;hpb=22b841a39cc73310cd03dbd1d32fb387f68521d0;p=culture.git

diff --git a/main.py b/main.py
index b4f831f..2339dcf 100755
--- a/main.py
+++ b/main.py
@@ -33,7 +33,7 @@ parser.add_argument(
     "--task",
     type=str,
     default="twotargets",
-    help="file, byheart, learnop, guessop, mixing, memory, twotargets, addition, picoclvr, mnist, maze, snake, stack, expr, rpl, grid, qmlp, escape",
+    help="file, byheart, learnop, guessop, mixing, memory, twotargets, addition, picoclvr, mnist, maze, snake, stack, expr, rpl, grid, qmlp, greed",
 )
 
 parser.add_argument("--log_filename", type=str, default="train.log", help=" ")
@@ -176,13 +176,15 @@ parser.add_argument("--mixing_hard", action="store_true", default=False)
 parser.add_argument("--mixing_deterministic_start", action="store_true", default=False)
 
 ##############################
-# escape options
+# greed options
 
-parser.add_argument("--escape_height", type=int, default=4)
+parser.add_argument("--greed_height", type=int, default=5)
 
-parser.add_argument("--escape_width", type=int, default=6)
+parser.add_argument("--greed_width", type=int, default=7)
 
-parser.add_argument("--escape_T", type=int, default=20)
+parser.add_argument("--greed_T", type=int, default=25)
+
+parser.add_argument("--greed_nb_walls", type=int, default=5)
 
 ######################################################################
 
@@ -298,7 +300,7 @@ default_task_args = {
         "nb_train_samples": 60000,
         "nb_test_samples": 10000,
     },
-    "escape": {
+    "greed": {
         "model": "37M",
         "batch_size": 25,
         "nb_train_samples": 25000,
@@ -614,14 +616,15 @@ elif args.task == "qmlp":
         device=device,
     )
 
-elif args.task == "escape":
-    task = tasks.Escape(
+elif args.task == "greed":
+    task = tasks.Greed(
         nb_train_samples=args.nb_train_samples,
         nb_test_samples=args.nb_test_samples,
         batch_size=args.batch_size,
-        height=args.escape_height,
-        width=args.escape_width,
-        T=args.escape_T,
+        height=args.greed_height,
+        width=args.greed_width,
+        T=args.greed_T,
+        nb_walls=args.greed_nb_walls,
         logger=log_string,
         device=device,
     )