Add more models for Gym control (#1346)

* more models for Gym control * Update gymexperiments.py * Update multigym.py * fix * Update gymexperiments.py * update moremodels (#1378) * Bump version to 0.4.3.post10 (#1364) * Removing an incomplete sentence from the doc (#1367) * Fix broken CI (#1370) * docs: add GH button in support of Ukraine (#1369) * Add the FAO crop model (#1343) * aquacrop * fix * fix * fix * Update ac.py * black * Update experiments.py (#1361) * fix * Update bench.txt * fix * fix * fix * tentative_pip3 * yet_another_tentative_fi * yet_another_tentative_fi * fix * fix_suffering * desperate_try * desperate_try * desperate_try * desperate_try * fix * desperate_try * desperate_try * desperate_try * desperate_try * fix * Update config.yml * fix * Update setup.py * Update main.txt * fix * Use up-to-date headers (#1371) * Add NLOPT as a solver (#1340) * Update version and changelog to 0.5.0 (#1372) * Deactivate mutation test in CI (#1374) * Reduce noise in gym (#1333) * Reduce noise in gym * Update multigym.py * Add comment Co-authored-by: Jérémy Rapin <[email protected]> Co-authored-by: Dmitry Vinnik <[email protected]> * fix * fix * im_lost * fix * fix * fix Co-authored-by: Jérémy Rapin <[email protected]> Co-authored-by: Dmitry Vinnik <[email protected]>
facebookresearch · Mar 13, 2022 · 2ccea9e · 2ccea9e
1 parent b9f5fae
commit 2ccea9e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -329,7 +329,7 @@ workflows:
           filters:
             tags:
               only: /(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(\.post(0|[1-9][0-9]*))?/
-      - windows-pytests
+#      - windows-pytests
       - docs-deploy:
           requires:
             - install

diff --git a/nevergrad/benchmark/gymexperiments.py b/nevergrad/benchmark/gymexperiments.py
@@ -125,7 +125,20 @@ def ng_full_gym(
     else:
         controls = (
             [
+                "noisy_semideep_neural",
+                "noisy_scrambled_semideep_neural",  # Scrambling: why not perturbating the order of variables ?
+                "noisy_deep_neural",
+                "noisy_scrambled_deep_neural",
                 "neural",
+                # "structured_neural",
+                # "memory_neural",
+                "stackingmemory_neural",
+                "deep_neural",
+                "semideep_neural",
+                "noisy_neural",
+                "noisy_scrambled_neural",
+                # "scrambled_neural",
+                # "linear",
                 "resid_neural",
                 "resid_semideep_neural",
                 "resid_deep_neural",

diff --git a/nevergrad/functions/gym/multigym.py b/nevergrad/functions/gym/multigym.py
@@ -65,9 +65,12 @@
     "deep_extrapolatestackingmemory_neural",
     "semideep_extrapolatestackingmemory_neural",
     "semideep_memory_neural",
+    "noisy_semideep_neural",
+    "noisy_scrambled_semideep_neural",  # Scrambling: why not perturbating the order of variables ?
+    "noisy_deep_neural",
+    "noisy_scrambled_deep_neural",
     "multi_neural",  # One neural net per time step.
     "noisy_neural",  # Do not start at 0 but at a random point.
-    "scrambled_neural",  # Why not perturbating the order of variables ?
     "noisy_scrambled_neural",
     "stochastic_conformant",  # Conformant planning, but still not deterministic.
 ]