add TaxiTaskBaseType enum; make TaxiTaskType extendable

matsim-vsp · Jul 7, 2020 · 545e978 · 545e978
1 parent 7eacd75
commit 545e978
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/src/main/java/org/matsim/pfav/privateAV/FreightTourDispatchAnalyzer.java b/src/main/java/org/matsim/pfav/privateAV/FreightTourDispatchAnalyzer.java
@@ -40,7 +40,7 @@
 import org.matsim.contrib.dvrp.router.DvrpGlobalRoutingNetworkProvider;
 import org.matsim.contrib.dvrp.run.QSimScopeObjectListener;
 import org.matsim.contrib.dvrp.schedule.Task;
-import org.matsim.contrib.taxi.schedule.TaxiTaskType;
+import org.matsim.contrib.taxi.schedule.TaxiTaskBaseType;
 import org.matsim.contrib.util.CSVLineBuilder;
 import org.matsim.contrib.util.CompactCSVWriter;
 import org.matsim.core.controler.events.IterationEndsEvent;
@@ -104,9 +104,9 @@ public void handleEvent(LinkEnterEvent event) {
             data.addToActualTourLength(link.getLength());
 
             Task t = (fleet.getVehicles().get(event.getVehicleId())).getSchedule().getCurrentTask();
-            if (t.getTaskType().equals(TaxiTaskType.EMPTY_DRIVE)) {
-                data.addToActualEmptyMeters(link.getLength());
-            }
+			if (TaxiTaskBaseType.EMPTY_DRIVE.isBaseTypeOf(t)) {
+				data.addToActualEmptyMeters(link.getLength());
+			}
         }
     }
 

diff --git a/src/main/java/org/matsim/pfav/privateAV/PFAVActionCreator.java b/src/main/java/org/matsim/pfav/privateAV/PFAVActionCreator.java
@@ -35,7 +35,7 @@
 import org.matsim.contrib.taxi.schedule.TaxiDropoffTask;
 import org.matsim.contrib.taxi.schedule.TaxiPickupTask;
 import org.matsim.contrib.taxi.schedule.TaxiStayTask;
-import org.matsim.contrib.taxi.schedule.TaxiTaskType;
+import org.matsim.contrib.taxi.schedule.TaxiTaskBaseType;
 import org.matsim.core.mobsim.framework.MobsimTimer;
 
 /**
@@ -72,7 +72,7 @@ private PFAVActionCreator(PassengerEngine passengerEngine, VrpLegFactory legFact
 	@Override
 	public DynAction createAction(DynAgent dynAgent, DvrpVehicle vehicle, double now) {
 		Task task = vehicle.getSchedule().getCurrentTask();
-		switch ((TaxiTaskType)task.getTaskType()) {
+		switch (TaxiTaskBaseType.getBaseType(task)) {
 			case EMPTY_DRIVE:
 			case OCCUPIED_DRIVE:
 				return legFactory.create(vehicle);

diff --git a/src/main/java/org/matsim/pfav/privateAV/PFAVRetoolTask.java b/src/main/java/org/matsim/pfav/privateAV/PFAVRetoolTask.java
@@ -22,7 +22,7 @@
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.contrib.dvrp.fleet.DvrpVehicle;
 import org.matsim.contrib.dvrp.schedule.StayTask;
-import org.matsim.contrib.taxi.schedule.TaxiTaskType;
+import org.matsim.contrib.taxi.schedule.TaxiDropoffTask;
 
 /**
  * @author tschlenther
@@ -44,7 +44,7 @@ class PFAVRetoolTask extends StayTask {
 		 * but pickup task type is somehow used for TaxiStatsCalculator in correspondence with a request (which we do not have here, so we use dropoff type.
 		 * furthermore, if it was of type stay, the task could be removed by the taxischeduler if there is delay in the schedule
 		 */
-		super(TaxiTaskType.DROPOFF, beginTime, endTime, link);
+		super(TaxiDropoffTask.TYPE, beginTime, endTime, link);
 	}
 
 	/**

diff --git a/src/main/java/org/matsim/pfav/privateAV/PFAVScheduler.java b/src/main/java/org/matsim/pfav/privateAV/PFAVScheduler.java
@@ -32,14 +32,12 @@
 import org.matsim.contrib.taxi.schedule.TaxiOccupiedDriveTask;
 import org.matsim.contrib.taxi.schedule.TaxiPickupTask;
 import org.matsim.contrib.taxi.schedule.TaxiStayTask;
-import org.matsim.contrib.taxi.schedule.TaxiTaskType;
+import org.matsim.contrib.taxi.schedule.TaxiTaskBaseType;
 import org.matsim.contrib.taxi.scheduler.TaxiScheduleInquiry;
 import org.matsim.contrib.taxi.scheduler.TaxiScheduler;
 import org.matsim.core.api.experimental.events.EventsManager;
 import org.matsim.core.mobsim.framework.MobsimTimer;
-import org.matsim.core.router.FastAStarEuclideanFactory;
 import org.matsim.core.router.util.LeastCostPathCalculator;
-import org.matsim.core.router.util.TravelDisutility;
 import org.matsim.core.router.util.TravelTime;
 
 import com.google.inject.name.Named;
@@ -89,7 +87,7 @@ void updateBeforeNextTask(DvrpVehicle vehicle) {
 		updateTimeline(vehicle);
 		Task currentTask = schedule.getCurrentTask();
 
-		switch ((TaxiTaskType)currentTask.getTaskType()) {
+		switch (TaxiTaskBaseType.getBaseType(currentTask)) {
 			case PICKUP:
 				if (!taxiCfg.isDestinationKnown()) {
 					appendResultingTasksAfterPickup(vehicle);
@@ -370,7 +368,7 @@ void scheduleRequest(DvrpVehicle vehicle, TaxiRequest request) {
 		Schedule schedule = vehicle.getSchedule();
 		Task lastTask = Schedules.getLastTask(schedule);
 
-		if (lastTask.getTaskType() != TaxiTaskType.STAY) {
+		if (!TaxiTaskBaseType.STAY.isBaseTypeOf(lastTask)) {
 			throw new IllegalStateException();
 		} else {
 
@@ -514,7 +512,7 @@ private void updateTimelineImpl(DvrpVehicle vehicle, double newEndTime) {
 	private final static double REMOVE_STAY_TASK = Double.NEGATIVE_INFINITY;
 
 	private double calcNewEndTime(DvrpVehicle vehicle, Task task, double newBeginTime) {
-		switch ((TaxiTaskType)task.getTaskType()) {
+		switch (TaxiTaskBaseType.getBaseType(task)) {
 			case STAY: {
 				if (Schedules.getLastTask(vehicle.getSchedule()).equals(task)) {// last task
 					// even if endTime=beginTime, do not remove this task!!! A taxi schedule should end with WAIT

diff --git a/src/main/java/org/matsim/pfav/privateAV/PFAVServiceDriveTask.java b/src/main/java/org/matsim/pfav/privateAV/PFAVServiceDriveTask.java
@@ -20,14 +20,14 @@
 
 import org.matsim.contrib.dvrp.path.VrpPathWithTravelData;
 import org.matsim.contrib.dvrp.schedule.DriveTask;
-import org.matsim.contrib.taxi.schedule.TaxiTaskType;
+import org.matsim.contrib.taxi.schedule.TaxiOccupiedDriveTask;
 
 /**
  * @author tschlenther
  *
  */
 class PFAVServiceDriveTask extends DriveTask {
     PFAVServiceDriveTask(VrpPathWithTravelData path) {
-		super(TaxiTaskType.OCCUPIED_DRIVE, path);
+		super(TaxiOccupiedDriveTask.TYPE, path);
 	}
 }
diff --git a/src/main/java/org/matsim/pfav/privateAV/PFAVServiceTask.java b/src/main/java/org/matsim/pfav/privateAV/PFAVServiceTask.java
@@ -21,7 +21,7 @@
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.contrib.dvrp.schedule.StayTask;
 import org.matsim.contrib.freight.carrier.CarrierService;
-import org.matsim.contrib.taxi.schedule.TaxiTaskType;
+import org.matsim.contrib.taxi.schedule.TaxiDropoffTask;
 
 /**
  * @author tschlenther
@@ -37,7 +37,7 @@ class PFAVServiceTask extends StayTask {
 	 * @param link
 	 */
     PFAVServiceTask(double beginTime, double endTime, Link link, CarrierService service) {
-		super(TaxiTaskType.DROPOFF, beginTime, endTime, link);
+		super(TaxiDropoffTask.TYPE, beginTime, endTime, link);
 		this.service = service;
 	}