From 010e4a1778e8eec9e165f405be3c36112e36a784 Mon Sep 17 00:00:00 2001
From: Ricardo Ewert <ewert@vsp.tu-berlin.de>
Date: Wed, 10 Jan 2024 15:18:17 +0100
Subject: [PATCH 1/2] use carrierVehicleTypes instead of allVehicles for
 analysis

---
 .../analysis/RunFreightAnalysisEventBased.java    |   2 +-
 .../output_carriersVehicleTypes.xml.gz            | Bin 0 -> 487 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/output_carriersVehicleTypes.xml.gz

diff --git a/contribs/vsp/src/main/java/org/matsim/freight/carriers/analysis/RunFreightAnalysisEventBased.java b/contribs/vsp/src/main/java/org/matsim/freight/carriers/analysis/RunFreightAnalysisEventBased.java
index 1a60ed8b6a3..86249801bd0 100644
--- a/contribs/vsp/src/main/java/org/matsim/freight/carriers/analysis/RunFreightAnalysisEventBased.java
+++ b/contribs/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/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/output_carriersVehicleTypes.xml.gz b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/output_carriersVehicleTypes.xml.gz
new file mode 100644
index 0000000000000000000000000000000000000000..d584a182d65d6f887508d8b8b2fd886b8e5605f2
GIT binary patch
literal 487
zcmV<D0T})tiwFpn>X&5%0B?14aCLNFV_|Y~X=QSAR%K{uV{Bzqd2nTOE_iKh0F{%$
zPUA2ThR^U6mhW`}TSQeg<v@#6iAt+&SG%{BaVE*^CU(|#llJWyo0d{Q0#3>N9)F(s
z$DZ75o0@fC9U7hS3z2dLTA3Vmnem_NyTORxOwZ3J9aN}lm_dOWJtaFvJGIMr<$XI&
zlD_XnBfY~$7+WR<*5H!d=lm&eymfez+kcCBmuY&D{9fL#R0WM3pmttr1)Nd-*hTT)
zC>c)t@F@1ddh)i3Ki#EB#n$DVnmjvnx!$$FFwc06W#!}2*+j`!D)c+%fY=!)r$Vj4
zsUOBP3;ms3BxGFaA?#e}brh~dx`!kO$}~hZ=+alL0S`9g*W!vNQSUK7$Z;lnSs6#j
z!q_JI!3x|$eoLaGqi1rL@zF30Q0=AV6JRK==Y!!<UV$<?r!qyFjyRDCExot+u<_t1
zJ`tFf4P^Xu^Fpt{b{OWQYU!xOzp|5}mbw%(vw5h2Pa}SkJcB+3{w2|qp<l&@_}D;*
zUwIY9mXPE)*js7m|2No48i04KRq)bg4Zb(_-_qp3j{l)lY4<5bZTfjpph9{qyF018
dv8;%nXA%|h;yQ&l^v?a8J_0oc0lI+$008F_^vM7K

literal 0
HcmV?d00001


From 93637d15455039287589e6f20c94875291a17bbe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jan 2024 14:41:49 +0000
Subject: [PATCH 2/2] build(deps): bump
 org.apache.maven.plugins:maven-failsafe-plugin

Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.2.3 to 3.2.5.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.3...surefire-3.2.5)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6d7a6134da7..67e816b0e13 100644
--- 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>