Skip to content

Commit c2264d1

Browse files
nicolaspayettenicolaspayette
committed
update parameter bounds
1 parent 6268950 commit c2264d1

File tree

5 files changed

+48
-41
lines changed

5 files changed

+48
-41
lines changed

‎POSEIDON/src/main/java/uk/ac/ox/oxfish/fisher/purseseiner/planner/EPOPlannedStrategyFlexibleFactory.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* POSEIDON, an agent-based model of fisheries
3+
* Copyright (C) 2024 CoHESyS Lab [email protected]
4+
*
5+
* This program is free software: you can redistribute it and/or modify it under the terms of the
6+
* GNU General Public License as published by the Free Software Foundation, either version 3
7+
* of the License, or (at your option) any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
10+
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
11+
* See the GNU General Public License for more details.
12+
*
13+
* You should have received a copy of the GNU General Public License along with this program.
14+
* If not, see <http://www.gnu.org/licenses/>.
15+
*/
116
package uk.ac.ox.oxfish.fisher.purseseiner.planner;
217

318
import ec.util.MersenneTwisterFast;
@@ -76,7 +91,7 @@ public class EPOPlannedStrategyFlexibleFactory implements AlgorithmFactory<Plann
7691
* a multiplier applied to the action weight of DPL
7792
*/
7893
private DoubleParameter deploymentBias =
79-
new CalibratedParameter(0.25, 0.95, 0.0, 0.9999);
94+
new CalibratedParameter(0.25, 0.75, 0.0, 0.9999);
8095
private DoubleParameter noaBias =
8196
new CalibratedParameter(0.25, 0.75, 0.0, 0.9999);
8297
private DoubleParameter delBias =

‎epo/epo_inputs

‎epo/src/main/java/uk/ac/ox/poseidon/epo/fleet/AbundancePurseSeineGearFactory.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
/*
22
* POSEIDON, an agent-based model of fisheries
3-
* Copyright (C) 2024 CoHESyS Lab [email protected]
3+
* Copyright (c) 2024 CoHESyS Lab [email protected]
44
*
5-
* This program is free software: you can redistribute it and/or modify
6-
* it under the terms of the GNU General Public License as published by
7-
* the Free Software Foundation, either version 3 of the License, or
8-
* (at your option) any later version.
5+
* This program is free software: you can redistribute it and/or modify it under the terms of the
6+
* GNU General Public License as published by the Free Software Foundation, either version 3
7+
* of the License, or (at your option) any later version.
98
*
10-
* This program is distributed in the hope that it will be useful,
11-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
* GNU General Public License for more details.
9+
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
10+
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
11+
* See the GNU General Public License for more details.
1412
*
15-
* You should have received a copy of the GNU General Public License
16-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
13+
* You should have received a copy of the GNU General Public License along with this program.
14+
* If not, see <http://www.gnu.org/licenses/>.
1715
*/
18-
1916
package uk.ac.ox.poseidon.epo.fleet;
2017

2118
import uk.ac.ox.oxfish.fisher.purseseiner.equipment.AbundancePurseSeineGear;

‎epo/src/main/java/uk/ac/ox/poseidon/epo/scenarios/EpoPathPlannerAbundanceScenario.java

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
/*
22
* POSEIDON, an agent-based model of fisheries
3-
* Copyright (C) 2024 CoHESyS Lab [email protected]
3+
* Copyright (c) 2024 CoHESyS Lab [email protected]
44
*
5-
* This program is free software: you can redistribute it and/or modify
6-
* it under the terms of the GNU General Public License as published by
7-
* the Free Software Foundation, either version 3 of the License, or
8-
* (at your option) any later version.
5+
* This program is free software: you can redistribute it and/or modify it under the terms of the
6+
* GNU General Public License as published by the Free Software Foundation, either version 3
7+
* of the License, or (at your option) any later version.
98
*
10-
* This program is distributed in the hope that it will be useful,
11-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
* GNU General Public License for more details.
9+
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
10+
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
11+
* See the GNU General Public License for more details.
1412
*
15-
* You should have received a copy of the GNU General Public License
16-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
13+
* You should have received a copy of the GNU General Public License along with this program.
14+
* If not, see <http://www.gnu.org/licenses/>.
1715
*/
18-
1916
package uk.ac.ox.poseidon.epo.scenarios;
2017

2118
import com.google.common.collect.ImmutableMap;
@@ -70,8 +67,8 @@ public EpoPathPlannerAbundanceScenario() {
7067
),
7168
ImmutableMap.of(
7269
"Bigeye tuna", new CalibratedParameter(0.5, 0.9, 0, 1),
73-
"Skipjack tuna", new CalibratedParameter(0, 0.3, 0, 1),
74-
"Yellowfin tuna", new CalibratedParameter(0, 0.3, 0, 1)
70+
"Skipjack tuna", new CalibratedParameter(0, 0.5, 0, 1),
71+
"Yellowfin tuna", new CalibratedParameter(0, 0.5, 0, 1)
7572
),
7673
ImmutableMap.of(
7774
"Bigeye tuna", new CalibratedParameter(0.5, 0.75, 0, 0.85),
@@ -86,7 +83,7 @@ public EpoPathPlannerAbundanceScenario() {
8683
),
8784
new CalibratedParameter(26, 27, 25, 30, 26.5), // target
8885
new CalibratedParameter(4, 6, 2, 8, 2.25), // margin
89-
new CalibratedParameter(.25, .75, 0, 1) // penalty
86+
new CalibratedParameter(.25, .6, 0, 0.8) // penalty
9087
),
9188
"FrontalIndex", new EnvironmentalPenaltyFactory(
9289
new GridsByDateFromFileFactory(

‎epo/src/test/java/uk/ac/ox/poseidon/epo/calibration/CalibrationGeneratorTest.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/*
22
* POSEIDON, an agent-based model of fisheries
3-
* Copyright (C) 2024 CoHESyS Lab [email protected]
3+
* Copyright (c) 2024-2024 CoHESyS Lab [email protected]
44
*
5-
* This program is free software: you can redistribute it and/or modify
6-
* it under the terms of the GNU General Public License as published by
7-
* the Free Software Foundation, either version 3 of the License, or
8-
* (at your option) any later version.
5+
* This program is free software: you can redistribute it and/or modify it under the terms of the
6+
* GNU General Public License as published by the Free Software Foundation, either version 3
7+
* of the License, or (at your option) any later version.
98
*
10-
* This program is distributed in the hope that it will be useful,
11-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
* GNU General Public License for more details.
9+
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
10+
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
11+
* See the GNU General Public License for more details.
1412
*
15-
* You should have received a copy of the GNU General Public License
16-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
13+
* You should have received a copy of the GNU General Public License along with this program.
14+
* If not, see <http://www.gnu.org/licenses/>.
1715
*/
1816

1917
package uk.ac.ox.poseidon.epo.calibration;
@@ -33,7 +31,7 @@ public void testGenerateCalibration() {
3331
new CalibrationGenerator().generateCalibration(
3432
new EpoPathPlannerAbundanceScenario(),
3533
calibrationFolder,
36-
calibrationFolder.resolve("all_calibration_targets.csv"),
34+
calibrationFolder.resolve("priority_calibration_targets.csv"),
3735
new EpoPathPlannerAbundanceScenario().getTargetYear().getValue(),
3836
1,
3937
2

0 commit comments

Comments
 (0)