change Path of default freight analysis

matsim-org · Jan 27, 2025 · d05baa2 · d05baa2
1 parent b4f1bdd
commit d05baa2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -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
@@ -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);
 	}
 
 	/**