From c6eb753426297d56d81e5d624cd2a1d2f4c74c71 Mon Sep 17 00:00:00 2001
From: Jakob Erdmann <jakob.erdmann@dlr.de>
Date: Wed, 11 Sep 2024 13:20:14 +0200
Subject: [PATCH] patching expected results. refs #21, #15468

---
 .../striping/bugs/ticket15468/tripinfos.sumo  | 14 ++++-----
 tests/sumo/tls/NEMA/crossings/errors.sumo     | 31 -------------------
 tests/sumo/tls/NEMA/crossings/output.sumo     | 24 +++++++-------
 3 files changed, 19 insertions(+), 50 deletions(-)

diff --git a/tests/sumo/pedestrian_model/striping/bugs/ticket15468/tripinfos.sumo b/tests/sumo/pedestrian_model/striping/bugs/ticket15468/tripinfos.sumo
index 6072ecd7b2c2..0a4ceb3777b9 100644
--- a/tests/sumo/pedestrian_model/striping/bugs/ticket15468/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/striping/bugs/ticket15468/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-11 13:14:48 by Eclipse SUMO sumo Version v1_20_0+1948-34c14ed2cf8
+<!-- generated on 2024-09-11 13:17:37 by Eclipse SUMO sumo Version v1_20_0+1949-bc33edb6380
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -40,12 +40,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
     <tripinfo id="car_SW.0" depart="70.00" departLane="SC_4" departPos="5.10" departSpeed="13.89" departDelay="0.00" arrival="86.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="16.00" routeLength="192.06" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="1.25" rerouteNo="0" devices="tripinfo_car_SW.0" vType="car" speedFactor="1.00" vaporized=""/>
     <tripinfo id="car_SW.1" depart="74.00" departLane="SC_4" departPos="5.10" departSpeed="13.89" departDelay="0.00" arrival="89.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="15.00" routeLength="192.06" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.23" rerouteNo="0" devices="tripinfo_car_SW.1" vType="car" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="car_SW.2" depart="78.00" departLane="SC_4" departPos="5.10" departSpeed="13.89" departDelay="0.00" arrival="105.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="27.00" routeLength="192.06" waitingTime="9.00" waitingCount="1" stopTime="0.00" timeLoss="12.80" rerouteNo="0" devices="tripinfo_car_SW.2" vType="car" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="car_SW.3" depart="82.00" departLane="SC_4" departPos="5.10" departSpeed="13.89" departDelay="0.00" arrival="107.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="25.00" routeLength="192.06" waitingTime="7.00" waitingCount="1" stopTime="0.00" timeLoss="10.34" rerouteNo="0" devices="tripinfo_car_SW.3" vType="car" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="car_SW.4" depart="86.00" departLane="SC_4" departPos="5.10" departSpeed="13.89" departDelay="0.00" arrival="108.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="22.00" routeLength="192.06" waitingTime="4.00" waitingCount="1" stopTime="0.00" timeLoss="7.88" rerouteNo="0" devices="tripinfo_car_SW.4" vType="car" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="car_SW.5" depart="90.00" departLane="SC_4" departPos="5.10" departSpeed="13.89" departDelay="0.00" arrival="110.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="20.00" routeLength="192.06" waitingTime="2.00" waitingCount="1" stopTime="0.00" timeLoss="5.42" rerouteNo="0" devices="tripinfo_car_SW.5" vType="car" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="car_SW.6" depart="94.00" departLane="SC_4" departPos="5.10" departSpeed="13.89" departDelay="0.00" arrival="111.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="17.00" routeLength="192.06" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="2.96" rerouteNo="0" devices="tripinfo_car_SW.6" vType="car" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="car_SW.7" depart="98.00" departLane="SC_4" departPos="5.10" departSpeed="13.89" departDelay="0.00" arrival="113.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="15.00" routeLength="192.06" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.65" rerouteNo="0" devices="tripinfo_car_SW.7" vType="car" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="car_SW.2" depart="78.00" departLane="SC_4" departPos="5.10" departSpeed="13.89" departDelay="0.00" arrival="92.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="14.00" routeLength="192.06" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_car_SW.2" vType="car" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="car_SW.3" depart="82.00" departLane="SC_4" departPos="5.10" departSpeed="13.89" departDelay="0.00" arrival="96.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="14.00" routeLength="192.06" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_car_SW.3" vType="car" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="car_SW.4" depart="86.00" departLane="SC_4" departPos="5.10" departSpeed="13.89" departDelay="0.00" arrival="100.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="14.00" routeLength="192.06" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_car_SW.4" vType="car" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="car_SW.5" depart="90.00" departLane="SC_4" departPos="5.10" departSpeed="13.89" departDelay="0.00" arrival="104.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="14.00" routeLength="192.06" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_car_SW.5" vType="car" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="car_SW.6" depart="94.00" departLane="SC_4" departPos="5.10" departSpeed="13.89" departDelay="0.00" arrival="108.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="14.00" routeLength="192.06" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_car_SW.6" vType="car" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="car_SW.7" depart="98.00" departLane="SC_4" departPos="5.10" departSpeed="13.89" departDelay="0.00" arrival="112.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="14.00" routeLength="192.06" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_car_SW.7" vType="car" speedFactor="1.00" vaporized=""/>
     <personinfo id="p0" depart="70.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="139.00" waitingTime="0.00" timeLoss="80.98" traveltime="139.00">
         <walk depart="70.00" departPos="76.90" arrival="209.00" arrivalPos="42.70" duration="139.00" routeLength="80.58" timeLoss="80.98" maxSpeed="1.39"/>
     </personinfo>
diff --git a/tests/sumo/tls/NEMA/crossings/errors.sumo b/tests/sumo/tls/NEMA/crossings/errors.sumo
index c7a59f4378a6..e69de29bb2d1 100644
--- a/tests/sumo/tls/NEMA/crossings/errors.sumo
+++ b/tests/sumo/tls/NEMA/crossings/errors.sumo
@@ -1,31 +0,0 @@
-Warning: Teleporting vehicle '12'; junction collision with vehicle '16', lane=':C_14_0', gap=-1.00, time=168.00, stage=move.
-Warning: Vehicle '12' ends teleporting on edge 'CN', time=168.00.
-Warning: Vehicle '4' collision with person 'p28', lane=':C_2_0', time=187.00, stage=events.
-Warning: Vehicle '4' collision with person 'p29', lane=':C_2_0', time=187.00, stage=events.
-Warning: Vehicle '4' collision with person 'p83', lane=':C_2_0', time=188.00, stage=events.
-Warning: Vehicle '4' collision with person 'p81', lane=':C_2_0', time=188.00, stage=events.
-Warning: Vehicle '4' collision with person 'p42', lane=':C_2_0', time=188.00, stage=events.
-Warning: Vehicle '4' collision with person 'p17', lane=':C_2_0', time=188.00, stage=events.
-Warning: Vehicle '4' collision with person 'p25', lane=':C_2_0', time=188.00, stage=events.
-Warning: Vehicle '4' collision with person 'p39', lane=':C_2_0', time=188.00, stage=events.
-Warning: Vehicle '4' collision with person 'p47', lane=':C_2_0', time=189.00, stage=events.
-Warning: Vehicle '4' collision with person 'p76', lane=':C_2_0', time=189.00, stage=events.
-Warning: Vehicle '4' collision with person 'p88', lane=':C_2_0', time=189.00, stage=events.
-Warning: Vehicle '4' collision with person 'p70', lane=':C_2_0', time=189.00, stage=events.
-Warning: Vehicle '4' collision with person 'p120', lane=':C_2_0', time=189.00, stage=events.
-Warning: Vehicle '4' collision with person 'p43', lane=':C_2_0', time=189.00, stage=events.
-Warning: Vehicle '4' collision with person 'p148', lane=':C_2_0', time=190.00, stage=events.
-Warning: Vehicle '4' collision with person 'p67', lane=':C_2_0', time=190.00, stage=events.
-Warning: Vehicle '4' collision with person 'p102', lane=':C_2_0', time=190.00, stage=events.
-Warning: Vehicle '4' collision with person 'p85', lane=':C_2_0', time=190.00, stage=events.
-Warning: Vehicle '4' collision with person 'p158', lane=':C_2_0', time=190.00, stage=events.
-Warning: Vehicle '4' collision with person 'p72', lane=':C_2_0', time=191.00, stage=events.
-Warning: Vehicle '4' collision with person 'p48', lane=':C_2_0', time=191.00, stage=events.
-Warning: Vehicle '4' collision with person 'p96', lane=':C_2_0', time=197.00, stage=events.
-Warning: Vehicle '4' collision with person 'p94', lane=':C_2_0', time=197.00, stage=events.
-Warning: Vehicle '4' collision with person 'p110', lane=':C_2_0', time=203.00, stage=events.
-Warning: Vehicle '4' collision with person 'p118', lane=':C_2_0', time=211.00, stage=events.
-Warning: Teleporting vehicle '11'; junction collision with vehicle '36', lane=':C_2_0', gap=-1.00, time=255.00, stage=move.
-Warning: Vehicle '11' ends teleporting on edge 'CE', time=255.00.
-Warning: Teleporting vehicle '25'; junction collision with vehicle '8', lane=':C_17_0', gap=-1.00, time=259.00, stage=move.
-Warning: Vehicle '25' ends teleporting on edge 'CE', time=259.00.
diff --git a/tests/sumo/tls/NEMA/crossings/output.sumo b/tests/sumo/tls/NEMA/crossings/output.sumo
index a37790ad3b19..b7fd5f468f63 100644
--- a/tests/sumo/tls/NEMA/crossings/output.sumo
+++ b/tests/sumo/tls/NEMA/crossings/output.sumo
@@ -1,18 +1,18 @@
-Loading net-file from 'net.net.xml' ... done (2ms).
+Loading net-file from 'net.net.xml' ... done (4ms).
 Loading done.
-Simulation version v1_20_0+0875-c7310f6279d started with time: 0.00.
-Simulation ended at time: 561.00.
+Simulation version v1_20_0+1949-bc33edb6380 started with time: 0.00.
+Simulation ended at time: 424.00.
 Reason: All vehicles have left the simulation.
 Statistics (avg of 180):
- RouteLength: 187.47
- Speed: 2.35
- Duration: 178.50
- WaitingTime: 142.37
- TimeLoss: 163.96
- DepartDelay: 104.41
+ RouteLength: 187.62
+ Speed: 3.32
+ Duration: 93.92
+ WaitingTime: 62.37
+ TimeLoss: 79.34
+ DepartDelay: 45.47
 Pedestrian Statistics (avg of 180 walks):
  RouteLength: 115.95
- Duration: 149.40
- TimeLoss: 65.92
-DijkstraRouter answered 8590 queries and explored 22.97 edges on average.
+ Duration: 131.43
+ TimeLoss: 47.95
+DijkstraRouter answered 6101 queries and explored 22.73 edges on average.
 DijkstraRouter spent 0.01s answering queries (0.00ms on average).