From f8f43720f03a2ef0ea7b48f6167dc1a7349a8170 Mon Sep 17 00:00:00 2001 From: Nicolas Payette Date: Mon, 3 Feb 2025 13:26:14 +0000 Subject: [PATCH] rename FishingLocationChecker to FishingLocationLegalityChecker --- .../agents/regulations/FishingLocationLegalityChecker.java | 2 +- .../regulations/FishingLocationLegalityCheckerFactory.java | 7 ++++--- .../ac/ox/poseidon/examples/external/ExternalScenario.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/agents/src/main/java/uk/ac/ox/poseidon/agents/regulations/FishingLocationLegalityChecker.java b/agents/src/main/java/uk/ac/ox/poseidon/agents/regulations/FishingLocationLegalityChecker.java index a12ffd55c..d9d7c873f 100644 --- a/agents/src/main/java/uk/ac/ox/poseidon/agents/regulations/FishingLocationLegalityChecker.java +++ b/agents/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 { +public class FishingLocationLegalityChecker implements Predicate { private final Regulations regulations; private final GridPathFinder pathFinder; diff --git a/agents/src/main/java/uk/ac/ox/poseidon/agents/regulations/FishingLocationLegalityCheckerFactory.java b/agents/src/main/java/uk/ac/ox/poseidon/agents/regulations/FishingLocationLegalityCheckerFactory.java index 38a72af64..451d3e5fb 100644 --- a/agents/src/main/java/uk/ac/ox/poseidon/agents/regulations/FishingLocationLegalityCheckerFactory.java +++ b/agents/src/main/java/uk/ac/ox/poseidon/agents/regulations/FishingLocationLegalityCheckerFactory.java @@ -34,18 +34,19 @@ @Setter @NoArgsConstructor @AllArgsConstructor -public class FishingLocationCheckerFactory extends VesselScopeFactory { +public class FishingLocationLegalityCheckerFactory + extends VesselScopeFactory { private Factory regulations; private Factory pathFinder; private Factory 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 index 643ea527f..2ee760dcf 100644 --- 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> fishingLocationChecker = - new FishingLocationCheckerFactory( + new FishingLocationLegalityCheckerFactory( new NeverPermittedFactory(), pathFinder, distance