Update.

[picoclvr.git] / main.py

diff --git a/main.py b/main.py
index d961301..4a46fe6 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -33,7 +33,7 @@ parser.add_argument(
     "--task",
     type=str,
     default="twotargets",
-    help="byheart, learnop, guessop, twotargets, addition, picoclvr, mnist, maze, snake, stack, expr, rpl, grid, qmlp",
+    help="byheart, learnop, guessop, twocuts, twotargets, addition, picoclvr, mnist, maze, snake, stack, expr, rpl, grid, qmlp",
 )
 
 parser.add_argument("--log_filename", type=str, default="train.log", help=" ")
@@ -159,6 +159,11 @@ parser.add_argument("--expr_result_max", type=int, default=99)
 
 parser.add_argument("--expr_input_file", type=str, default=None)
 
+##############################
+# Misc
+
+parser.add_argument("--twocuts_no_global", action="store_true", default=False)
+
 ######################################################################
 
 args = parser.parse_args()
@@ -249,6 +254,12 @@ default_task_args = {
         "nb_train_samples": 50000,
         "nb_test_samples": 10000,
     },
+    "twocuts": {
+        "model": "37M",
+        "batch_size": 25,
+        "nb_train_samples": 100000,
+        "nb_test_samples": 10000,
+    },
     "mnist": {
         "model": "37M",
         "batch_size": 10,
@@ -403,6 +414,16 @@ elif args.task == "twotargets":
         device=device,
     )
 
+elif args.task == "twocuts":
+    task = tasks.SandBox(
+        problem=problems.ProblemTwoCuts(global_constraint = not args.twocuts_no_global),
+        nb_train_samples=args.nb_train_samples,
+        nb_test_samples=args.nb_test_samples,
+        batch_size=args.batch_size,
+        logger=log_string,
+        device=device,
+    )
+
 elif args.task == "addition":
     task = tasks.SandBox(
         problem=problems.ProblemAddition(),