rename FishingLocationChecker to FishingLocationLegalityChecker

poseidon-fisheries · Feb 3, 2025 · f8f4372 · f8f4372
1 parent b37014b
commit f8f4372
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/...ts/src/main/java/uk/ac/ox/poseidon/agents/regulations/FishingLocationLegalityChecker.java b/...ts/src/main/java/uk/ac/ox/poseidon/agents/regulations/FishingLocationLegalityChecker.java
@@ -34,7 +34,7 @@
 import java.util.function.Supplier;
 
 @RequiredArgsConstructor
-public class FishingLocationChecker implements Predicate<Int2D> {
+public class FishingLocationLegalityChecker implements Predicate<Int2D> {
 
     private final Regulations regulations;
     private final GridPathFinder pathFinder;

diff --git a/...main/java/uk/ac/ox/poseidon/agents/regulations/FishingLocationLegalityCheckerFactory.java b/...main/java/uk/ac/ox/poseidon/agents/regulations/FishingLocationLegalityCheckerFactory.java
@@ -34,18 +34,19 @@
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-public class FishingLocationCheckerFactory extends VesselScopeFactory<FishingLocationChecker> {
+public class FishingLocationLegalityCheckerFactory
+    extends VesselScopeFactory<FishingLocationLegalityChecker> {
 
     private Factory<? extends Regulations> regulations;
     private Factory<? extends GridPathFinder> pathFinder;
     private Factory<? extends Distance> distance;
 
     @Override
-    protected FishingLocationChecker newInstance(
+    protected FishingLocationLegalityChecker newInstance(
         final Simulation simulation,
         final Vessel vessel
     ) {
-        return new FishingLocationChecker(
+        return new FishingLocationLegalityChecker(
             regulations.get(simulation),
             pathFinder.get(simulation),
             distance.get(simulation),

diff --git a/examples/src/main/java/uk/ac/ox/poseidon/examples/external/ExternalScenario.java b/examples/src/main/java/uk/ac/ox/poseidon/examples/external/ExternalScenario.java
@@ -42,7 +42,7 @@
 import uk.ac.ox.poseidon.agents.registers.Register;
 import uk.ac.ox.poseidon.agents.registers.RegisterFactory;
 import uk.ac.ox.poseidon.agents.registers.RegisteringFactory;
-import uk.ac.ox.poseidon.agents.regulations.FishingLocationCheckerFactory;
+import uk.ac.ox.poseidon.agents.regulations.FishingLocationLegalityCheckerFactory;
 import uk.ac.ox.poseidon.agents.regulations.NeverPermittedFactory;
 import uk.ac.ox.poseidon.agents.tables.FishingActionListenerTableFactory;
 import uk.ac.ox.poseidon.agents.vessels.RandomHomePortFactory;
@@ -151,7 +151,7 @@ public class ExternalScenario extends Scenario {
             distance
         );
     private VesselScopeFactory<? extends Predicate<Int2D>> fishingLocationChecker =
-        new FishingLocationCheckerFactory(
+        new FishingLocationLegalityCheckerFactory(
             new NeverPermittedFactory(),
             pathFinder,
             distance