From df6f32501c36e562b0faab46372da22fb8449384 Mon Sep 17 00:00:00 2001
From: Leo <leonhard.luecken@dlr.de>
Date: Tue, 11 Sep 2018 14:36:59 +0200
Subject: [PATCH] Updated tests, refs #32, #4556

---
 .../ego_major_recurrent_longer_loop2/ssm.sumo | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/sumo/extended/SSMDevice/recurrent_net/ego_major_recurrent_longer_loop2/ssm.sumo b/tests/sumo/extended/SSMDevice/recurrent_net/ego_major_recurrent_longer_loop2/ssm.sumo
index 129e20c9704..8c798eb8271 100644
--- a/tests/sumo/extended/SSMDevice/recurrent_net/ego_major_recurrent_longer_loop2/ssm.sumo
+++ b/tests/sumo/extended/SSMDevice/recurrent_net/ego_major_recurrent_longer_loop2/ssm.sumo
@@ -1,16 +1,16 @@
 <SSMLog>
-    <conflict begin="3.00" end="18.10" ego="ego1" foe="foe1">
-        <timeSpan values="3.00 3.10 3.20 3.30 3.40 3.50 3.60 3.70 3.80 3.90 4.00 4.10 4.20 4.30 4.40 4.50 4.60 4.70 4.80 4.90 5.00 5.10 5.20 5.30 5.40 5.50 5.60 5.70 5.80 5.90 6.00 6.10 6.20 6.30 6.40 6.50 6.60 6.70 6.80 6.90 7.00 7.10 7.20 7.30 7.40 7.50 7.60 7.70 7.80 7.90 8.00 8.10 8.20 8.30 8.40 8.50 8.60 8.70 8.80 8.90 9.00 9.10 9.20 9.30 9.40 9.50 9.60 9.70 9.80 9.90 10.00 10.10 10.20 10.30 10.40 10.50 10.60 10.70 10.80 10.90 11.00 11.10 11.20 11.30 11.40 11.50 11.60 11.70 11.80 11.90 12.00 12.10 12.20 12.30 12.40 12.50 12.60 12.70 12.80 12.90 13.00 13.10 13.20 13.30 13.40 13.50 13.60 13.70 13.80 13.90 14.00 14.10 14.20 14.30 14.40 14.50 14.60 14.70 14.80 14.90 15.00 15.10 15.20 15.30 15.40 15.50 15.60 15.70 15.80 15.90 16.00 16.10 16.20 16.30 16.40 16.50 16.60 16.70 16.80 16.90 17.00 17.10 17.20 17.30 17.40 17.50 17.60 17.70 17.80 17.90 18.00 18.10"/>
-        <typeSpan values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 11 11 11 11 13 13 13 13 13 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 16 16 16 16 16 17 10 10 10 10 10 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 13 13 13 13 13 15 15 15 15 16 16 16 16 16 16 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17"/>
-        <egoPosition values="101.65,-50.00 101.65,-48.61 101.65,-47.22 101.65,-45.83 101.65,-44.44 101.65,-43.05 101.65,-41.67 101.65,-40.28 101.65,-38.89 101.65,-37.50 101.65,-36.11 101.65,-34.72 101.65,-33.33 101.65,-31.94 101.65,-30.55 101.65,-29.17 101.65,-27.78 101.65,-26.39 101.65,-25.00 101.65,-23.61 101.65,-22.22 101.65,-20.83 101.65,-19.44 101.65,-18.05 101.65,-16.66 101.65,-15.28 101.65,-13.89 101.65,-12.50 101.65,-11.11 101.65,-9.72 101.65,-8.33 101.65,-6.94 101.65,-5.55 101.65,-4.16 101.65,-2.77 101.65,-1.38 101.65,0.00 101.65,1.39 101.65,2.78 101.65,4.17 101.65,5.56 101.65,6.95 101.65,8.34 101.65,9.73 101.65,11.12 101.65,12.51 101.65,13.89 101.65,15.28 101.65,16.67 101.65,18.06 101.65,19.45 101.65,20.84 101.65,22.23 101.65,23.62 101.65,25.01 101.65,26.40 101.65,27.78 101.65,29.17 101.65,30.56 101.65,31.95 101.65,33.34 101.65,34.73 101.65,36.12 101.65,37.51 101.65,38.90 101.65,40.28 101.65,41.67 101.65,43.06 101.65,44.45 101.65,45.84 101.65,47.23 101.65,48.62 101.65,50.01 101.65,51.40 101.65,52.79 101.65,54.17 101.65,55.56 101.65,56.95 101.65,58.34 101.65,59.73 101.65,61.12 101.65,62.51 101.65,63.88 101.65,65.20 101.82,66.46 102.41,67.53 103.41,68.16 104.54,68.32 105.63,68.35 106.68,68.35 107.69,68.35 108.65,68.35 109.57,68.35 110.44,68.35 111.26,68.35 112.05,68.35 112.78,68.35 113.47,68.35 114.12,68.35 114.76,68.35 115.42,68.35 116.11,68.35 116.83,68.35 117.57,68.35 118.33,68.35 119.13,68.35 119.95,68.35 120.79,68.35 121.66,68.35 122.56,68.35 123.48,68.35 124.43,68.35 125.41,68.35 126.41,68.35 127.43,68.35 128.49,68.35 129.57,68.35 130.67,68.35 131.80,68.35 132.96,68.35 134.14,68.35 135.35,68.35 136.59,68.35 137.85,68.35 139.14,68.35 140.45,68.35 141.79,68.35 143.15,68.35 144.54,68.35 145.93,68.35 147.31,68.35 148.70,68.35 150.09,68.35 151.48,68.35 152.87,68.35 154.26,68.35 155.65,68.35 157.04,68.35 158.43,68.35 159.82,68.35 161.20,68.35 162.59,68.35 163.98,68.35 165.37,68.35 166.76,68.35 168.15,68.35 169.54,68.35 170.93,68.35 172.32,68.35 173.71,68.35 175.09,68.35 176.48,68.35"/>
-        <egoVelocity values="0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.44 0.00,12.99 0.43,12.53 1.87,11.95 4.43,10.77 7.38,8.41 9.30,5.37 9.92,2.76 9.78,1.10 9.39,0.29 8.94,0.05 8.49,0.00 8.04,0.00 7.59,0.00 7.14,0.00 6.69,0.00 6.24,0.00 6.50,0.00 6.76,0.00 7.02,0.00 7.28,0.00 7.54,0.00 7.80,0.00 8.06,0.00 8.32,0.00 8.58,0.00 8.84,0.00 9.10,0.00 9.36,0.00 9.62,0.00 9.88,0.00 10.14,0.00 10.40,0.00 10.66,0.00 10.92,0.00 11.18,0.00 11.44,0.00 11.70,0.00 11.96,0.00 12.22,0.00 12.48,0.00 12.74,0.00 13.00,0.00 13.26,0.00 13.52,0.00 13.78,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00"/>
-        <foePosition values="41.67,48.35 43.06,48.35 44.45,48.35 45.84,48.35 47.23,48.35 48.62,48.35 50.00,48.35 51.39,48.35 52.78,48.35 54.17,48.35 55.56,48.35 56.95,48.35 58.34,48.35 59.73,48.35 61.12,48.35 62.51,48.35 63.89,48.35 65.28,48.35 66.67,48.35 68.06,48.35 69.45,48.35 70.84,48.35 72.23,48.35 73.62,48.35 75.01,48.35 76.40,48.35 77.78,48.35 79.17,48.35 80.56,48.35 81.95,48.35 83.34,48.35 84.73,48.35 86.12,48.35 87.51,48.35 88.90,48.35 90.28,48.35 91.67,48.35 93.06,48.35 94.45,48.35 95.84,48.32 97.23,48.25 98.61,48.13 99.96,47.81 101.26,47.34 102.52,46.76 103.74,46.10 104.96,45.43 106.18,44.76 107.40,44.10 108.62,43.43 109.84,42.77 111.06,42.11 112.28,41.44 113.50,40.78 114.72,40.12 115.94,39.45 117.16,38.79 118.38,38.13 119.61,37.46 120.83,36.80 122.05,36.13 123.27,35.47 124.49,34.81 125.80,34.47 127.09,34.98 128.22,35.77 129.31,36.63 130.35,37.55 131.37,38.49 132.38,39.45 133.39,40.40 134.39,41.36 135.40,42.32 136.41,43.27 137.42,44.23 138.43,45.18 139.21,46.11 138.01,46.81 136.81,47.51 135.61,48.21 134.41,48.91 133.21,49.61 132.01,50.31 130.81,51.01 129.60,51.71 128.40,52.40 127.20,53.10 126.00,53.80 124.80,54.50 123.60,55.20 122.40,55.90 121.99,57.06 121.95,58.45 121.91,59.84 121.88,61.23 121.84,62.62 121.80,64.00 121.77,65.39 121.74,66.78 121.71,68.17 121.69,69.56 121.66,70.95 121.65,72.34 121.65,73.73 121.65,75.12 121.65,76.50 121.65,77.89 121.65,79.28 121.65,80.67 121.65,82.06 121.65,83.45 121.65,84.84 121.65,86.23 121.65,87.62 121.65,89.01 121.65,90.39 121.65,91.78 121.65,93.17 121.65,94.56 121.65,95.95 121.65,97.34 121.65,98.73 121.65,100.12 121.65,101.51 121.65,102.90 121.65,104.28 121.65,105.67 121.65,107.06 121.65,108.45 121.65,109.84 121.65,111.23 121.65,112.62 121.65,114.01 121.65,115.40 121.65,116.79 121.65,118.18 121.65,119.56 121.65,120.95 121.65,122.34 121.65,123.73 121.65,125.12 121.65,126.51 121.65,127.90 121.65,129.29 121.65,130.68 121.65,132.07 121.65,133.45 121.65,134.84 121.65,136.23 121.65,137.62 121.65,139.01 121.65,140.40"/>
-        <foeVelocity values="13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,-0.08 13.89,-0.27 13.88,-0.61 13.81,-1.50 13.63,-2.67 13.27,-4.10 12.83,-5.33 12.39,-6.28 12.26,-6.53 12.18,-6.67 12.19,-6.65 12.20,-6.63 12.20,-6.63 12.20,-6.63 12.20,-6.63 12.20,-6.63 12.20,-6.63 12.20,-6.63 12.20,-6.63 12.20,-6.63 12.20,-6.63 12.20,-6.63 12.20,-6.63 12.20,-6.63 12.62,-5.81 13.63,-2.67 13.78,1.74 12.51,6.04 11.26,8.13 10.64,8.92 10.29,9.33 10.17,9.46 10.09,9.55 10.08,9.56 10.08,9.56 10.08,9.56 10.08,9.56 9.80,9.84 4.91,12.99 -4.59,13.11 -10.74,8.81 -12.00,6.99 -12.00,6.99 -12.00,6.99 -12.00,6.99 -12.00,6.99 -12.00,6.99 -12.00,6.99 -12.00,6.99 -12.00,6.99 -12.00,6.99 -12.00,6.99 -10.63,8.95 -7.55,11.66 -3.72,13.38 -0.37,13.89 -0.37,13.89 -0.37,13.89 -0.36,13.89 -0.34,13.89 -0.31,13.89 -0.28,13.89 -0.27,13.89 -0.22,13.89 -0.15,13.89 -0.07,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89"/>
-        <conflictPoint values="-1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 -1073741824.00,-1073741824.00,-1073741824.00 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 101.65,46.26 121.73,67.45 121.73,67.45 121.73,67.45 121.73,67.45 121.73,67.45 121.73,67.45 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35"/>
-        <TTCSpan values="NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA 2.25 2.15 2.05 1.95 1.85 1.75 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA 0.55 0.43 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA"/>
+    <conflict begin="11.40" end="18.10" ego="ego1" foe="foe1">
+        <timeSpan values="11.40 11.50 11.60 11.70 11.80 11.90 12.00 12.10 12.20 12.30 12.40 12.50 12.60 12.70 12.80 12.90 13.00 13.10 13.20 13.30 13.40 13.50 13.60 13.70 13.80 13.90 14.00 14.10 14.20 14.30 14.40 14.50 14.60 14.70 14.80 14.90 15.00 15.10 15.20 15.30 15.40 15.50 15.60 15.70 15.80 15.90 16.00 16.10 16.20 16.30 16.40 16.50 16.60 16.70 16.80 16.90 17.00 17.10 17.20 17.30 17.40 17.50 17.60 17.70 17.80 17.90 18.00 18.10"/>
+        <typeSpan values="11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 13 13 13 13 13 15 15 15 15 16 16 16 16 16 16 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17"/>
+        <egoPosition values="101.82,66.46 102.41,67.53 103.41,68.16 104.54,68.32 105.63,68.35 106.68,68.35 107.69,68.35 108.65,68.35 109.57,68.35 110.44,68.35 111.26,68.35 112.05,68.35 112.78,68.35 113.47,68.35 114.12,68.35 114.76,68.35 115.42,68.35 116.11,68.35 116.83,68.35 117.57,68.35 118.33,68.35 119.13,68.35 119.95,68.35 120.79,68.35 121.66,68.35 122.56,68.35 123.48,68.35 124.43,68.35 125.41,68.35 126.41,68.35 127.43,68.35 128.49,68.35 129.57,68.35 130.67,68.35 131.80,68.35 132.96,68.35 134.14,68.35 135.35,68.35 136.59,68.35 137.85,68.35 139.14,68.35 140.45,68.35 141.79,68.35 143.15,68.35 144.54,68.35 145.93,68.35 147.31,68.35 148.70,68.35 150.09,68.35 151.48,68.35 152.87,68.35 154.26,68.35 155.65,68.35 157.04,68.35 158.43,68.35 159.82,68.35 161.20,68.35 162.59,68.35 163.98,68.35 165.37,68.35 166.76,68.35 168.15,68.35 169.54,68.35 170.93,68.35 172.32,68.35 173.71,68.35 175.09,68.35 176.48,68.35"/>
+        <egoVelocity values="0.43,12.53 1.87,11.95 4.43,10.77 7.38,8.41 9.30,5.37 9.92,2.76 9.78,1.10 9.39,0.29 8.94,0.05 8.49,0.00 8.04,0.00 7.59,0.00 7.14,0.00 6.69,0.00 6.24,0.00 6.50,0.00 6.76,0.00 7.02,0.00 7.28,0.00 7.54,0.00 7.80,0.00 8.06,0.00 8.32,0.00 8.58,0.00 8.84,0.00 9.10,0.00 9.36,0.00 9.62,0.00 9.88,0.00 10.14,0.00 10.40,0.00 10.66,0.00 10.92,0.00 11.18,0.00 11.44,0.00 11.70,0.00 11.96,0.00 12.22,0.00 12.48,0.00 12.74,0.00 13.00,0.00 13.26,0.00 13.52,0.00 13.78,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00 13.89,0.00"/>
+        <foePosition values="129.60,51.71 128.40,52.40 127.20,53.10 126.00,53.80 124.80,54.50 123.60,55.20 122.40,55.90 121.99,57.06 121.95,58.45 121.91,59.84 121.88,61.23 121.84,62.62 121.80,64.00 121.77,65.39 121.74,66.78 121.71,68.17 121.69,69.56 121.66,70.95 121.65,72.34 121.65,73.73 121.65,75.12 121.65,76.50 121.65,77.89 121.65,79.28 121.65,80.67 121.65,82.06 121.65,83.45 121.65,84.84 121.65,86.23 121.65,87.62 121.65,89.01 121.65,90.39 121.65,91.78 121.65,93.17 121.65,94.56 121.65,95.95 121.65,97.34 121.65,98.73 121.65,100.12 121.65,101.51 121.65,102.90 121.65,104.28 121.65,105.67 121.65,107.06 121.65,108.45 121.65,109.84 121.65,111.23 121.65,112.62 121.65,114.01 121.65,115.40 121.65,116.79 121.65,118.18 121.65,119.56 121.65,120.95 121.65,122.34 121.65,123.73 121.65,125.12 121.65,126.51 121.65,127.90 121.65,129.29 121.65,130.68 121.65,132.07 121.65,133.45 121.65,134.84 121.65,136.23 121.65,137.62 121.65,139.01 121.65,140.40"/>
+        <foeVelocity values="-12.00,6.99 -12.00,6.99 -12.00,6.99 -12.00,6.99 -12.00,6.99 -12.00,6.99 -12.00,6.99 -10.63,8.95 -7.55,11.66 -3.72,13.38 -0.37,13.89 -0.37,13.89 -0.37,13.89 -0.36,13.89 -0.34,13.89 -0.31,13.89 -0.28,13.89 -0.27,13.89 -0.22,13.89 -0.15,13.89 -0.07,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89 0.00,13.89"/>
+        <conflictPoint values="120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35 120.81,68.35"/>
+        <TTCSpan values="NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA 0.55 0.43 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA"/>
         <minTTC time="13.30" position="120.81,68.35" type="13" value="0.43"/>
-        <DRACSpan values="NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA 1.73 1.87 2.02 2.19 2.38 2.60 2.76 2.58 2.38 2.14 1.86 1.53 1.13 0.65 0.05 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA"/>
-        <maxDRAC time="11.20" position="120.81,68.35" type="11" value="2.76"/>
+        <DRACSpan values="2.38 2.14 1.86 1.53 1.13 0.65 0.05 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA"/>
+        <maxDRAC time="11.40" position="120.81,68.35" type="11" value="2.38"/>
         <PET time="13.70" position="120.81,68.35" type="17" value="0.36"/>
     </conflict>
     <globalMeasures ego="ego1">