fix western closure policy

poseidon-fisheries · Nov 15, 2023 · 5d44a37 · 5d44a37
1 parent 9f8166e
commit 5d44a37
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/epo/src/main/java/uk/ac/ox/poseidon/epo/WesternClosure.java b/epo/src/main/java/uk/ac/ox/poseidon/epo/WesternClosure.java
@@ -2,6 +2,8 @@
 
 import uk.ac.ox.oxfish.experiments.tuna.Policy;
 import uk.ac.ox.oxfish.model.scenario.EpoScenario;
+import uk.ac.ox.oxfish.regulations.ForbiddenIf;
+import uk.ac.ox.oxfish.regulations.NamedRegulations;
 import uk.ac.ox.oxfish.regulations.conditions.AnyOf;
 import uk.ac.ox.oxfish.regulations.conditions.BetweenYearlyDates;
 import uk.ac.ox.oxfish.regulations.conditions.InRectangularArea;
@@ -36,20 +38,27 @@ public List<Policy<EpoScenario<?>>> get() {
                     extraDays,
                     extraDays
                 ),
-                epoScenario ->
-                    new AnyOf(
-                        yearsActiveCondition(),
-                        new BetweenYearlyDates(
-                            addDays(EL_CORRALITO_BEGINNING, -extraDays),
-                            addDays(EL_CORRALITO_END, extraDays)
-                        ),
-                        new InRectangularArea(
-                            50,
-                            -150,
-                            -50,
-                            eastLongitude
+                epoScenario -> {
+                    final NamedRegulations namedRegulations = (NamedRegulations) epoScenario.getRegulations();
+                    namedRegulations.modify(
+                        "El Corralito",
+                        () -> new ForbiddenIf(
+                            new AnyOf(
+                                yearsActiveCondition(),
+                                new BetweenYearlyDates(
+                                    addDays(EL_CORRALITO_BEGINNING, -extraDays),
+                                    addDays(EL_CORRALITO_END, extraDays)
+                                ),
+                                new InRectangularArea(
+                                    50,
+                                    -150,
+                                    -50,
+                                    eastLongitude
+                                )
+                            )
                         )
-                    )
+                    );
+                }
             )
         ).collect(toImmutableList());
     }