fixes an issue with overlapping vehicles.

gama-platform · Aug 3, 2021 · 40a90a6 · 40a90a6
1 parent 9cb7dda
commit 40a90a6
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/Utils.java b/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/Utils.java
@@ -121,8 +121,14 @@ public static double rescaleProba(final double probaInOneSecond,
 
 			if (Math.abs(gapBetweenCentroids) < 0.5 * vL + 0.5 * otherVL) {
 				// Overlap with another vehicle
-				return null;
-			} else if (gapBetweenCentroids > 0 && gap < minLeadingDist) {
+				//return null;
+				if (gapBetweenCentroids >= 0)
+					gap =  + 0.5 * vL + 0.5 * otherVL;
+				else {
+					gap =  - 0.5 * vL - 0.5 * otherVL;
+				}
+			}
+			if (gapBetweenCentroids > 0 && gap < minLeadingDist) {
 				leadingVehicle = otherVehicle;
 				minLeadingDist = Math.abs(gap);
 				leadingSameDirection = sameDirection;