diff --git a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/edrt/schedule/EDrtTaskFactoryImpl.java b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/edrt/schedule/EDrtTaskFactoryImpl.java index a2a8ac23f11..5de0eef560d 100644 --- a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/edrt/schedule/EDrtTaskFactoryImpl.java +++ b/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); - } } diff --git a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/edrt/schedule/EDrtWaitTask.java b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/edrt/schedule/EDrtWaitTask.java deleted file mode 100644 index 7ccaa480b69..00000000000 --- a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/edrt/schedule/EDrtWaitTask.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.matsim.contrib.drt.extension.edrt.schedule; - -import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.drt.schedule.DrtWaitTask; -import org.matsim.contrib.evrp.ETask; - -public class EDrtWaitTask extends DrtWaitTask implements ETask { - private final double consumedEnergy; - - public EDrtWaitTask(double beginTime, double endTime, Link link, double consumedEnergy) { - super(beginTime, endTime, link); - this.consumedEnergy = consumedEnergy; - } - - @Override - public double getTotalEnergy() { - return consumedEnergy; - } -} diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtModeAnalysisModule.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtModeAnalysisModule.java index f5bed824a3e..c4fb3074375 100644 --- a/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtModeAnalysisModule.java +++ b/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 passengerServingTaskTypes = ImmutableSet.of(DrtDriveTask.TYPE, DefaultDrtStopTask.TYPE, DrtWaitTask.TYPE); + private ImmutableSet passengerServingTaskTypes = ImmutableSet.of(DrtDriveTask.TYPE, DefaultDrtStopTask.TYPE, DrtStayTask.TYPE); private static final Comparator taskTypeComparator = Comparator.comparing(type -> { //we want the following order on the plot: STAY, RELOCATE, other diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactory.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactory.java index 4704fef026c..b7ee95be265 100644 --- a/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactory.java +++ b/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); } diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactoryImpl.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactoryImpl.java index 90aebfa3cdb..adb65f2d780 100644 --- a/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactoryImpl.java +++ b/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); - } } diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtWaitTask.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtWaitTask.java deleted file mode 100644 index 8f3775094ef..00000000000 --- a/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtWaitTask.java +++ /dev/null @@ -1,39 +0,0 @@ -/* *********************************************************************** * - * project: org.matsim.* - * * - * *********************************************************************** * - * * - * copyright : (C) 2013 by the members listed in the COPYING, * - * LICENSE and WARRANTY file. * - * email : info at matsim dot org * - * * - * *********************************************************************** * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * See also COPYING, LICENSE and WARRANTY file * - * * - * *********************************************************************** */ - -package org.matsim.contrib.drt.schedule; - -import static org.matsim.contrib.drt.schedule.DrtTaskBaseType.STAY; - -import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.dvrp.schedule.DefaultStayTask; - -/** - * Task that identifies a time period in which a vehicle idles before a stop, - * potentially with passengers on board. - * - * @author Sebastian Hörl (sebhoerl), IRT SystemX - */ -public class DrtWaitTask extends DefaultStayTask { - public static final DrtTaskType TYPE = new DrtTaskType("WAIT", STAY); - - public DrtWaitTask(double beginTime, double endTime, Link link) { - super(TYPE, beginTime, endTime, link); - } -} diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/scheduler/DefaultRequestInsertionScheduler.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/scheduler/DefaultRequestInsertionScheduler.java index 7431552e51e..32929a39984 100644 --- a/contribs/drt/src/main/java/org/matsim/contrib/drt/scheduler/DefaultRequestInsertionScheduler.java +++ b/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;