addendum refs #14789

eclipse-sumo · Apr 29, 2024 · 78e5481 · 78e5481
1 parent cd6ffbb
commit 78e5481
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/libsumo/Vehicle.cpp b/src/libsumo/Vehicle.cpp
@@ -1437,8 +1437,11 @@ Vehicle::changeTarget(const std::string& vehID, const std::string& edgeID) {
     }
     // change the final edge of the route and reroute
     try {
-        veh->reroute(MSNet::getInstance()->getCurrentTimeStep(), "traci:changeTarget",
+        const bool success = veh->reroute(MSNet::getInstance()->getCurrentTimeStep(), "traci:changeTarget",
                      veh->getRouterTT(), onInit, false, false, destEdge);
+        if (!success) {
+            throw TraCIException("ChangeTarget failed for vehicle '" + veh->getID() + "', destination edge '" + edgeID + "' unreachable.");
+        }
     } catch (ProcessError& e) {
         throw TraCIException(e.what());
     }

diff --git a/src/microsim/MSBaseVehicle.cpp b/src/microsim/MSBaseVehicle.cpp
@@ -256,7 +256,7 @@ MSBaseVehicle::stopsAtEdge(const MSEdge* edge) const {
 }
 
 
-void
+bool
 MSBaseVehicle::reroute(SUMOTime t, const std::string& info, SUMOAbstractRouter<MSEdge, SUMOVehicle>& router, const bool onInit, const bool withTaz, const bool silent, const MSEdge* sink) {
     // check whether to reroute
     const MSEdge* source = withTaz && onInit ? MSEdge::dictionary(myParameter->fromTaz + "-source") : *getRerouteOrigin();
@@ -371,7 +371,7 @@ MSBaseVehicle::reroute(SUMOTime t, const std::string& info, SUMOAbstractRouter<M
 
     // router.setHint(myCurrEdge, myRoute->end(), this, t);
     if (edges.empty() && silent) {
-        return;
+        return false;
     }
     if (!edges.empty() && edges.front()->isTazConnector()) {
         edges.erase(edges.begin());
@@ -396,12 +396,13 @@ MSBaseVehicle::reroute(SUMOTime t, const std::string& info, SUMOAbstractRouter<M
             } else if (source->isTazConnector()) {
                 WRITE_WARNINGF(TL("Removing vehicle '%' which has no valid route."), getID());
                 MSNet::getInstance()->getInsertionControl().descheduleDeparture(this);
-                return;
+                return false;
             }
         }
         setDepartAndArrivalEdge();
         calculateArrivalParams(onInit);
     }
+    return !edges.empty();
 }
 
 

diff --git a/src/microsim/MSBaseVehicle.h b/src/microsim/MSBaseVehicle.h
@@ -304,7 +304,7 @@ class MSBaseVehicle : public SUMOVehicle {
      * @param[in] sink (optionally) a new destination edge
      * @see replaceRoute
      */
-    void reroute(SUMOTime t, const std::string& info, SUMOAbstractRouter<MSEdge, SUMOVehicle>& router, const bool onInit = false, const bool withTaz = false, const bool silent = false, const MSEdge* sink = nullptr);
+    bool reroute(SUMOTime t, const std::string& info, SUMOAbstractRouter<MSEdge, SUMOVehicle>& router, const bool onInit = false, const bool withTaz = false, const bool silent = false, const MSEdge* sink = nullptr);
 
 
     /** @brief Replaces the current route by the given edges

diff --git a/src/utils/vehicle/SUMOVehicle.h b/src/utils/vehicle/SUMOVehicle.h
@@ -120,9 +120,10 @@ class SUMOVehicle : public SUMOTrafficObject {
      *
      * @param[in] t The time for which the route is computed
      * @param[in] router The router to use
+     * @return whether a valid route was found
      * @see replaceRoute
      */
-    virtual void reroute(SUMOTime t, const std::string& info, SUMOAbstractRouter<MSEdge, SUMOVehicle>& router, const bool onInit = false, const bool withTaz = false, const bool silent = false, const MSEdge* sink = nullptr) = 0;
+    virtual bool reroute(SUMOTime t, const std::string& info, SUMOAbstractRouter<MSEdge, SUMOVehicle>& router, const bool onInit = false, const bool withTaz = false, const bool silent = false, const MSEdge* sink = nullptr) = 0;
 
     /** @brief Validates the current or given route
      * @param[out] msg Description why the route is not valid (if it is the case)