phase out DrtWaitTask

contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/edrt/schedule/EDrtTaskFactoryImpl.java

@@ -21,13 +21,12 @@
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.contrib.drt.schedule.DrtTaskFactory;
 import org.matsim.contrib.drt.schedule.DrtTaskType;
-import org.matsim.contrib.drt.schedule.DrtWaitTask;
 import org.matsim.contrib.dvrp.fleet.DvrpVehicle;
 import org.matsim.contrib.dvrp.path.VrpPathWithTravelData;
-import org.matsim.contrib.evrp.EvDvrpVehicle;
-import org.matsim.contrib.evrp.VrpPathEnergyConsumptions;
 import org.matsim.contrib.ev.fleet.ElectricVehicle;
 import org.matsim.contrib.ev.infrastructure.Charger;
+import org.matsim.contrib.evrp.EvDvrpVehicle;
+import org.matsim.contrib.evrp.VrpPathEnergyConsumptions;
 
 /**
  * @author michalm
@@ -58,12 +57,4 @@ public EDrtChargingTask createChargingTask(DvrpVehicle vehicle, double beginTime
 		return new EDrtChargingTask(beginTime, endTime, charger, ((EvDvrpVehicle)vehicle).getElectricVehicle(),
 				totalEnergy);
 	}
-
-	@Override
-	public DrtWaitTask createWaitTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link) {
-		ElectricVehicle ev = ((EvDvrpVehicle)vehicle).getElectricVehicle();
-		double auxEnergy = ev.getAuxEnergyConsumption()
-				.calcEnergyConsumption(beginTime, endTime - beginTime, link.getId());
-		return new EDrtWaitTask(beginTime, endTime, link, auxEnergy);
-	}
 }

contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtModeAnalysisModule.java

@@ -33,7 +33,6 @@
 import org.matsim.contrib.drt.schedule.DefaultDrtStopTask;
 import org.matsim.contrib.drt.schedule.DrtDriveTask;
 import org.matsim.contrib.drt.schedule.DrtStayTask;
-import org.matsim.contrib.drt.schedule.DrtWaitTask;
 import org.matsim.contrib.drt.scheduler.EmptyVehicleRelocator;
 import org.matsim.contrib.dvrp.analysis.ExecutedScheduleCollector;
 import org.matsim.contrib.dvrp.fleet.FleetSpecification;
@@ -56,7 +55,7 @@
  */
 public class DrtModeAnalysisModule extends AbstractDvrpModeModule {
 	private final DrtConfigGroup drtCfg;
-	private ImmutableSet<Task.TaskType> passengerServingTaskTypes = ImmutableSet.of(DrtDriveTask.TYPE, DefaultDrtStopTask.TYPE, DrtWaitTask.TYPE);
+	private ImmutableSet<Task.TaskType> passengerServingTaskTypes = ImmutableSet.of(DrtDriveTask.TYPE, DefaultDrtStopTask.TYPE, DrtStayTask.TYPE);
 
 	private static final Comparator<Task.TaskType> taskTypeComparator = Comparator.comparing(type -> {
 		//we want the following order on the plot: STAY, RELOCATE, other

contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactory.java

@@ -31,6 +31,4 @@ public interface DrtTaskFactory {
 	DrtStopTask createStopTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link);
 
 	DrtStayTask createStayTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link);
-
-	DrtWaitTask createWaitTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link);
 }

contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactoryImpl.java

@@ -40,9 +40,4 @@ public DrtStopTask createStopTask(DvrpVehicle vehicle, double beginTime, double
 	public DrtStayTask createStayTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link) {
 		return new DrtStayTask(beginTime, endTime, link);
 	}
-
-	@Override
-	public DrtWaitTask createWaitTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link) {
-		return new DrtWaitTask(beginTime, endTime, link);
-	}
 }

contribs/drt/src/main/java/org/matsim/contrib/drt/scheduler/DefaultRequestInsertionScheduler.java

@@ -34,7 +34,6 @@
 import org.matsim.contrib.drt.schedule.DrtStopTask;
 import org.matsim.contrib.drt.schedule.DrtTaskBaseType;
 import org.matsim.contrib.drt.schedule.DrtTaskFactory;
-import org.matsim.contrib.drt.schedule.DrtWaitTask;
 import org.matsim.contrib.drt.stops.StopTimeCalculator;
 import org.matsim.contrib.dvrp.fleet.DvrpVehicle;
 import org.matsim.contrib.dvrp.fleet.Fleet;
@@ -442,7 +441,7 @@ private void removeBetween(Schedule schedule, Task startTask, Task endTask) {
 
 			if (DrtTaskBaseType.DRIVE.isBaseTypeOf(task.getTaskType())) {
 				driveCount++;
-			} else if (DrtWaitTask.TYPE.equals(task.getTaskType())) {
+			} else if (DrtStayTask.TYPE.equals(task.getTaskType())) {
 				waitCount++;
 			} else {
 				throw new IllegalStateException("Invalid schedule structure: expected WAIT or DRIVE task");
@@ -468,7 +467,7 @@ private Task insertWait(DvrpVehicle vehicle, Task departureTask, double earliest
 		}
 
 		if (departureTask.getEndTime() < earliestNextStartTime) {
-			DrtWaitTask waitTask = taskFactory.createWaitTask(vehicle, departureTask.getEndTime(),
+			DrtStayTask waitTask = taskFactory.createStayTask(vehicle, departureTask.getEndTime(),
 					earliestNextStartTime, waitLink);
 			schedule.addTask(departureTask.getTaskIdx() + 1, waitTask);
 			return waitTask;
@@ -487,7 +486,7 @@ private Task insertDriveWithWait(DvrpVehicle vehicle, Task departureTask, VrpPat
 
 			if (driveDepartureTime > departureTask.getEndTime()) {
 				// makes sense to insert a wait task before departure
-				DrtWaitTask waitTask = taskFactory.createWaitTask(vehicle, departureTask.getEndTime(),
+				DrtStayTask waitTask = taskFactory.createStayTask(vehicle, departureTask.getEndTime(),
 						driveDepartureTime, path.getFromLink());
 				schedule.addTask(departureTask.getTaskIdx() + 1, waitTask);
 
@@ -500,7 +499,7 @@ private Task insertDriveWithWait(DvrpVehicle vehicle, Task departureTask, VrpPat
 		schedule.addTask(leadingTask.getTaskIdx() + 1, driveTask);
 
 		if (driveTask.getEndTime() < latestArrivalTime) {
-			DrtWaitTask waitTask = taskFactory.createWaitTask(vehicle, driveTask.getEndTime(), latestArrivalTime,
+			DrtStayTask waitTask = taskFactory.createStayTask(vehicle, driveTask.getEndTime(), latestArrivalTime,
 					path.getToLink());
 			schedule.addTask(driveTask.getTaskIdx() + 1, waitTask);
 			return waitTask;