-
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.
- Loading branch information
1 parent
6268950
commit c2264d1
Showing
5 changed files
with
48 additions
and
41 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,18 @@ | ||
| /* | ||
| * 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.oxfish.fisher.purseseiner.planner; | ||
|
|
||
| import ec.util.MersenneTwisterFast; | ||
|
|
@@ -76,7 +91,7 @@ public class EPOPlannedStrategyFlexibleFactory implements AlgorithmFactory<Plann | |
| * a multiplier applied to the action weight of DPL | ||
| */ | ||
| private DoubleParameter deploymentBias = | ||
| new CalibratedParameter(0.25, 0.95, 0.0, 0.9999); | ||
| new CalibratedParameter(0.25, 0.75, 0.0, 0.9999); | ||
| private DoubleParameter noaBias = | ||
| new CalibratedParameter(0.25, 0.75, 0.0, 0.9999); | ||
| private DoubleParameter delBias = | ||
|
|
||
Submodule epo_inputs
updated
from 5b25ae to a16fa1
21 changes: 9 additions & 12 deletions
21
epo/src/main/java/uk/ac/ox/poseidon/epo/fleet/AbundancePurseSeineGearFactory.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 |
|---|---|---|
| @@ -1,21 +1,18 @@ | ||
| /* | ||
| * POSEIDON, an agent-based model of fisheries | ||
| * Copyright (C) 2024 CoHESyS Lab [email protected] | ||
| * 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 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. | ||
| * 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/>. | ||
| * 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.epo.fleet; | ||
|
|
||
| import uk.ac.ox.oxfish.fisher.purseseiner.equipment.AbundancePurseSeineGear; | ||
|
|
||
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 |
|---|---|---|
| @@ -1,21 +1,18 @@ | ||
| /* | ||
| * POSEIDON, an agent-based model of fisheries | ||
| * Copyright (C) 2024 CoHESyS Lab [email protected] | ||
| * 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 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. | ||
| * 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/>. | ||
| * 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.epo.scenarios; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
|
|
@@ -70,8 +67,8 @@ public EpoPathPlannerAbundanceScenario() { | |
| ), | ||
| ImmutableMap.of( | ||
| "Bigeye tuna", new CalibratedParameter(0.5, 0.9, 0, 1), | ||
| "Skipjack tuna", new CalibratedParameter(0, 0.3, 0, 1), | ||
| "Yellowfin tuna", new CalibratedParameter(0, 0.3, 0, 1) | ||
| "Skipjack tuna", new CalibratedParameter(0, 0.5, 0, 1), | ||
| "Yellowfin tuna", new CalibratedParameter(0, 0.5, 0, 1) | ||
| ), | ||
| ImmutableMap.of( | ||
| "Bigeye tuna", new CalibratedParameter(0.5, 0.75, 0, 0.85), | ||
|
|
@@ -86,7 +83,7 @@ public EpoPathPlannerAbundanceScenario() { | |
| ), | ||
| new CalibratedParameter(26, 27, 25, 30, 26.5), // target | ||
| new CalibratedParameter(4, 6, 2, 8, 2.25), // margin | ||
| new CalibratedParameter(.25, .75, 0, 1) // penalty | ||
| new CalibratedParameter(.25, .6, 0, 0.8) // penalty | ||
| ), | ||
| "FrontalIndex", new EnvironmentalPenaltyFactory( | ||
| new GridsByDateFromFileFactory( | ||
|
|
||
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 |
|---|---|---|
| @@ -1,19 +1,17 @@ | ||
| /* | ||
| * POSEIDON, an agent-based model of fisheries | ||
| * Copyright (C) 2024 CoHESyS Lab [email protected] | ||
| * Copyright (c) 2024-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 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. | ||
| * 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/>. | ||
| * 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.epo.calibration; | ||
|
|
@@ -33,7 +31,7 @@ public void testGenerateCalibration() { | |
| new CalibrationGenerator().generateCalibration( | ||
| new EpoPathPlannerAbundanceScenario(), | ||
| calibrationFolder, | ||
| calibrationFolder.resolve("all_calibration_targets.csv"), | ||
| calibrationFolder.resolve("priority_calibration_targets.csv"), | ||
| new EpoPathPlannerAbundanceScenario().getTargetYear().getValue(), | ||
| 1, | ||
| 2 | ||
|
|
||