Move estimateWaitingTime(List<PlanElement> elements) to PTWaitingTime…

…Estimator interface
matsim-org · Mar 18, 2024 · b89ad74 · b89ad74
1 parent 95bdede
commit b89ad74
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/...ava/org/matsim/contribs/discrete_mode_choice/components/utils/PTWaitingTimeEstimator.java b/...ava/org/matsim/contribs/discrete_mode_choice/components/utils/PTWaitingTimeEstimator.java
@@ -1,5 +1,10 @@
 package org.matsim.contribs.discrete_mode_choice.components.utils;
 
+import java.util.List;
+
+import org.matsim.api.core.v01.TransportMode;
+import org.matsim.api.core.v01.population.Leg;
+import org.matsim.api.core.v01.population.PlanElement;
 import org.matsim.pt.routes.TransitPassengerRoute;
 
 /**
@@ -11,5 +16,19 @@
  * @author sebhoerl
  */
 public interface PTWaitingTimeEstimator {
+
 	double estimateWaitingTime(double departureTime, TransitPassengerRoute route);
+
+	default double estimateWaitingTime(List<? extends PlanElement> elements) {
+		double totalWaitingTime = 0.0;
+
+		for (PlanElement element : elements) {
+			if (element instanceof Leg leg && leg.getMode().equals(TransportMode.pt)) {
+				TransitPassengerRoute route = (TransitPassengerRoute) leg.getRoute();
+				totalWaitingTime += this.estimateWaitingTime(leg.getDepartureTime().seconds(), route);
+			}
+		}
+
+		return totalWaitingTime;
+	}
 }
diff --git a/...g/matsim/contribs/discrete_mode_choice/components/utils/ScheduleWaitingTimeEstimator.java b/...g/matsim/contribs/discrete_mode_choice/components/utils/ScheduleWaitingTimeEstimator.java
@@ -8,8 +8,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.Id;
-import org.matsim.api.core.v01.population.Leg;
-import org.matsim.api.core.v01.population.PlanElement;
 import org.matsim.core.utils.collections.Tuple;
 import org.matsim.core.utils.misc.OptionalTime;
 import org.matsim.core.utils.misc.Time;
@@ -54,23 +52,6 @@ private Tuple<Id<TransitLine>, Id<TransitRoute>> createId(TransitLine transitLin
 		return new Tuple<>(transitLine.getId(), transitRoute.getId());
 	}
 
-	public double estimateWaitingTime(List<? extends PlanElement> elements) {
-		double totalWaitingTime = 0.0;
-
-		for (PlanElement element : elements) {
-			if (element instanceof Leg) {
-				Leg leg = (Leg) element;
-
-				if (leg.getMode().equals("pt")) {
-					TransitPassengerRoute route = (TransitPassengerRoute) leg.getRoute();
-					totalWaitingTime += estimateWaitingTime(leg.getDepartureTime().seconds(), route);
-				}
-			}
-		}
-
-		return totalWaitingTime;
-	}
-
 	@Override
 	public double estimateWaitingTime(double agentDepartureTime, TransitPassengerRoute route) {
 		TransitLine transitLine = transitSchedule.getTransitLines().get(route.getLineId());