From c6e1bf582e43ecb4df801fcd0cf4d74678f6e41c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20H=C3=B6rl?= <sebastian.horl@irt-systemx.fr>
Date: Sat, 7 Dec 2024 11:22:31 +0100
Subject: [PATCH] feat/fix(ev): minor changes (#3634)

* fix case where vehicle is still queued at end of day

* make all profiles optional

* fix code error
---
 .../ev/stats/ChargingProceduresCSVWriter.java |  8 ++-
 .../contrib/ev/stats/EvStatsModule.java       | 60 ++++++++++---------
 2 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/contribs/ev/src/main/java/org/matsim/contrib/ev/stats/ChargingProceduresCSVWriter.java b/contribs/ev/src/main/java/org/matsim/contrib/ev/stats/ChargingProceduresCSVWriter.java
index ae1c9d0c013..4cef65da81b 100644
--- a/contribs/ev/src/main/java/org/matsim/contrib/ev/stats/ChargingProceduresCSVWriter.java
+++ b/contribs/ev/src/main/java/org/matsim/contrib/ev/stats/ChargingProceduresCSVWriter.java
@@ -83,8 +83,12 @@ private void proccessChargingEventSequences(CSVPrinter csvPrinter, Collection<Ch
 
 			if (sequence.getQueuedAtCharger().isPresent()) {
 				waitStartTime = sequence.getQueuedAtCharger().get().getTime();
-				waitEndTime = sequence.getQuitQueueAtChargerEvent().isPresent() ?
-					sequence.getQuitQueueAtChargerEvent().get().getTime() : sequence.getChargingStart().get().getTime();
+
+				if (sequence.getQuitQueueAtChargerEvent().isPresent()) {
+					waitEndTime = sequence.getQuitQueueAtChargerEvent().get().getTime();
+				} else if (sequence.getChargingStart().isPresent()) {
+					waitEndTime = sequence.getChargingStart().get().getTime();
+				}
 			}
 
 			double startEnergy = Double.NaN;
diff --git a/contribs/ev/src/main/java/org/matsim/contrib/ev/stats/EvStatsModule.java b/contribs/ev/src/main/java/org/matsim/contrib/ev/stats/EvStatsModule.java
index ffb4190314e..a161e566961 100644
--- a/contribs/ev/src/main/java/org/matsim/contrib/ev/stats/EvStatsModule.java
+++ b/contribs/ev/src/main/java/org/matsim/contrib/ev/stats/EvStatsModule.java
@@ -20,9 +20,6 @@
 
 package org.matsim.contrib.ev.stats;
 
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.Singleton;
 import org.matsim.contrib.common.timeprofile.ProfileWriter;
 import org.matsim.contrib.ev.EvConfigGroup;
 import org.matsim.contrib.ev.EvModule;
@@ -32,6 +29,10 @@
 import org.matsim.core.controler.listener.ControlerListener;
 import org.matsim.core.mobsim.qsim.AbstractQSimModule;
 
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+
 /**
  * @author Michal Maciejewski (michalm)
  */
@@ -45,37 +46,42 @@ public void install() {
 		addEventHandlerBinding().to(ChargingEventSequenceCollector.class);
 		addControlerListenerBinding().to(ChargingProceduresCSVWriter.class).in(Singleton.class);
 
-		installQSimModule(new AbstractQSimModule() {
-			@Override
-			protected void configureQSim() {
-				if (evCfg.timeProfiles) {
-					addQSimComponentBinding(EvModule.EV_COMPONENT).toProvider(SocHistogramTimeProfileCollectorProvider.class);
-					addQSimComponentBinding(EvModule.EV_COMPONENT).toProvider(IndividualChargeTimeProfileCollectorProvider.class);
-					addQSimComponentBinding(EvModule.EV_COMPONENT).toProvider(ChargerOccupancyTimeProfileCollectorProvider.class);
-					addQSimComponentBinding(EvModule.EV_COMPONENT).to(ChargerOccupancyXYDataCollector.class).asEagerSingleton();
-					addQSimComponentBinding(EvModule.EV_COMPONENT).toProvider(VehicleTypeAggregatedChargeTimeProfileCollectorProvider.class);
+		if (evCfg.timeProfiles) {
+			installQSimModule(new AbstractQSimModule() {
+				@Override
+				protected void configureQSim() {
+					addQSimComponentBinding(EvModule.EV_COMPONENT)
+							.toProvider(SocHistogramTimeProfileCollectorProvider.class);
+					addQSimComponentBinding(EvModule.EV_COMPONENT)
+							.toProvider(IndividualChargeTimeProfileCollectorProvider.class);
+					addQSimComponentBinding(EvModule.EV_COMPONENT)
+							.toProvider(ChargerOccupancyTimeProfileCollectorProvider.class);
+					addQSimComponentBinding(EvModule.EV_COMPONENT).to(ChargerOccupancyXYDataCollector.class)
+							.asEagerSingleton();
+					addQSimComponentBinding(EvModule.EV_COMPONENT)
+							.toProvider(VehicleTypeAggregatedChargeTimeProfileCollectorProvider.class);
 
 					bind(EnergyConsumptionCollector.class).asEagerSingleton();
 					addMobsimScopeEventHandlerBinding().to(EnergyConsumptionCollector.class);
 					addQSimComponentBinding(EvModule.EV_COMPONENT).to(EnergyConsumptionCollector.class);
 					// add more time profiles if necessary
 				}
-			}
-		});
-		bind(ChargerPowerTimeProfileCalculator.class).asEagerSingleton();
-		addEventHandlerBinding().to(ChargerPowerTimeProfileCalculator.class);
-		addControlerListenerBinding().toProvider(new Provider<>() {
-			@Inject
-			private ChargerPowerTimeProfileCalculator calculator;
-			@Inject
-			private MatsimServices matsimServices;
+			});
+			bind(ChargerPowerTimeProfileCalculator.class).asEagerSingleton();
+			addEventHandlerBinding().to(ChargerPowerTimeProfileCalculator.class);
+			addControlerListenerBinding().toProvider(new Provider<>() {
+				@Inject
+				private ChargerPowerTimeProfileCalculator calculator;
+				@Inject
+				private MatsimServices matsimServices;
 
-			@Override
-			public ControlerListener get() {
-				var profileView = new ChargerPowerTimeProfileView(calculator);
-				return new ProfileWriter(matsimServices,"ev",profileView,"charger_power_time_profiles");
+				@Override
+				public ControlerListener get() {
+					var profileView = new ChargerPowerTimeProfileView(calculator);
+					return new ProfileWriter(matsimServices, "ev", profileView, "charger_power_time_profiles");
 
-			}
-		});
+				}
+			});
+		}
 	}
 }