Merge pull request #3084 from steffenaxer/DriveDischargingHandlerFix

Fix DriveDischargingHandler
matsim-org · Jan 31, 2024 · 70b6748 · 70b6748
2 parents 56e60eb + a54776d
commit 70b6748
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
diff --git a/contribs/ev/src/main/java/org/matsim/contrib/ev/discharging/DriveDischargingHandler.java b/contribs/ev/src/main/java/org/matsim/contrib/ev/discharging/DriveDischargingHandler.java
@@ -41,6 +41,7 @@
 import org.matsim.core.api.experimental.events.EventsManager;
 import org.matsim.core.events.MobsimScopeEventHandler;
 import org.matsim.core.mobsim.qsim.InternalInterface;
+import org.matsim.core.mobsim.qsim.QSim;
 import org.matsim.core.mobsim.qsim.interfaces.MobsimEngine;
 import org.matsim.vehicles.Vehicle;
 
@@ -77,9 +78,10 @@ private boolean isOnFirstLink() {
 
 	private final Queue<LinkLeaveEvent> linkLeaveEvents = new ConcurrentLinkedQueue<>();
 	private final Queue<VehicleLeavesTrafficEvent> trafficLeaveEvents = new ConcurrentLinkedQueue<>();
-
+	private final QSim qsim;
 	@Inject
-	DriveDischargingHandler(ElectricFleet data, Network network, EventsManager eventsManager) {
+	DriveDischargingHandler(QSim qsim, ElectricFleet data, Network network, EventsManager eventsManager) {
+		this.qsim = qsim;
 		this.network = network;
 		this.eventsManager = eventsManager;
 		eVehicles = data.getElectricVehicles();
@@ -116,7 +118,7 @@ public void onPrepareSim() {
 	@Override
 	public void afterSim() {
 		// process remaining events
-		doSimStep(Double.POSITIVE_INFINITY);
+		doSimStep(this.qsim.getSimTimer().getTimeOfDay());
 	}
 
 	@Override

diff --git a/...ev/test/input/org/matsim/contrib/ev/example/RunEvExampleTest/runTest/output_events.xml.gz b/...ev/test/input/org/matsim/contrib/ev/example/RunEvExampleTest/runTest/output_events.xml.gz
diff --git a/...b/ev/example/RunEvExampleTest/runTestWithChargingDurationEnforcement/output_events.xml.gz b/...b/ev/example/RunEvExampleTest/runTestWithChargingDurationEnforcement/output_events.xml.gz
diff --git a/...m/contrib/ev/example/RunEvExampleWithLTHConsumptionModelTest/runTest/output_events.xml.gz b/...m/contrib/ev/example/RunEvExampleWithLTHConsumptionModelTest/runTest/output_events.xml.gz
diff --git a/contribs/vsp/src/test/java/playground/vsp/ev/UrbanEVIT.java b/contribs/vsp/src/test/java/playground/vsp/ev/UrbanEVIT.java
@@ -8,13 +8,9 @@
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.events.EventsUtils;
 import org.matsim.core.population.PopulationUtils;
-import org.matsim.core.utils.io.IOUtils;
-import org.matsim.examples.ExamplesUtils;
 import org.matsim.testcases.MatsimTestUtils;
 import org.matsim.utils.eventsfilecomparison.EventsFileComparator;
 
-import java.net.URL;
-
 public class UrbanEVIT {
 	@RegisterExtension private MatsimTestUtils utils = new MatsimTestUtils();
 

diff --git a/contribs/vsp/test/input/playground/vsp/ev/UrbanEVIT/run/output_events.xml.gz b/contribs/vsp/test/input/playground/vsp/ev/UrbanEVIT/run/output_events.xml.gz