Merge pull request #114 from moia-oss/update-matsim-02-09

Update matsim 02 09

Author: nkuehnel

.github/workflows/deploy-dtds.yaml

@@ -0,0 +1,24 @@
+name: deploy-dtds-on-website
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - matsim/src/main/resources/dtd
+
+jobs:
+  rsync-dtds:
+    name: sync DTDs to website
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: rsync dtds
+        uses: burnett01/[email protected]
+        with:
+          switches: -avz
+          path: matsim/src/main/resources/dtd/
+          remote_path: ~/httpdocs/files/dtd/
+          remote_host: ${{ secrets.WEBSITE_DEPLOY_HOST }}
+          remote_user: ${{ secrets.WEBSITE_DEPLOY_USER }}
+          remote_key: ${{ secrets.WEBSITE_SSH_PRIVATE_KEY }}

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();