-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
introducing the notion of Register and refactoring the epsilon-greedy behaviour
- Loading branch information
1 parent
b30acc5
commit 66d969c
Showing
20 changed files
with
581 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
...src/main/java/uk/ac/ox/poseidon/agents/behaviours/choices/BestOptionsRegisterFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * POSEIDON: an agent-based model of fisheries | ||
| * Copyright (c) 2024 CoHESyS Lab [email protected] | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| package uk.ac.ox.poseidon.agents.behaviours.choices; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.Setter; | ||
| import one.util.streamex.EntryStream; | ||
| import uk.ac.ox.poseidon.agents.registers.Register; | ||
| import uk.ac.ox.poseidon.agents.registers.TransformedRegister; | ||
| import uk.ac.ox.poseidon.core.Factory; | ||
| import uk.ac.ox.poseidon.core.Simulation; | ||
| import uk.ac.ox.poseidon.core.SimulationScopeFactory; | ||
|
|
||
| import java.util.Map.Entry; | ||
|
|
||
| @Getter | ||
| @Setter | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class BestOptionsRegisterFactory<O> | ||
| extends SimulationScopeFactory<Register<Entry<O, Double>>> { | ||
|
|
||
| Factory<? extends Register<? extends OptionValues<O>>> optionValuesRegister; | ||
|
|
||
| @Override | ||
| protected Register<Entry<O, Double>> newInstance(final Simulation simulation) { | ||
| return new TransformedRegister<>( | ||
| optionValuesRegister.get(simulation), | ||
| entryStream -> EntryStream | ||
| .of(entryStream) | ||
| .flatMapValues(optionValues -> optionValues.getBestEntries().stream()) | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
...ts/src/main/java/uk/ac/ox/poseidon/agents/behaviours/destination/ImitatingCellPicker.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * POSEIDON: an agent-based model of fisheries | ||
| * Copyright (c) 2024 CoHESyS Lab [email protected] | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| package uk.ac.ox.poseidon.agents.behaviours.destination; | ||
|
|
||
| import ec.util.MersenneTwisterFast; | ||
| import lombok.RequiredArgsConstructor; | ||
| import sim.util.Int2D; | ||
| import uk.ac.ox.poseidon.agents.behaviours.choices.OptionValues; | ||
| import uk.ac.ox.poseidon.agents.behaviours.choices.Picker; | ||
| import uk.ac.ox.poseidon.agents.registers.Register; | ||
| import uk.ac.ox.poseidon.agents.vessels.Vessel; | ||
| import uk.ac.ox.poseidon.geography.paths.GridPathFinder; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map.Entry; | ||
| import java.util.Optional; | ||
|
|
||
| import static java.lang.Double.NEGATIVE_INFINITY; | ||
| import static java.util.Map.Entry.comparingByValue; | ||
| import static java.util.stream.Collectors.mapping; | ||
| import static java.util.stream.Collectors.toList; | ||
| import static one.util.streamex.MoreCollectors.maxAll; | ||
| import static uk.ac.ox.poseidon.core.MasonUtils.upToOneOf; | ||
|
|
||
| /** | ||
| * This picker will look for better options than the current option in a list of candidates to | ||
| * imitate and pick one at random if any of them are accessible from the vessel's current location. | ||
| * <p> | ||
| * Note that it is possible for this explorer to return {@code null}, in the case where | ||
| * {@code currentOption} is {@code null} and all the other candidates are also {@code null} (which | ||
| * can happen at the start of a simulation) or inaccessible (which can happen if the vessel is | ||
| * isolated in a lake on a random map). This explorer should therefore never be used as the final | ||
| * option in a chain of explorers; it needs another one to fall back on. | ||
| */ | ||
| @RequiredArgsConstructor | ||
| public class ImitatingCellPicker implements Picker<Int2D> { | ||
|
|
||
| private final Vessel vessel; | ||
| private final OptionValues<Int2D> optionValues; | ||
| private final Register<Entry<Int2D, Double>> candidateRegister; | ||
| private final GridPathFinder pathFinder; | ||
| private final MersenneTwisterFast rng; | ||
|
|
||
| @Override | ||
| public Optional<Int2D> pick() { | ||
|
|
||
| final Optional<Entry<Int2D, Double>> currentBestEntry = | ||
| optionValues.getBestEntry(rng); | ||
|
|
||
| final double currentBestValue = | ||
| currentBestEntry.map(Entry::getValue).orElse(NEGATIVE_INFINITY); | ||
|
|
||
| final List<Int2D> candidates = candidateRegister | ||
| .getAllEntries() | ||
| .map(Entry::getValue) | ||
| .filter(entry -> entry.getValue() > currentBestValue) | ||
| .filter(entry -> pathFinder.isAccessible(vessel.getCurrentCell(), entry.getKey())) | ||
| .collect(maxAll(comparingByValue(), mapping(Entry::getKey, toList()))); | ||
|
|
||
| return upToOneOf(candidates, rng) | ||
| .or(() -> currentBestEntry.map(Entry::getKey)); | ||
|
|
||
| } | ||
| } |
60 changes: 60 additions & 0 deletions
60
...main/java/uk/ac/ox/poseidon/agents/behaviours/destination/ImitatingCellPickerFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * POSEIDON: an agent-based model of fisheries | ||
| * Copyright (c) 2024 CoHESyS Lab [email protected] | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| package uk.ac.ox.poseidon.agents.behaviours.destination; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.Setter; | ||
| import sim.util.Int2D; | ||
| import uk.ac.ox.poseidon.agents.behaviours.choices.OptionValues; | ||
| import uk.ac.ox.poseidon.agents.registers.Register; | ||
| import uk.ac.ox.poseidon.agents.vessels.Vessel; | ||
| import uk.ac.ox.poseidon.agents.vessels.VesselScopeFactory; | ||
| import uk.ac.ox.poseidon.core.Factory; | ||
| import uk.ac.ox.poseidon.core.Simulation; | ||
| import uk.ac.ox.poseidon.geography.paths.GridPathFinder; | ||
|
|
||
| import java.util.Map.Entry; | ||
|
|
||
| @Getter | ||
| @Setter | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class ImitatingCellPickerFactory extends VesselScopeFactory<ImitatingCellPicker> { | ||
|
|
||
| private VesselScopeFactory<? extends OptionValues<Int2D>> optionValues; | ||
| private Factory<? extends Register<Entry<Int2D, Double>>> candidateRegister; | ||
| private Factory<? extends GridPathFinder> pathFinder; | ||
|
|
||
| @Override | ||
| protected ImitatingCellPicker newInstance( | ||
| final Simulation simulation, | ||
| final Vessel vessel | ||
| ) { | ||
| return new ImitatingCellPicker( | ||
| vessel, | ||
| optionValues.get(simulation, vessel), | ||
| candidateRegister.get(simulation), | ||
| pathFinder.get(simulation), | ||
| simulation.random | ||
| ); | ||
| } | ||
| } |
Oops, something went wrong.