pcse

nevergrad/benchmark/experiments.py

@@ -23,6 +23,7 @@
 from nevergrad.functions.powersystems import PowerSystem
 from nevergrad.functions.stsp import STSP
 from nevergrad.functions.rocket import Rocket
+from nevergrad.functions.pcse import Pcse
 from nevergrad.functions.mixsimulator import OptimizeMix
 from nevergrad.functions.unitcommitment import UnitCommitmentProblem
 from nevergrad.functions import control
@@ -1176,6 +1177,25 @@ def rocket(seed: tp.Optional[int] = None, seq: bool = False) -> tp.Iterator[Expe
                             yield xp
 
 
+@registry.register
+def pcse(seed: tp.Optional[int] = None) -> tp.Iterator[Experiment]:
+    """Crop simulator.
+
+    Low dimensional problem, only 2 vars.
+    """
+    funcs = [Pcse()]
+    seedg = create_seed_generator(seed)
+    optims = get_optimizers("basics", seed=next(seedg))
+    for budget in [25, 50, 100, 200]:
+        for num_workers in [1, 10, 40]:
+            if num_workers < budget:
+                for algo in optims:
+                    for fu in funcs:
+                        xp = Experiment(fu, algo, budget, num_workers=num_workers, seed=next(seedg))
+                        if not xp.is_incoherent:
+                            yield xp
+
+
 @registry.register
 def mono_rocket(seed: tp.Optional[int] = None) -> tp.Iterator[Experiment]:
     """Sequential counterpart of the rocket problem."""

nevergrad/functions/pcse/pcse.py

@@ -4,7 +4,7 @@
 # LICENSE file in the root directory of this source tree.
 
 """
-Approximate Pcse Simulation
+Approximate crop Simulation
 Based on
 https://raw.githubusercontent.com/purdue-orbital/pcse-simulation/master/Simulation2.py
 """
@@ -22,7 +22,7 @@
 class Pcse(ArrayExperimentFunction):
 
 
-    def __init__(self, symmetry: int = 0) -> None:
+    def __init__(self) -> None:
         import sys
         import matplotlib
         import matplotlib.pyplot as plt
@@ -144,4 +144,4 @@ def __call__(self, par_values, grad=None):
         # print("Objective function value with default parameters (%s): %s" % (defaults, error))
 
         param = ng.p.Array(shape=(2,), lower=(TDWI_range[0], SPAN_range[0]), upper=(TDWI_range[1], SPAN_range[1]))
-        super().__init__(objfunc_calculator, parametrization=param, symmetry=symmetry)
+        super().__init__(objfunc_calculator, parametrization=param)