22 * POSEIDON, an agent-based model of fisheries
33 * 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 */
1816
1917package uk .ac .ox .poseidon .epo .scenarios ;
3533import uk .ac .ox .oxfish .geography .pathfinding .AStarFallbackPathfinder ;
3634import uk .ac .ox .oxfish .model .FishState ;
3735import uk .ac .ox .oxfish .model .Startable ;
38- import uk .ac .ox .oxfish .model .data .distributions .EmpiricalCatchSizeDistributionsFromFile ;
39- import uk .ac .ox .oxfish .model .data .distributions .GroupedYearlyDistributions ;
4036import uk .ac .ox .oxfish .model .scenario .ScenarioEssentials ;
4137import uk .ac .ox .oxfish .model .scenario .ScenarioPopulation ;
4238import uk .ac .ox .oxfish .model .scenario .TestableScenario ;
@@ -94,8 +90,6 @@ public abstract class EpoScenario<B extends LocalBiology>
9490 0.5
9591 );
9692 private AlgorithmFactory <ScenarioPopulation > fleet = new EmptyFleet ();
97- private AlgorithmFactory <GroupedYearlyDistributions > empiricalCatchSizeDistributions =
98- new EmpiricalCatchSizeDistributionsFromFile (getInputFolder ().path ("catch_size_distributions.csv" ));
9993
10094 public static int dayOfYear (
10195 final int year ,
@@ -113,14 +107,6 @@ public void setMapExtentFactory(final MapExtentFactory mapExtentFactory) {
113107 this .mapExtentFactory = mapExtentFactory ;
114108 }
115109
116- public AlgorithmFactory <GroupedYearlyDistributions > getEmpiricalCatchSizeDistributions () {
117- return empiricalCatchSizeDistributions ;
118- }
119-
120- public void setEmpiricalCatchSizeDistributions (final AlgorithmFactory <GroupedYearlyDistributions > empiricalCatchSizeDistributions ) {
121- this .empiricalCatchSizeDistributions = empiricalCatchSizeDistributions ;
122- }
123-
124110 public ComponentFactory <? extends Regulations > getRegulations () {
125111 return regulations ;
126112 }
0 commit comments