X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=main.py;h=f4e4f5c2c11e27d9be2666b81fc82d6e02f09b40;hb=8d9cd6a2c09da2105ca17b04df94fcf84e8de954;hp=6e87cda0c0371a8c240be6b15e917ae42c6a5d44;hpb=0d86d8ca945722438d3c85cd01b3740269ed3546;p=picoclvr.git

diff --git a/main.py b/main.py
index 6e87cda..f4e4f5c 100755
--- a/main.py
+++ b/main.py
@@ -33,7 +33,7 @@ parser.add_argument(
     "--task",
     type=str,
     default="twotargets",
-    help="byheart, learnop, guessop, degradation, twotargets, addition, picoclvr, mnist, maze, snake, stack, expr, rpl, grid, qmlp",
+    help="byheart, learnop, guessop, mixing, twotargets, addition, picoclvr, mnist, maze, snake, stack, expr, rpl, grid, qmlp",
 )
 
 parser.add_argument("--log_filename", type=str, default="train.log", help=" ")
@@ -162,7 +162,9 @@ parser.add_argument("--expr_input_file", type=str, default=None)
 ##############################
 # Misc
 
-parser.add_argument("--degradation_hard", action="store_true", default=False)
+parser.add_argument("--mixing_hard", action="store_true", default=False)
+
+parser.add_argument("--mixing_deterministic_start", action="store_true", default=False)
 
 ######################################################################
 
@@ -254,7 +256,7 @@ default_task_args = {
         "nb_train_samples": 50000,
         "nb_test_samples": 10000,
     },
-    "degradation": {
+    "mixing": {
         "model": "37M",
         "batch_size": 25,
         "nb_train_samples": 250000,
@@ -414,9 +416,11 @@ elif args.task == "twotargets":
         device=device,
     )
 
-elif args.task == "degradation":
+elif args.task == "mixing":
     task = tasks.SandBox(
-        problem=problems.ProblemDegradation(hard=args.degradation_hard),
+        problem=problems.ProblemMixing(
+            hard=args.mixing_hard, random_start=not args.mixing_deterministic_start
+        ),
         nb_train_samples=args.nb_train_samples,
         nb_test_samples=args.nb_test_samples,
         batch_size=args.batch_size,