Merge pull request matsim-org#3441 from moia-oss/updatePrebookingRejections

update prebooking rejection handling

Author: nkuehnel

contribs/drt/src/main/java/org/matsim/contrib/drt/prebooking/PrebookingManager.java

@@ -9,10 +9,7 @@
 import org.matsim.api.core.v01.events.handler.PersonStuckEventHandler;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.api.core.v01.population.Activity;
-import org.matsim.api.core.v01.population.Leg;
-import org.matsim.api.core.v01.population.Person;
-import org.matsim.api.core.v01.population.Plan;
+import org.matsim.api.core.v01.population.*;
 import org.matsim.contrib.drt.passenger.AcceptedDrtRequest;
 import org.matsim.contrib.drt.prebooking.unscheduler.RequestUnscheduler;
 import org.matsim.contrib.dvrp.fleet.DvrpVehicle;
@@ -398,10 +395,9 @@ private void processRejections(double now) {
 				if(abortRejectedPrebookings) {
 					for (Id<Person> passengerId : item.request.getPassengerIds()) {
 						MobsimAgent agent = internalInterface.getMobsim().getAgents().get(passengerId);
-						((Activity) WithinDayAgentUtils.getCurrentPlanElement(agent)).setEndTime(Double.POSITIVE_INFINITY);
-						((Activity) WithinDayAgentUtils.getCurrentPlanElement(agent)).setMaximumDurationUndefined();
 						((HasModifiablePlan) agent).resetCaches();
-						internalInterface.getMobsim().rescheduleActivityEnd(agent);
+						agent.setStateToAbort(mobsimTimer.getTimeOfDay());
+						internalInterface.arrangeNextAgentState(agent);
 						eventsManager.processEvent(new PersonStuckEvent(now, agent.getId(), agent.getCurrentLinkId(),
 								this.mode));
 						internalInterface.getMobsim().getAgentCounter().incLost();