Fix vehicles using linked road when proba=0.0

gama-platform · Aug 9, 2021 · 8e31eaa · 8e31eaa
1 parent 6419f14
commit 8e31eaa
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/lanechange/MOBIL.java b/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/lanechange/MOBIL.java
@@ -40,6 +40,7 @@
 import simtools.gaml.extensions.traffic.RoadNodeSkill;
 import simtools.gaml.extensions.traffic.RoadSkill;
 import simtools.gaml.extensions.traffic.carfollowing.IDM;
+import ummisco.gama.dev.utils.DEBUG;
 
 public class MOBIL {
 	/**
@@ -72,8 +73,13 @@ public static ImmutablePair<Integer, Double> chooseLane(final IScope scope,
 		int numCurrentLanes = RoadSkill.getNumLanes(road);
 		int numLinkedLanes = (linkedRoad != null) ? RoadSkill.getNumLanes(linkedRoad) : 0;
 		int linkedLaneLimit = getLinkedLaneLimit(vehicle);
-		linkedLaneLimit = (linkedLaneLimit != -1 && numLinkedLanes > linkedLaneLimit) ?
-				linkedLaneLimit : numLinkedLanes;
+		if (linkedLaneLimit == -1) {
+			linkedLaneLimit = numLinkedLanes;
+		} else if (probaUseLinkedRoad == 0.0) {
+			linkedLaneLimit = 0;
+		} else {
+			linkedLaneLimit = Math.min(linkedLaneLimit, numLinkedLanes);
+		}
 		List<Integer> allowedLanes = getAllowedLanes(vehicle);
 		// Restrict the lane index when entering a new road
 		currentLowestLane = Math.min(currentLowestLane,