fix #4566

eclipse-sumo · Sep 11, 2018 · c9e8a15 · c9e8a15
1 parent 594657c
commit c9e8a15
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/microsim/MSLaneChanger.cpp b/src/microsim/MSLaneChanger.cpp
@@ -1288,6 +1288,7 @@ MSLaneChanger::changeOpposite(std::pair<MSVehicle*, double> leader) {
     }
     std::pair<MSVehicle* const, double> neighFollow = opposite->getOppositeFollower(vehicle);
     int state = checkChange(direction, opposite, leader, neighLead, neighFollow, preb);
+    //vehicle->getLaneChangeModel().setOwnState(state);
 
     bool changingAllowed = (state & LCA_BLOCKED) == 0;
     // change if the vehicle wants to and is allowed to change

diff --git a/src/microsim/lcmodels/MSLCM_LC2013.cpp b/src/microsim/lcmodels/MSLCM_LC2013.cpp
@@ -1479,7 +1479,7 @@ MSLCM_LC2013::_wantsChange(
 
     if (amBlockingFollowerPlusNB()
             && (!speedGainInconvenient)
-            //&& ((myOwnState & myLca) != 0) // VARIANT_6 : counterNoHelp
+            && ((myOwnState & myLca) != 0) // VARIANT_6 : counterNoHelp
             && (changeToBest || currentDistAllows(neighDist, abs(bestLaneOffset) + 1, laDist))) {
 
         // VARIANT_2 (nbWhenChangingToHelp)

diff --git a/src/microsim/lcmodels/MSLCM_SL2015.cpp b/src/microsim/lcmodels/MSLCM_SL2015.cpp
@@ -1289,14 +1289,16 @@ MSLCM_SL2015::_wantsChangeSublane(
                                   ? -mySpeedGainProbabilityRight / myChangeProbThresholdRight
                                   : -mySpeedGainProbabilityLeft / myChangeProbThresholdLeft);
     if (laneOffset != 0
-            && (amBlockingFollowerPlusNB() ||
+            && ((amBlockingFollowerPlusNB() 
+                // VARIANT_6 : counterNoHelp
+                    && ((myOwnState & myLca) != 0)) 
+                ||
                 // continue previous cooperative change
                 ((myPreviousState & LCA_COOPERATIVE) != 0
                  && !myCanChangeFully
                  // change is in the right direction
                  && (laneOffset * myManeuverDist > 0)))
             && (inconvenience < myCooperativeParam)
-            //&& ((myOwnState & myLca) != 0) // VARIANT_6 : counterNoHelp
             && (changeToBest || currentDistAllows(neighDist, abs(bestLaneOffset) + 1, laDist))) {
 
         // VARIANT_2 (nbWhenChangingToHelp)