Merge branch 'master' into pathElementToTransferCostCalculator

matsim-org · Jan 10, 2024 · a71e75e · a71e75e
2 parents 07919c4 + 3a989a4
commit a71e75e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/.../vsp/src/main/java/org/matsim/freight/carriers/analysis/RunFreightAnalysisEventBased.java b/.../vsp/src/main/java/org/matsim/freight/carriers/analysis/RunFreightAnalysisEventBased.java
@@ -81,7 +81,7 @@ public void runAnalysis() throws IOException {
 		//freight settings
 		FreightCarriersConfigGroup freightCarriersConfigGroup = ConfigUtils.addOrGetModule( config, FreightCarriersConfigGroup.class ) ;
 		freightCarriersConfigGroup.setCarriersFile( SIM_OUTPUT_PATH + "output_carriers.xml.gz");
-		freightCarriersConfigGroup.setCarriersVehicleTypesFile(SIM_OUTPUT_PATH + "output_allVehicles.xml.gz");
+		freightCarriersConfigGroup.setCarriersVehicleTypesFile(SIM_OUTPUT_PATH + "output_carriersVehicleTypes.xml.gz");
 
 		//Were to store the analysis output?
 		String analysisOutputDirectory = ANALYSIS_OUTPUT_PATH;

diff --git a/...reight/carriers/analysis/FreightAnalysisEventBasedTest/output_carriersVehicleTypes.xml.gz b/...reight/carriers/analysis/FreightAnalysisEventBasedTest/output_carriersVehicleTypes.xml.gz
diff --git a/pom.xml b/pom.xml
@@ -405,7 +405,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.2.3</version>
+                    <version>3.2.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>