Skip to content

Commit

Permalink
patching expected results refs #21, #13313
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed May 31, 2023
1 parent d2fc37c commit 45ac70e
Show file tree
Hide file tree
Showing 11 changed files with 353 additions and 332 deletions.
4 changes: 2 additions & 2 deletions tests/sumo/extended/bidiEdge/2edges_between/tripinfos.sumo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-05-25 12:09:34 by Eclipse SUMO sumo Version v1_17_0+0477-a186a08
<!-- generated on 2023-05-31 16:05:21 by Eclipse SUMO sumo Version v1_17_0+0606-c9c96fb
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
Expand Down Expand Up @@ -36,6 +36,6 @@ 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="v_1" depart="0.00" departLane="-E4_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="379.00" arrivalLane="-E1_0" arrivalPos="100.00" arrivalSpeed="5.00" duration="379.00" routeLength="394.90" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="302.52" rerouteNo="0" devices="tripinfo_v_1" vType="car" speedFactor="1.00" vaporized=""/>
<tripinfo id="v_0" depart="0.00" departLane="E1_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="380.00" arrivalLane="E4_0" arrivalPos="100.00" arrivalSpeed="5.00" duration="380.00" routeLength="394.90" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="302.52" rerouteNo="0" devices="tripinfo_v_0" vType="car" speedFactor="1.00" vaporized=""/>
<tripinfo id="v_1" depart="0.00" departLane="-E4_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="380.00" arrivalLane="-E1_0" arrivalPos="100.00" arrivalSpeed="5.00" duration="380.00" routeLength="394.90" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="302.52" rerouteNo="0" devices="tripinfo_v_1" vType="car" speedFactor="1.00" vaporized=""/>
</tripinfos>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Warning: Teleporting vehicle 'v.1'; waited too long (jam), lane='E0_0', time=312.00.
Warning: Vehicle 'v.1' ends teleporting on edge 'E4', time=349.00.
Warning: Teleporting vehicle 'v.3'; waited too long (wrong lane), lane='E1_0', time=350.00.
Warning: Vehicle 'v.3' ends teleporting on edge 'E4', time=351.00.
Warning: Vehicle 'v.3' ends teleporting on edge 'E4', time=352.00.
Warning: Teleporting vehicle 'b.6'; waited too long (jam), lane='-E2_1', time=359.00.
Warning: Teleporting vehicle 'v.6'; waited too long (wrong lane), lane='E1_0', time=360.00.
Warning: Vehicle 'v.6' ends teleporting on edge 'E4', time=360.00.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Warning: Teleporting vehicle 'v_0'; waited too long (jam), lane='E2_0', time=341.00.
Warning: Teleporting vehicle 'v_1'; waited too long (jam), lane='-E3_0', time=341.00.
Warning: Vehicle 'v_0' ends teleporting on edge 'E3', time=341.00.
Warning: Vehicle 'v_1' ends teleporting on edge '-E2', time=341.00.
Warning: Vehicle 'v_1' ends teleporting on edge '-E2', time=343.00.
84 changes: 44 additions & 40 deletions tests/sumo/sublane_model/bidiEdge/2edges_between/fcd.sumo

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-05-25 12:11:36 by Eclipse SUMO sumo Version v1_17_0+0477-a186a08
<!-- generated on 2023-05-31 16:05:51 by Eclipse SUMO sumo Version v1_17_0+0606-c9c96fb
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
Expand Down Expand Up @@ -39,5 +39,5 @@ 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="v_0" depart="0.00" departLane="E1_0" departPos="5.10" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="380.00" arrivalLane="E4_0" arrivalPos="100.00" arrivalPosLat="0.00" arrivalSpeed="5.00" duration="380.00" routeLength="394.90" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="302.52" rerouteNo="0" devices="tripinfo_v_0 fcd_v_0" vType="car" speedFactor="1.00" vaporized=""/>
<tripinfo id="v_1" depart="0.00" departLane="-E4_0" departPos="5.10" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="380.00" arrivalLane="-E1_0" arrivalPos="100.00" arrivalPosLat="0.00" arrivalSpeed="5.00" duration="380.00" routeLength="394.90" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="302.52" rerouteNo="0" devices="tripinfo_v_1 fcd_v_1" vType="car" speedFactor="1.00" vaporized=""/>
<tripinfo id="v_1" depart="0.00" departLane="-E4_0" departPos="5.10" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="382.00" arrivalLane="-E1_0" arrivalPos="100.00" arrivalPosLat="0.00" arrivalSpeed="5.00" duration="382.00" routeLength="394.90" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="302.52" rerouteNo="0" devices="tripinfo_v_1 fcd_v_1" vType="car" speedFactor="1.00" vaporized=""/>
</tripinfos>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Warning: Teleporting vehicle 'v_1'; waited too long (jam), lane='-E3_0', time=341.00.
Warning: Teleporting vehicle 'v_0'; waited too long (jam), lane='E2_0', time=341.00.
Warning: Vehicle 'v_0' ends teleporting on edge 'E3', time=341.00.
Warning: Vehicle 'v_1' ends teleporting on edge '-E2', time=341.00.
Warning: Vehicle 'v_1' ends teleporting on edge '-E2', time=343.00.

0 comments on commit 45ac70e

Please sign in to comment.