Add test

matsim-org · Dec 27, 2023 · 718d27f · 718d27f
1 parent a1d8abf
commit 718d27f
Showing 1 changed file with 80 additions and 14 deletions.
diff --git a/...extensions/src/test/java/org/matsim/contrib/drt/extension/edrt/run/RunEDrtScenarioIT.java b/...extensions/src/test/java/org/matsim/contrib/drt/extension/edrt/run/RunEDrtScenarioIT.java
@@ -19,24 +19,44 @@
 package org.matsim.contrib.drt.extension.edrt.run;
 
 import java.net.URL;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.matsim.api.core.v01.Scenario;
+import org.matsim.api.core.v01.population.Plan;
+import org.matsim.api.core.v01.population.Population;
+import org.matsim.contrib.drt.extension.edrt.optimizer.EDrtVehicleDataEntryFactory;
 import org.matsim.contrib.drt.prebooking.PrebookingParams;
 import org.matsim.contrib.drt.prebooking.logic.ProbabilityBasedPrebookingLogic;
 import org.matsim.contrib.drt.run.DrtConfigGroup;
+import org.matsim.contrib.drt.run.DrtConfigs;
+import org.matsim.contrib.drt.run.DrtControlerCreator;
 import org.matsim.contrib.drt.run.MultiModeDrtConfigGroup;
-import org.matsim.contrib.dvrp.passenger.PassengerRequestRejectedEvent;
-import org.matsim.contrib.dvrp.passenger.PassengerRequestRejectedEventHandler;
-import org.matsim.contrib.dvrp.passenger.PassengerRequestScheduledEvent;
-import org.matsim.contrib.dvrp.passenger.PassengerRequestScheduledEventHandler;
+import org.matsim.contrib.dvrp.passenger.*;
+import org.matsim.contrib.dvrp.run.AbstractDvrpModeModule;
 import org.matsim.contrib.dvrp.run.DvrpConfigGroup;
+import org.matsim.contrib.dvrp.run.DvrpModule;
+import org.matsim.contrib.dvrp.run.DvrpQSimComponents;
 import org.matsim.contrib.ev.EvConfigGroup;
+import org.matsim.contrib.ev.EvModule;
+import org.matsim.contrib.ev.charging.*;
+import org.matsim.contrib.ev.discharging.IdleDischargingHandler;
+import org.matsim.contrib.ev.temperature.TemperatureService;
+import org.matsim.contrib.evrp.EvDvrpFleetQSimModule;
+import org.matsim.contrib.evrp.OperatingVehicleProvider;
+import org.matsim.contrib.otfvis.OTFVisLiveModule;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.controler.AbstractModule;
 import org.matsim.core.controler.Controler;
+import org.matsim.core.mobsim.qsim.AbstractQSimModule;
+import org.matsim.core.population.io.PopulationReader;
+import org.matsim.core.population.io.PopulationWriter;
+import org.matsim.core.router.TripStructureUtils;
+import org.matsim.core.scenario.ScenarioUtils;
 import org.matsim.core.utils.io.IOUtils;
 import org.matsim.examples.ExamplesUtils;
 import org.matsim.vis.otfvis.OTFVisConfigGroup;
@@ -51,36 +71,82 @@ void test() {
 		RunEDrtScenario.run(configUrl, false);
 	}
 
+	@Test
+	void testMultiModeDrtDeterminism() {
+		URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"), "mielec_multiModeEdrt_config.xml");
+
+		Config config = ConfigUtils.loadConfig(configUrl, new MultiModeDrtConfigGroup(), new DvrpConfigGroup(),
+			new OTFVisConfigGroup(), new EvConfigGroup());
+
+
+		Controler controller = RunEDrtScenario.createControler(config, false);
+		config.controller().setLastIteration(2);
+
+		PassengerPickUpTracker tracker = new PassengerPickUpTracker();
+		tracker.install(controller);
+
+		controller.run();
+
+		assertEquals(2011, tracker.passengerPickupEvents);
+	}
+
+
 	@Test
 	void testWithPrebooking() {
 		URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"), "mielec_edrt_config.xml");
-		
+
 		Config config = ConfigUtils.loadConfig(configUrl, new MultiModeDrtConfigGroup(), new DvrpConfigGroup(),
 				new OTFVisConfigGroup(), new EvConfigGroup());
-		
+
 		DrtConfigGroup drtConfig = DrtConfigGroup.getSingleModeDrtConfig(config);
 		drtConfig.addParameterSet(new PrebookingParams());
-		
+
 		Controler controller = RunEDrtScenario.createControler(config, false);
 		ProbabilityBasedPrebookingLogic.install(controller, drtConfig, 0.5, 4.0 * 3600.0);
-		
+
 		PrebookingTracker tracker = new PrebookingTracker();
 		tracker.install(controller);
-		
+
 		controller.run();
-		
+
 		assertEquals(74, tracker.immediateScheduled);
 		assertEquals(198, tracker.prebookedScheduled);
 		assertEquals(116, tracker.immediateRejected);
 		assertEquals(7, tracker.prebookedRejected);
 	}
-
+
+	static private class PassengerPickUpTracker implements PassengerPickedUpEventHandler {
+		int passengerPickupEvents = 0;
+
+		void install(Controler controller) {
+			PassengerPickUpTracker thisTracker = this;
+
+			controller.addOverridingModule(new AbstractModule() {
+				@Override
+				public void install() {
+					addEventHandlerBinding().toInstance(thisTracker);
+				}
+			});
+		}
+
+		@Override
+		public void handleEvent(PassengerPickedUpEvent event) {
+			passengerPickupEvents++;
+		}
+
+		@Override
+		public void reset(int iteration) {
+			passengerPickupEvents=0;
+		}
+
+	}
+
 	static private class PrebookingTracker implements PassengerRequestRejectedEventHandler, PassengerRequestScheduledEventHandler {
 		int immediateScheduled = 0;
 		int prebookedScheduled = 0;
 		int immediateRejected = 0;
 		int prebookedRejected = 0;
-		
+
 		@Override
 		public void handleEvent(PassengerRequestScheduledEvent event) {
 			if (event.getRequestId().toString().contains("prebooked")) {
@@ -98,10 +164,10 @@ public void handleEvent(PassengerRequestRejectedEvent event) {
 				immediateRejected++;
 			}
 		}
-		
+
 		void install(Controler controller) {
 			PrebookingTracker thisTracker = this;
-			
+
 			controller.addOverridingModule(new AbstractModule() {
 				@Override
 				public void install() {