Merge pull request #3064 from moia-oss/fixSharingMetricsTracker

FIx: ensure proper reset in sharing metrics tracker
matsim-org · Jan 22, 2024 · bb27768 · bb27768
2 parents 6c3b3cf + b1a10f1
commit bb27768
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/sharingmetrics/SharingMetricsTracker.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/sharingmetrics/SharingMetricsTracker.java
@@ -21,7 +21,7 @@
 /**
  * @author nkuehnel / MOIA
  */
-public class SharingMetricsTracker implements DrtRequestSubmittedEventHandler, PassengerPickedUpEventHandler, PassengerDroppedOffEventHandler, MobsimBeforeCleanupListener {
+public class SharingMetricsTracker implements DrtRequestSubmittedEventHandler, PassengerPickedUpEventHandler, PassengerDroppedOffEventHandler {
 
 	private final static Logger logger = LogManager.getLogger(SharingMetricsTracker.class);
 
@@ -122,7 +122,7 @@ public void handleEvent(PassengerPickedUpEvent event) {
 	}
 
 	@Override
-	public void notifyMobsimBeforeCleanup(MobsimBeforeCleanupEvent e) {
+	public void reset(int iteration) {
 		occupancyByVehicle.clear();
 		segments.clear();
 		poolingRate.clear();

diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/sharingmetrics/SharingFactorTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/sharingmetrics/SharingFactorTest.java
@@ -53,7 +53,7 @@ public void testDrtSharingFactorHandler() {
 		}
 
 		//clean up
-		sharingFactorTracker.notifyMobsimBeforeCleanup(null);
+		sharingFactorTracker.reset(0);
 
 		{
 			//two trips exactly after each other, no pooling
@@ -82,7 +82,7 @@ public void testDrtSharingFactorHandler() {
 		}
 
 		//clean up
-		sharingFactorTracker.notifyMobsimBeforeCleanup(null);
+		sharingFactorTracker.reset(0);
 
 		{
 			//two trips overlap half of the time
@@ -112,7 +112,7 @@ public void testDrtSharingFactorHandler() {
 
 
 		//clean up
-		sharingFactorTracker.notifyMobsimBeforeCleanup(null);
+		sharingFactorTracker.reset(0);
 
 		{
 			// second trip (sharing factor = 2) happens completely within first trip (sharing factor = 1.2)
@@ -142,7 +142,7 @@ public void testDrtSharingFactorHandler() {
 		}
 
 		//clean up
-		sharingFactorTracker.notifyMobsimBeforeCleanup(null);
+		sharingFactorTracker.reset(0);
 
 		{
 			// two persons share exact same trip but not part of a group
@@ -174,7 +174,7 @@ public void testDrtSharingFactorHandler() {
 
 
 		//clean up
-		sharingFactorTracker.notifyMobsimBeforeCleanup(null);
+		sharingFactorTracker.reset(0);
 
 		{
 			// two persons part of a group -> not pooled