only request necessary data in policy runs

poseidon-fisheries · Dec 7, 2023 · 5ce4170 · 5ce4170
1 parent bf7d5ea
commit 5ce4170
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/epo/src/main/java/uk/ac/ox/poseidon/epo/PolicyRuns.java b/epo/src/main/java/uk/ac/ox/poseidon/epo/PolicyRuns.java
@@ -6,7 +6,6 @@
 import uk.ac.ox.oxfish.experiments.tuna.Runner;
 import uk.ac.ox.oxfish.maximization.YearlyResultsRowProvider;
 import uk.ac.ox.oxfish.model.data.monitors.loggers.PurseSeineActionsLogger;
-import uk.ac.ox.oxfish.model.data.monitors.loggers.PurseSeineTripLogger;
 import uk.ac.ox.oxfish.model.scenario.EpoPathPlannerAbundanceScenario;
 import uk.ac.ox.oxfish.model.scenario.EpoScenario;
 
@@ -90,13 +89,10 @@ public static void main(final String[] args) {
                         .setPolicies(entry.getValue())
                         .setParallel(true)
                         .setWriteScenarioToFile(true)
-                        .registerRowProvider("spatial_closures.csv", RectangularAreaExtractor::new)
-                        .registerRowProvider("yearly_results.csv", YearlyResultsRowProvider::new)
-                        .requestFisherYearlyData();
+                        .registerRowProvider("yearly_results.csv", YearlyResultsRowProvider::new);
                 if (!policyName.equals("fad_limits_fine")) {
                     runner
-                        .requestFisherDailyData()
-                        .registerRowProvider("sim_trip_events.csv", PurseSeineTripLogger::new)
+                        .registerRowProvider("spatial_closures.csv", RectangularAreaExtractor::new)
                         .registerRowProvider("sim_action_events.csv", PurseSeineActionsLogger::new);
                 }
                 runner.run(3, numberOfRunsPerPolicy);