fix #17644

Author: namdre

src/microsim/devices/MSDevice_Taxi.cpp

@@ -619,6 +619,23 @@ MSDevice_Taxi::cancelCustomer(const MSTransportable* t) {
 }
 
 
+void
+MSDevice_Taxi::addCustomer(const MSTransportable* t, const Reservation* res) {
+    myCustomers.insert(t);
+    int stopIndex = 0;
+    MSBaseVehicle& veh = dynamic_cast<MSBaseVehicle&>(myHolder);
+    for (const Reservation* res2 : myCurrentReservations) {
+        if (res == res2) {
+            SUMOVehicleParameter::Stop& stop = const_cast<SUMOVehicleParameter::Stop&>(veh.getStop(stopIndex).pars);
+            stop.awaitedPersons.insert(t->getID());
+            stop.permitted.insert(t->getID());
+            break;
+        }
+        stopIndex++;
+    }
+}
+
+
 void
 MSDevice_Taxi::prepareStop(ConstMSEdgeVector& edges,
                            StopParVector& stops,
@@ -891,6 +908,12 @@ MSDevice_Taxi::checkTaskSwap() {
             bestSwap->myCurrentReservations.clear();
             bestSwap->myCustomers.clear();
             bestSwap->myState = EMPTY;
+            while (bestSwap->getHolder().hasStops()) {
+                bestSwap->getHolder().abortNextStop();
+            }
+            for (const Reservation* res : myCurrentReservations) {
+                myDispatcher->swappedRunning(res, this);
+            }
         }
     }
 }

src/microsim/devices/MSDevice_Taxi.h

@@ -178,6 +178,9 @@ class MSDevice_Taxi : public MSVehicleDevice {
     /// @brief remove person from reservations
     bool cancelCustomer(const MSTransportable* t);
 
+    /// @brief add person after extending reservation
+    void addCustomer(const MSTransportable* t, const Reservation* res);
+
     /// @brief whether the given person is allowed to board this taxi
     bool allowsBoarding(const MSTransportable* t) const;
 

src/microsim/devices/MSDispatch.cpp

@@ -22,6 +22,7 @@
 #include <limits>
 #include <microsim/MSNet.h>
 #include <microsim/MSEdge.h>
+#include <microsim/MSGlobals.h>
 #include <microsim/transportables/MSTransportable.h>
 #include "MSRoutingEngine.h"
 #include "MSDispatch.h"
@@ -36,11 +37,6 @@
 // Reservation methods
 // ===========================================================================
 
-std::string
-Reservation::getID() const {
-    return toString(persons);
-}
-
 // ===========================================================================
 // MSDispatch methods
 // ===========================================================================
@@ -87,6 +83,28 @@ MSDispatch::addReservation(MSTransportable* person,
         // the default empty group implies, no grouping is wanted (and
         // transportable ids are unique)
         group = person->getID();
+    } else {
+        auto it2 = myRunningReservations.find(group);
+        if (it2 != myRunningReservations.end()) {
+            for (auto item : it2->second) {
+                Reservation* res = const_cast<Reservation*>(item.first);
+                if (res->persons.count(person) == 0
+                        && res->from == from
+                        && res->to == to
+                        && res->fromPos == fromPos
+                        && res->toPos == toPos) {
+                    MSDevice_Taxi* taxi = item.second;
+                    if (taxi->getState() == taxi->PICKUP
+                            && remainingCapacity(taxi, res) > 0
+                            && taxi->compatibleLine(taxi->getHolder().getParameter().line, line)) {
+                        //std::cout << SIMTIME << " addPerson=" << person->getID() << " extendRes=" << toString(res->persons) << " taxi=" << taxi->getHolder().getID() << " state=" << taxi->getState() << "\n";
+                        res->persons.insert(person);
+                        taxi->addCustomer(person, res);
+                        return res;
+                    }
+                }
+            }
+        }
     }
     Reservation* result = nullptr;
     bool added = false;
@@ -294,6 +312,12 @@ MSDispatch::servedReservation(const Reservation* res, MSDevice_Taxi* taxi) {
 }
 
 
+void
+MSDispatch::swappedRunning(const Reservation* res, MSDevice_Taxi* taxi) {
+    myRunningReservations[res->group][res] = taxi;
+}
+
+
 void
 MSDispatch::fulfilledReservation(const Reservation* res) {
     myRunningReservations[res->group].erase(res);

src/microsim/devices/MSDispatch.h

@@ -101,8 +101,10 @@ struct Reservation {
                && line == other.line;
     }
 
-    /// @brief debug identification
-    std::string getID() const;
+    /// @brief for sorting by id
+    std::string getID() const {
+        return id;
+    }
 };
 
 /**
@@ -195,14 +197,16 @@ class MSDispatch : public Parameterised {
     /// @brief whether the last call to computeDispatch has left servable reservations
     bool myHasServableReservations = false;
 
+    void swappedRunning(const Reservation* res, MSDevice_Taxi* taxi);
+
 protected:
     void servedReservation(const Reservation* res, MSDevice_Taxi* taxi);
 
     /// @brief whether the given taxi has sufficient capacity to serve the reservation
     int remainingCapacity(const MSDevice_Taxi* taxi, const Reservation* res);
 
     // reservations that are currently being served (could still be used during re-dispatch)
-    std::map<std::string, std::map<const Reservation*, MSDevice_Taxi*> > myRunningReservations;
+    std::map<std::string, std::map<const Reservation*, MSDevice_Taxi*, ComparatorIdLess> > myRunningReservations;
 
     /// @brief optional file output for dispatch information
     OutputDevice* myOutput;

src/microsim/devices/MSDispatch_RouteExtension.cpp

@@ -132,12 +132,16 @@ MSDispatch_RouteExtension::dispatch(MSDevice_Taxi* taxi, std::vector<Reservation
     if (sequence.size() > 2) {
         taxi->dispatchShared(sequence);
         if (myOutput != nullptr) {
+            std::vector<const MSTransportable*> sharing;
+            for (const Reservation* s : sequence) {
+                sharing.insert(sharing.end(), s->persons.begin(), s->persons.end());
+            }
             myOutput->writeXMLHeader("DispatchInfo_RouteExtension", "");
             myOutput->openTag("dispatchShared");
             myOutput->writeAttr("time", time2string(now));
             myOutput->writeAttr("id", taxi->getHolder().getID());
             myOutput->writeAttr("persons", toString(res->persons));
-            myOutput->writeAttr("sharingPersons", toString(sequence));
+            myOutput->writeAttr("sharingPersons", toString(sharing));
             myOutput->writeAttr("type", "routeExtension");
             myOutput->closeTag();
         }