refactoring refs #12

eclipse-sumo · Apr 15, 2024 · c1f228d · c1f228d
1 parent c25abe8
commit c1f228d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/microsim/MSVehicle.cpp b/src/microsim/MSVehicle.cpp
@@ -6026,10 +6026,7 @@ MSVehicle::updateBestLanes(bool forceRebuild, const MSLane* startLane) {
                     for (const LaneQ& m : nextLanes) {
                         if ((m.lane->allowsVehicleClass(getVClass()) || m.lane->hadPermissionChanges())
                                 && m.lane->isApproachedFrom(cE, j.lane)) {
-                            if (bestConnectedNext == nullptr || ((bestConnectedNext->length < m.length
-                                                                  || (bestConnectedNext->length == m.length && abs(bestConnectedNext->bestLaneOffset) > abs(m.bestLaneOffset))
-                                                                  || (bestConnectedNext->lane->getBidiLane() != nullptr && m.lane->getBidiLane() == nullptr))
-                                                                 && (m.lane->getBidiLane() == nullptr || bestConnectedNext->lane->getBidiLane() != nullptr))) {
+                            if (betterContinuation(bestConnectedNext, m)) {
                                 bestConnectedNext = &m;
                             }
                         }
@@ -6173,6 +6170,23 @@ MSVehicle::updateBestLanes(bool forceRebuild, const MSLane* startLane) {
 }
 
 
+bool
+MSVehicle::betterContinuation(const LaneQ* bestConnectedNext, const LaneQ& m) {
+    if (bestConnectedNext == nullptr) {
+        return true;
+    } else if (m.lane->getBidiLane() != nullptr && bestConnectedNext->lane->getBidiLane() == nullptr) {
+        return false;
+    } else if (bestConnectedNext->lane->getBidiLane() != nullptr && m.lane->getBidiLane() == nullptr) {
+        return true;
+    } else if (bestConnectedNext->length < m.length) {
+        return true;
+    } else if (bestConnectedNext->length == m.length && abs(bestConnectedNext->bestLaneOffset) > abs(m.bestLaneOffset)) {
+        return true;
+    }
+    return false;
+}
+
+
 int
 MSVehicle::nextLinkPriority(const std::vector<MSLane*>& conts) {
     if (conts.size() < 2) {

diff --git a/src/microsim/MSVehicle.h b/src/microsim/MSVehicle.h
@@ -2131,6 +2131,9 @@ class MSVehicle : public MSBaseVehicle {
     /// @brief remove vehicle from further lanes (on leaving the network)
     void cleanupFurtherLanes();
 
+    /// @brief comparison between different continuations from the same lane
+    static bool betterContinuation(const LaneQ* bestConnectedNext, const LaneQ& m);
+
 private:
     /// @brief The per vehicle variables of the car following model
     MSCFModel::VehicleVariables* myCFVariables;