From d05baa27db7f66b0e8e52d9aba33e223b294ac28 Mon Sep 17 00:00:00 2001 From: Ricardo Ewert Date: Mon, 27 Jan 2025 13:25:15 +0100 Subject: [PATCH] change Path of default freight analysis --- .../main/java/org/matsim/freight/carriers/CarriersUtils.java | 2 +- .../matsim/freight/carriers/analysis/CarriersAnalysis.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contribs/freight/src/main/java/org/matsim/freight/carriers/CarriersUtils.java b/contribs/freight/src/main/java/org/matsim/freight/carriers/CarriersUtils.java index 5eb921b979d..bc1fdfad156 100644 --- a/contribs/freight/src/main/java/org/matsim/freight/carriers/CarriersUtils.java +++ b/contribs/freight/src/main/java/org/matsim/freight/carriers/CarriersUtils.java @@ -215,7 +215,7 @@ public static void runJsprit(Scenario scenario) throws ExecutionException, Inter */ public static void runJsprit(Scenario scenario, CarrierSelectionForSolution carriersSolutionType) throws ExecutionException, InterruptedException { - new CarriersAnalysis(getCarriers(scenario), scenario.getConfig().controller().getOutputDirectory() + "/CarriersAnalysis").runCarrierAnalysis( + new CarriersAnalysis(getCarriers(scenario), scenario.getConfig().controller().getOutputDirectory() + "/analysis/freight").runCarrierAnalysis( CarriersAnalysis.CarrierAnalysisType.carriersPlans_unPlanned); // necessary to create FreightCarriersConfigGroup before submitting to ThreadPoolExecutor ConfigUtils.addOrGetModule(scenario.getConfig(), FreightCarriersConfigGroup.class); diff --git a/contribs/freight/src/main/java/org/matsim/freight/carriers/analysis/CarriersAnalysis.java b/contribs/freight/src/main/java/org/matsim/freight/carriers/analysis/CarriersAnalysis.java index 4774e8fe3bb..5d1d8bb8e9e 100644 --- a/contribs/freight/src/main/java/org/matsim/freight/carriers/analysis/CarriersAnalysis.java +++ b/contribs/freight/src/main/java/org/matsim/freight/carriers/analysis/CarriersAnalysis.java @@ -87,7 +87,7 @@ public enum CarrierAnalysisType { * @param runId The CRS of the simulation */ public CarriersAnalysis(String simOutputPath, String runId) { - this(simOutputPath, Path.of(simOutputPath).resolve("CarriersAnalysis").toString(), runId, null); + this(simOutputPath, Path.of(simOutputPath).resolve("analysis").resolve("freight").toString(), runId, null); } /** @@ -97,7 +97,7 @@ public CarriersAnalysis(String simOutputPath, String runId) { * @param simOutputPath The output directory of the simulation run */ public CarriersAnalysis(String simOutputPath) { - this(simOutputPath, Path.of(simOutputPath).resolve("CarriersAnalysis").toString(), null, null); + this(simOutputPath, Path.of(simOutputPath).resolve("analysis").resolve("freight").toString(), null, null); } /**