delete kept vehicle after loading from state. refs #9891

eclipse-sumo · May 17, 2024 · c246242 · c246242
1 parent 2f45435
commit c246242
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/microsim/MSStateHandler.cpp b/src/microsim/MSStateHandler.cpp
@@ -473,6 +473,10 @@ MSStateHandler::closeVehicle() {
                 MSRailSignalControl::getInstance().vehicleStateChanged(v, MSNet::VehicleState::NEWROUTE, "loadState");
             }
             vc.handleTriggeredDepart(v, false);
+            if (v->hasArrived()) {
+                // state was created with active option --keep-after-arrival
+                vc.deleteKeptVehicle(v);
+            }
         }
         while (!myDeviceAttrs.empty()) {
             const std::string attrID = myDeviceAttrs.back()->getString(SUMO_ATTR_ID);

diff --git a/src/microsim/MSVehicleControl.cpp b/src/microsim/MSVehicleControl.cpp
@@ -176,8 +176,7 @@ MSVehicleControl::removePending() {
         if (myKeepTime == 0) {
             deleteVehicle(veh);
         } else {
-            myEndedVehNo++;
-            MSNet::getInstance()->getEndOfTimestepEvents()->addEvent(new DeleteKeptVehicle(veh), SIMSTEP + myKeepTime);
+            deleteKeptVehicle(veh);
         }
     }
     vehs.clear();
@@ -191,6 +190,12 @@ MSVehicleControl::removePending() {
 }
 
 
+void
+MSVehicleControl::deleteKeptVehicle(SUMOVehicle* veh) {
+    myEndedVehNo++;
+    MSNet::getInstance()->getEndOfTimestepEvents()->addEvent(new DeleteKeptVehicle(veh), SIMSTEP + myKeepTime);
+}
+
 void
 MSVehicleControl::vehicleDeparted(const SUMOVehicle& v) {
     ++myRunningVehNo;

diff --git a/src/microsim/MSVehicleControl.h b/src/microsim/MSVehicleControl.h
@@ -142,6 +142,9 @@ class MSVehicleControl {
      */
     virtual void deleteVehicle(SUMOVehicle* v, bool discard = false, bool wasKept = false);
 
+    /** @brief when a vehicle is kept after arrival, schedule later deletion **/
+    void deleteKeptVehicle(SUMOVehicle* veh);
+
     void fixVehicleCounts() {
         myLoadedVehNo++;
         myEndedVehNo++;