fix EpoPathPlannerAbundanceScenario for merge

poseidon-fisheries · Dec 4, 2023 · 12ecf1b · 12ecf1b
2 parents e2c2a80 + 6008bbb
commit 12ecf1b
Showing 1 changed file with 7 additions and 94 deletions.
diff --git a/POSEIDON/src/main/java/uk/ac/ox/oxfish/model/scenario/EpoPathPlannerAbundanceScenario.java b/POSEIDON/src/main/java/uk/ac/ox/oxfish/model/scenario/EpoPathPlannerAbundanceScenario.java
@@ -22,13 +22,12 @@
 
 public class EpoPathPlannerAbundanceScenario extends EpoAbundanceScenario {
 
-    private AbundanceFiltersFactory abundanceFilters = new AbundanceFiltersFromFileFactory(getInputFolder().path(
-        "abundance",
-        "selectivity_2022.csv"
-    ));
+    private AbundanceFiltersFactory abundanceFilters =
+        new AbundanceFiltersFromFileFactory(
+            getInputFolder().path("abundance", "selectivity_2022.csv")
+        );
 
     public EpoPathPlannerAbundanceScenario() {
-<<<<<<< HEAD
         setFleet(
             new EpoPurseSeinerFleetFactory(
                 getTargetYear(),
@@ -37,45 +36,13 @@ public EpoPathPlannerAbundanceScenario() {
                     new SelectivityAbundanceFadInitializerFactory(
                         // see https://github.com/poseidon-fisheries/tuna-issues/issues/141#issuecomment-1545974455
                         // for Weibull parameter values, obtained by fitting the distributions to observer data
-<<<<<<< HEAD
-<<<<<<< HEAD
-                        new WeibullPerSpeciesCarryingCapacitiesFactory(
-                            ImmutableMap.of(
-                                "Bigeye tuna", new FixedDoubleParameter(0.8171673593681151),
-                                "Skipjack tuna", new FixedDoubleParameter(0.7853352630396406),
-                                "Yellowfin tuna", new FixedDoubleParameter(0.7433541177856742)
-                            ),
-                            ImmutableMap.of(
-                                "Bigeye tuna", new FixedDoubleParameter(6.963430732400244),
-                                "Skipjack tuna", new FixedDoubleParameter(17.604745764579597),
-                                "Yellowfin tuna", new FixedDoubleParameter(6.220187515020116)
-                            ),
-                            ImmutableMap.of(
-                                "Bigeye tuna", new FixedDoubleParameter(0.6160218635237851),
-                                "Skipjack tuna", new FixedDoubleParameter(0.07626612007857204),
-                                "Yellowfin tuna", new FixedDoubleParameter(0.19660090528653174)
-                            ),
-                            new CalibratedParameter(
-                                1, 2, 1, 5, 1
-                            )
-                        ),
-=======
-                                    new WeibullPerSpeciesCarryingCapacitiesFromFileFactory(getInputFolder().path("fad_carrying_capacity_parameters.csv"),
-                                            getTargetYear(),
-                                            new CalibratedParameter(
-                                            1, 1.5, 0, 2, 1
-                                            )
-                                    ),
->>>>>>> 2a620a462 (add Weibull...FromFile Factory and implement in EpoPathPlannerAbundanceScenario)
-=======
                         new WeibullPerSpeciesCarryingCapacitiesFromFileFactory(
                             getInputFolder().path("fad_carrying_capacity_parameters.csv"),
                             getTargetYear(),
                             new CalibratedParameter(
                                 1, 1.5, 0, 2, 1
                             )
                         ),
->>>>>>> 7bdb2e11c (Style changed classes)
                         getAbundanceFilters(),
                         ImmutableMap.of(
                             "Bigeye tuna", new CalibratedParameter(0.15, 0.3, 0, 1),
@@ -121,62 +88,10 @@ public EpoPathPlannerAbundanceScenario() {
                     ),
                     getInputFolder().path("action_weights.csv"),
                     getInputFolder().path("vessels.csv")
-=======
-        setFleet(new EpoPurseSeinerFleetFactory(getTargetYear(), getInputFolder(), new AbundancePurseSeineGearFactory(
-            new SelectivityAbundanceFadInitializerFactory(
-                // see https://github.com/poseidon-fisheries/tuna-issues/issues/141#issuecomment-1545974455
-                // for Weibull parameter values, obtained by fitting the distributions to observer data
-                new WeibullPerSpeciesCarryingCapacitiesFromFileFactory(
-                    getInputFolder().path(
-                        "fad_carrying_capacity_parameters.csv"),
-                    getTargetYear(),
-                    new CalibratedParameter(1, 1.5, 0, 2, 1)
-                ), getAbundanceFilters(), ImmutableMap.of(
-                "Bigeye tuna",
-                new CalibratedParameter(0.03, 0.25, 0, 1, 0.16),
-                "Skipjack tuna",
-                new CalibratedParameter(0.005, 0.25, 0, 1, 0.075),
-                "Yellowfin tuna",
-                new CalibratedParameter(0.008, 0.25, 0, 1, 0.02)
-            ), new EnvironmentalPenaltyFunctionFactory(ImmutableMap.of(
-                "Temperature",
-                new TemperatureMapFactory(
-                    getInputFolder().path("environmental_maps", "temperature_2021_to_2023.csv"),
-                    365 * 3
->>>>>>> 70bd6b010 (Remove custom line breaks)
                 ),
-                "FrontalIndex",
-                new FrontalIndexMapFactory(getInputFolder().path(
-                    "environmental_maps",
-                    "frontal_index_2021_to_2023.csv"
-                ), 365 * 3)
-            ))),
-            // ref: https://github.com/poseidon-fisheries/tuna-issues/issues/141#issuecomment-1549923263
-            // For fixed parameter values see:
-            // https://github.com/poseidon-fisheries/tuna-issues/issues/202#issue-1779551927
-            new UnreliableFishValueCalculatorFactory(new LogNormalErrorOperatorFactory(
-                new FixedDoubleParameter(-0.14452),
-                new FixedDoubleParameter(0.14097)
-            ))
-        ), new EPOPlannedStrategyFlexibleFactory(
-            getTargetYear(),
-            new LocationValuesFactory(
-                getInputFolder().path("location_values.csv"),
-                new CalibratedParameter(0, 0.1, 0, 1, 0.01),
-                new CalibratedParameter(0, 0.1, 0, 1, 0.01),
-                new CalibratedParameter(0, 0.1, 0, 1, 0.01),
-                new CalibratedParameter(0, 0.1, 0, 1, 0.01),
-                getTargetYear()
-            ),
-            new ValuePerSetPlanningModuleFactory(),
-            new AbundanceCatchSamplersFactory(
-                getAbundanceFilters(),
-                getInputFolder().path("set_samples.csv"),
-                getTargetYear()
-            ),
-            getInputFolder().path("action_weights.csv"),
-            getInputFolder().path("vessels.csv")
-        ), new DefaultToDestinationStrategyFishingStrategyFactory()));
+                new DefaultToDestinationStrategyFishingStrategyFactory()
+            )
+        );
     }
 
     @SuppressWarnings("WeakerAccess")
@@ -189,5 +104,3 @@ public void setAbundanceFilters(final AbundanceFiltersFactory abundanceFilters)
     }
 
 }
-
-