Add late diversion constraint for drt detours

contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/edrt/run/EDrtModeOptimizerQSimModule.java

@@ -132,7 +132,7 @@ public EmptyVehicleChargingScheduler get() {
 						getter.getModal(QSimScopeForkJoinPoolHolder.class).getPool()))).asEagerSingleton();
 
 		bindModal(InsertionCostCalculator.class).toProvider(modalProvider(
-				getter -> new DefaultInsertionCostCalculator(getter.getModal(CostCalculationStrategy.class))));
+				getter -> new DefaultInsertionCostCalculator(getter.getModal(CostCalculationStrategy.class), drtCfg)));
 
 		install(DrtModeOptimizerQSimModule.getInsertionSearchQSimModule(drtCfg));
 

contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/run/ShiftDrtModeOptimizerQSimModule.java

@@ -117,7 +117,7 @@ shiftsParams, new DefaultShiftStartLogic(), new DefaultAssignShiftToVehicleLogic
 
 		bindModal(InsertionCostCalculator.class).toProvider(modalProvider(
 				getter -> new ShiftInsertionCostCalculator(getter.get(MobsimTimer.class),
-						new DefaultInsertionCostCalculator(getter.getModal(CostCalculationStrategy.class)))));
+						new DefaultInsertionCostCalculator(getter.getModal(CostCalculationStrategy.class), drtCfg))));
 
 		bindModal(VehicleEntry.EntryFactory.class).toInstance(new ShiftVehicleDataEntryFactory(new VehicleDataEntryFactoryImpl(drtCfg)));
 

contribs/drt/src/main/java/org/matsim/contrib/drt/optimizer/DrtModeOptimizerQSimModule.java

@@ -100,7 +100,7 @@ protected void configureQSim() {
 						getter.getModal(QSimScopeForkJoinPoolHolder.class).getPool()))).asEagerSingleton();
 
 		bindModal(InsertionCostCalculator.class).toProvider(modalProvider(
-				getter -> new DefaultInsertionCostCalculator(getter.getModal(CostCalculationStrategy.class))));
+				getter -> new DefaultInsertionCostCalculator(getter.getModal(CostCalculationStrategy.class), drtCfg)));
 
 		install(getInsertionSearchQSimModule(drtCfg));
 

contribs/drt/src/main/java/org/matsim/contrib/drt/optimizer/insertion/DefaultInsertionCostCalculator.java

@@ -21,17 +21,22 @@
 
 import static org.matsim.contrib.drt.optimizer.insertion.InsertionGenerator.Insertion;
 
+import org.matsim.contrib.drt.optimizer.Waypoint;
 import org.matsim.contrib.drt.optimizer.insertion.InsertionDetourTimeCalculator.DetourTimeInfo;
 import org.matsim.contrib.drt.passenger.DrtRequest;
+import org.matsim.contrib.drt.run.DrtConfigGroup;
 
 /**
  * @author michalm
  */
 public class DefaultInsertionCostCalculator implements InsertionCostCalculator {
 	private final CostCalculationStrategy costCalculationStrategy;
+	private final DrtConfigGroup drtConfigGroup;
 
-	public DefaultInsertionCostCalculator(CostCalculationStrategy costCalculationStrategy) {
+	public DefaultInsertionCostCalculator(CostCalculationStrategy costCalculationStrategy,
+										  DrtConfigGroup drtConfigGroup) {
 		this.costCalculationStrategy = costCalculationStrategy;
+		this.drtConfigGroup = drtConfigGroup;
 	}
 
 	/**
@@ -55,6 +60,23 @@ public double calculate(DrtRequest drtRequest, Insertion insertion, DetourTimeIn
 			return INFEASIBLE_SOLUTION_COST;
 		}
 
+		// divert right now
+		if(insertion.pickup.index == 0) {
+			Waypoint nextWaypoint = insertion.pickup.nextWaypoint;
+			// there is an existing stop following the new insertion
+			if(nextWaypoint instanceof Waypoint.Stop && nextWaypoint != insertion.pickup.newWaypoint) {
+				// passengers are being dropped off == may be close to arrival
+				if(!((Waypoint.Stop) nextWaypoint).task.getDropoffRequests().isEmpty()) {
+					double nextArrival = nextWaypoint.getArrivalTime();
+					double departureTime = insertion.vehicleEntry.start.getDepartureTime();
+					//arrival is very soon
+					if (nextArrival - departureTime < drtConfigGroup.fixedApproachTime) {
+						return INFEASIBLE_SOLUTION_COST;
+					}
+				}
+			}
+		}
+
 		return costCalculationStrategy.calcCost(drtRequest, insertion, detourTimeInfo);
 	}
 }

contribs/drt/src/main/java/org/matsim/contrib/drt/run/DrtConfigGroup.java

@@ -184,6 +184,15 @@ public enum OperationalScheme {
 	@PositiveOrZero
 	public double advanceRequestPlanningHorizon = 0; // beta-feature; planning horizon for advance (prebooked) requests
 
+	@Parameter
+	@Comment(
+			"Time before reaching a planned dropoff from which it is not allowed to insert new detours for new requests. I.e.," +
+					" if set to 180, then a vehicle will not divert to pickup a new passenger once a boarded passenger is only " +
+					"3 minutes away from her destination, even though her time window would allow it." +
+					" Delayed detour just before arrival are usually perceived very negatively.")
+	@PositiveOrZero // used only for stopbased DRT scheme
+	public double fixedApproachTime = 0;// [m];
+
 	@NotNull
 	private DrtInsertionSearchParams drtInsertionSearchParams;
 

contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionCostCalculatorTest.java

@@ -30,6 +30,7 @@
 import org.matsim.contrib.drt.optimizer.VehicleEntry;
 import org.matsim.contrib.drt.optimizer.insertion.InsertionGenerator.Insertion;
 import org.matsim.contrib.drt.passenger.DrtRequest;
+import org.matsim.contrib.drt.run.DrtConfigGroup;
 import org.matsim.testcases.fakes.FakeLink;
 
 /**
@@ -64,7 +65,7 @@ public void testCalculate() {
 
 	private void assertCalculate(Insertion insertion, DetourTimeInfo detourTimeInfo, double expectedCost) {
 		var insertionCostCalculator = new DefaultInsertionCostCalculator(
-				new CostCalculationStrategy.RejectSoftConstraintViolations());
+				new CostCalculationStrategy.RejectSoftConstraintViolations(), new DrtConfigGroup());
 		var insertionWithDetourData = new InsertionWithDetourData(insertion, null, detourTimeInfo);
 		assertThat(insertionCostCalculator.calculate(drtRequest, insertionWithDetourData.insertion,
 				insertionWithDetourData.detourTimeInfo)).isEqualTo(expectedCost);