Skip to content

Commit

Permalink
patching expected results refs #21, #10665
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed May 4, 2022
1 parent ccbc9c3 commit 0393fcd
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 40 deletions.
15 changes: 10 additions & 5 deletions tests/sumo/devices/bluelight/opposite_multiple2/tripinfos.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2021-12-11 22:16:26 by Eclipse SUMO sumo Version v1_11_0+0489-eed1b29
<!-- generated on 2022-05-04 10:05:56 by Eclipse SUMO sumo Version v1_13_0+0013-5f7506c
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
http://www.eclipse.org/legal/epl-v20.html
SPDX-License-Identifier: EPL-2.0
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<input>
Expand Down Expand Up @@ -72,14 +77,14 @@ SPDX-License-Identifier: EPL-2.0
<tripinfo id="case_1_engine.7" depart="48.50" departLane="edge_5_0" departPos="8.10" departPosLat="0.00" departSpeed="0.00" departDelay="0.50" arrival="130.80" arrivalLane="edge_0_1" arrivalPos="489.60" arrivalPosLat="-0.35" arrivalSpeed="19.57" duration="82.30" routeLength="990.46" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="31.71" rerouteNo="0" devices="tripinfo_case_1_engine.7 bluelight_case_1_engine.7" vType="engine" speedFactor="1.40" vaporized="">
<bluelight/>
</tripinfo>
<tripinfo id="case_1_engine.8" depart="52.50" departLane="edge_5_0" departPos="8.10" departPosLat="0.00" departSpeed="0.00" departDelay="0.50" arrival="134.70" arrivalLane="edge_0_1" arrivalPos="489.60" arrivalPosLat="-0.35" arrivalSpeed="19.55" duration="82.20" routeLength="990.46" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="31.64" rerouteNo="0" devices="tripinfo_case_1_engine.8 bluelight_case_1_engine.8" vType="engine" speedFactor="1.40" vaporized="">
<tripinfo id="case_1_engine.8" depart="52.50" departLane="edge_5_0" departPos="8.10" departPosLat="0.00" departSpeed="0.00" departDelay="0.50" arrival="134.90" arrivalLane="edge_0_1" arrivalPos="489.60" arrivalPosLat="-0.35" arrivalSpeed="19.60" duration="82.40" routeLength="990.46" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="31.84" rerouteNo="0" devices="tripinfo_case_1_engine.8 bluelight_case_1_engine.8" vType="engine" speedFactor="1.40" vaporized="">
<bluelight/>
</tripinfo>
<tripinfo id="case_1_engine.9" depart="56.50" departLane="edge_5_0" departPos="8.10" departPosLat="0.00" departSpeed="0.00" departDelay="0.50" arrival="138.70" arrivalLane="edge_0_1" arrivalPos="489.60" arrivalPosLat="-0.35" arrivalSpeed="19.58" duration="82.20" routeLength="990.46" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="31.61" rerouteNo="0" devices="tripinfo_case_1_engine.9 bluelight_case_1_engine.9" vType="engine" speedFactor="1.40" vaporized="">
<tripinfo id="case_1_engine.9" depart="56.50" departLane="edge_5_0" departPos="8.10" departPosLat="0.00" departSpeed="0.00" departDelay="0.50" arrival="138.70" arrivalLane="edge_0_1" arrivalPos="489.60" arrivalPosLat="-0.35" arrivalSpeed="19.57" duration="82.20" routeLength="990.46" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="31.62" rerouteNo="0" devices="tripinfo_case_1_engine.9 bluelight_case_1_engine.9" vType="engine" speedFactor="1.40" vaporized="">
<bluelight/>
</tripinfo>
<tripinfo id="0" depart="0.00" departLane="edge_5_0" departPos="5.10" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="374.60" arrivalLane="edge_0_0" arrivalPos="489.60" arrivalPosLat="0.70" arrivalSpeed="13.96" duration="374.60" routeLength="974.10" waitingTime="300.10" waitingCount="1" stopTime="0.00" timeLoss="305.42" rerouteNo="0" devices="tripinfo_0" vType="car@0" speedFactor="1.00" vaporized=""/>
<tripinfo id="1" depart="2.60" departLane="edge_5_0" departPos="5.10" departPosLat="0.00" departSpeed="0.00" departDelay="1.60" arrival="377.10" arrivalLane="edge_0_1" arrivalPos="489.60" arrivalPosLat="-0.70" arrivalSpeed="13.90" duration="374.50" routeLength="974.10" waitingTime="300.10" waitingCount="1" stopTime="0.00" timeLoss="305.25" rerouteNo="0" devices="tripinfo_1" vType="car@1" speedFactor="1.00" vaporized=""/>
<tripinfo id="1" depart="2.60" departLane="edge_5_0" departPos="5.10" departPosLat="0.00" departSpeed="0.00" departDelay="1.60" arrival="377.10" arrivalLane="edge_0_1" arrivalPos="489.60" arrivalPosLat="-0.70" arrivalSpeed="13.96" duration="374.50" routeLength="974.10" waitingTime="300.10" waitingCount="1" stopTime="0.00" timeLoss="305.25" rerouteNo="0" devices="tripinfo_1" vType="car@1" speedFactor="1.00" vaporized=""/>
<tripinfo id="2" depart="5.20" departLane="edge_5_0" departPos="5.10" departPosLat="0.00" departSpeed="0.00" departDelay="3.20" arrival="679.90" arrivalLane="edge_3_0" arrivalPos="489.60" arrivalPosLat="-0.70" arrivalSpeed="13.93" duration="674.70" routeLength="974.10" waitingTime="594.10" waitingCount="2" stopTime="0.00" timeLoss="605.53" rerouteNo="0" devices="tripinfo_2" vType="car@2" speedFactor="1.00" vaporized=""/>
<tripinfo id="3" depart="7.90" departLane="edge_5_0" departPos="5.10" departPosLat="0.00" departSpeed="0.00" departDelay="4.90" arrival="983.10" arrivalLane="edge_3_0" arrivalPos="489.60" arrivalPosLat="-0.70" arrivalSpeed="13.98" duration="975.20" routeLength="974.10" waitingTime="888.80" waitingCount="3" stopTime="0.00" timeLoss="906.03" rerouteNo="0" devices="tripinfo_3" vType="car@3" speedFactor="1.00" vaporized=""/>
</tripinfos>
77 changes: 51 additions & 26 deletions tests/sumo/pedestrian_model/striping/block_vehicles_sharedspace/complex_sublane/errors.sumo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,30 +206,55 @@ Warning: Collision of person 'pEW.2' and person 'pEW.11', lane='WC.48_0', time=3
Warning: Vehicle 'veh.31' collision with person 'pEW.22', lane='WC.48_0', gap=-6.18, time=344.00, stage=move.
Warning: Vehicle 'veh.41' collision with person 'pEW.20', lane='WC.48_0', gap=-0.59, time=369.00, stage=laneChange.
Warning: Vehicle 'veh.42' collision with person 'pEW.2', lane='WC_0', gap=-3.63, time=375.00, stage=laneChange.
Warning: Vehicle 'veh.42' collision with person 'pWE.38', lane='WC.48_0', gap=-0.43, time=377.00, stage=laneChange.
Warning: Vehicle 'veh.42' collision with person 'pWE.38', lane='WC.48_0', gap=-0.42, time=377.00, stage=laneChange.
Warning: Vehicle 'veh.42' collision with person 'pWE.40', lane='WC.48_0', gap=-3.35, time=407.00, stage=move.
Warning: Collision of person 'pWE.34' and person 'pWE.29', lane=':C_9_0', time=424.00.
Warning: Vehicle 'veh.44' collision with person 'pWE.31', lane='CEa_0', gap=-7.84, time=429.00, stage=laneChange.
Warning: Vehicle 'veh.44' collision with person 'pWE.22', lane='CEa_0', gap=-8.86, time=430.00, stage=move.
Warning: Vehicle 'veh.49' collision with person 'pEW.35', lane='WC.48_0', gap=-9.06, time=474.00, stage=laneChange.
Warning: Vehicle 'veh.48' collision with person 'pWE.47', lane=':C_9_0', gap=-2.30, time=499.00, stage=move.
Warning: Vehicle 'veh.54' collision with person 'pEW.55', lane='CE_0', gap=-0.53, time=534.00, stage=laneChange.
Warning: Vehicle 'veh.60' collision with person 'pWE.54', lane='CEa_0', gap=-7.94, time=627.00, stage=laneChange.
Warning: Vehicle 'veh.63' collision with person 'pWE.62', lane=':C_9_0', gap=-0.75, time=678.00, stage=move.
Warning: Vehicle 'veh.73' collision with person 'pWE.70', lane='WC.48_0', gap=-7.59, time=775.00, stage=move.
Warning: Vehicle 'veh.80' collision with person 'pEW.76', lane='WC.48_0', gap=-1.18, time=812.00, stage=laneChange.
Warning: Collision of person 'pEW.99' and person 'pEW.102', lane=':C_9_0', time=962.00.
Warning: Collision of person 'pEW.99' and person 'pEW.102', lane=':C_9_0', time=963.00.
Warning: Collision of person 'pEW.99' and person 'pEW.102', lane=':C_9_0', time=964.00.
Warning: Collision of person 'pEW.99' and person 'pEW.102', lane=':C_9_0', time=965.00.
Warning: Collision of person 'pEW.99' and person 'pEW.102', lane=':C_9_0', time=966.00.
Warning: Collision of person 'pEW.99' and person 'pEW.102', lane=':C_9_0', time=967.00.
Warning: Collision of person 'pEW.99' and person 'pEW.102', lane=':C_9_0', time=968.00.
Warning: Collision of person 'pEW.99' and person 'pEW.102', lane=':C_9_0', time=969.00.
Warning: Collision of person 'pEW.99' and person 'pEW.102', lane=':C_9_0', time=970.00.
Warning: Collision of person 'pEW.99' and person 'pEW.102', lane=':C_9_0', time=971.00.
Warning: Collision of person 'pEW.99' and person 'pEW.102', lane=':C_9_0', time=972.00.
Warning: Collision of person 'pEW.99' and person 'pEW.102', lane=':C_9_0', time=973.00.
Warning: Collision of person 'pEW.99' and person 'pEW.102', lane=':C_9_0', time=974.00.
Warning: Collision of person 'pEW.99' and person 'pEW.102', lane=':C_9_0', time=975.00.
Warning: Vehicle 'veh.98' collision with person 'pWE.92', lane='WC.48_0', gap=-3.83, time=981.00, stage=laneChange.
Warning: Vehicle 'veh.48' collision with person 'pWE.47', lane=':C_9_0', gap=-0.79, time=499.00, stage=move.
Warning: Vehicle 'veh.73' collision with person 'pWE.71', lane='WC.48_0', gap=-9.83, time=767.00, stage=move.
Warning: Vehicle 'veh.77' collision with person 'pWE.72', lane='WC.48_0', gap=-5.60, time=773.00, stage=move.
Warning: Vehicle 'veh.79' collision with person 'pEW.79', lane='WC.48_0', gap=-6.98, time=825.00, stage=move.
Warning: Vehicle 'veh.79' collision with person 'pWE.79', lane='WC.48_0', gap=-9.85, time=856.00, stage=move.
Warning: Vehicle 'veh.80' collision with person 'pEW.88', lane=':C_9_0', gap=-7.23, time=860.00, stage=move.
Warning: Collision of person 'pEW.92' and person 'pEW.88', lane=':C_9_0', time=869.00.
Warning: Vehicle 'veh.87' collision with person 'pEW.81', lane='WC_0', gap=-6.43, time=869.00, stage=laneChange.
Warning: Collision of person 'pEW.92' and person 'pEW.88', lane=':C_9_0', time=870.00.
Warning: Vehicle 'veh.87' collision with person 'pEW.77', lane='WC_0', gap=-9.78, time=870.00, stage=move.
Warning: Collision of person 'pEW.92' and person 'pEW.88', lane=':C_9_0', time=871.00.
Warning: Collision of person 'pEW.83' and person 'pEW.89', lane=':C_9_0', time=872.00.
Warning: Collision of person 'pEW.92' and person 'pEW.88', lane=':C_9_0', time=872.00.
Warning: Collision of person 'pEW.83' and person 'pEW.89', lane=':C_9_0', time=873.00.
Warning: Collision of person 'pEW.92' and person 'pEW.88', lane=':C_9_0', time=873.00.
Warning: Collision of person 'pEW.83' and person 'pEW.89', lane=':C_9_0', time=874.00.
Warning: Collision of person 'pEW.92' and person 'pEW.88', lane=':C_9_0', time=874.00.
Warning: Collision of person 'pEW.83' and person 'pEW.89', lane=':C_9_0', time=875.00.
Warning: Collision of person 'pEW.92' and person 'pEW.88', lane=':C_9_0', time=875.00.
Warning: Collision of person 'pEW.83' and person 'pEW.89', lane=':C_9_0', time=876.00.
Warning: Collision of person 'pEW.92' and person 'pEW.88', lane=':C_9_0', time=876.00.
Warning: Collision of person 'pEW.82' and person 'pEW.86', lane=':C_9_0', time=877.00.
Warning: Collision of person 'pEW.83' and person 'pEW.89', lane=':C_9_0', time=877.00.
Warning: Collision of person 'pEW.92' and person 'pEW.88', lane=':C_9_0', time=877.00.
Warning: Collision of person 'pEW.82' and person 'pEW.86', lane=':C_9_0', time=878.00.
Warning: Collision of person 'pEW.83' and person 'pEW.89', lane=':C_9_0', time=878.00.
Warning: Collision of person 'pEW.92' and person 'pEW.88', lane=':C_9_0', time=878.00.
Warning: Collision of person 'pEW.82' and person 'pEW.86', lane=':C_9_0', time=879.00.
Warning: Collision of person 'pEW.83' and person 'pEW.89', lane=':C_9_0', time=879.00.
Warning: Collision of person 'pEW.92' and person 'pEW.88', lane=':C_9_0', time=879.00.
Warning: Collision of person 'pEW.82' and person 'pEW.86', lane=':C_9_0', time=880.00.
Warning: Collision of person 'pEW.83' and person 'pEW.89', lane=':C_9_0', time=880.00.
Warning: Collision of person 'pEW.92' and person 'pEW.88', lane=':C_9_0', time=880.00.
Warning: Collision of person 'pEW.82' and person 'pEW.86', lane=':C_9_0', time=881.00.
Warning: Collision of person 'pEW.83' and person 'pEW.89', lane=':C_9_0', time=881.00.
Warning: Collision of person 'pEW.92' and person 'pEW.88', lane=':C_9_0', time=881.00.
Warning: Vehicle 'veh.94' collision with person 'pWE.90', lane='WC.48_0', gap=-2.20, time=943.00, stage=laneChange.
Warning: Vehicle 'veh.91' collision with person 'pWE.87', lane='WC.48_0', gap=-0.08, time=947.00, stage=move.
Warning: Collision of person 'pWE.85' and person 'pWE.87', lane='WC.48_0', time=949.00.
Warning: Collision of person 'pWE.85' and person 'pWE.87', lane='WC.48_0', time=950.00.
Warning: Collision of person 'pWE.85' and person 'pWE.87', lane='WC.48_0', time=951.00.
Warning: Collision of person 'pEW.92' and person 'pEW.91', lane=':C_9_0', time=951.00.
Warning: Collision of person 'pWE.85' and person 'pWE.87', lane='WC.48_0', time=952.00.
Warning: Collision of person 'pEW.92' and person 'pEW.91', lane=':C_9_0', time=952.00.
Warning: Collision of person 'pEW.92' and person 'pEW.91', lane=':C_9_0', time=953.00.
Warning: Collision of person 'pEW.92' and person 'pEW.91', lane=':C_9_0', time=954.00.
Warning: Collision of person 'pEW.92' and person 'pEW.91', lane=':C_9_0', time=955.00.
Warning: Collision of person 'pEW.92' and person 'pEW.91', lane=':C_9_0', time=956.00.
Warning: Collision of person 'pEW.92' and person 'pEW.91', lane=':C_9_0', time=957.00.
Warning: Collision of person 'pEW.92' and person 'pEW.88', lane='WC.48_0', time=988.00.
18 changes: 9 additions & 9 deletions tests/sumo/pedestrian_model/striping/block_vehicles_sharedspace/complex_sublane/output.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
Loading net-file from 'net2.net.xml' ... done (3ms).
Loading done.
Simulation version v1_11_0+0189-7be604757dc started with time: 0.00
Simulation version v1_13_0+0013-5f7506c started with time: 0.00
Simulation ended at time: 1000.00
Reason: The final simulation step has been reached.
Performance:
Duration: 0.46s
Real time factor: 2164.5
UPS: 13930.735931
UPS-Persons: 86270.562771
Duration: 0.16s
Real time factor: 6329.11
UPS: 41183.544304
UPS-Persons: 257462.025316
Vehicles:
Inserted: 105
Running: 9
Running: 8
Waiting: 0
Teleports: 0 (Collisions: 19)
Persons:
Inserted: 742
Running: 43
Running: 58

DijkstraRouter answered 220 queries and explored 69.32 edges on average.
DijkstraRouter spent 0.01s answering queries (0.02ms on average).
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
DijkstraRouter answered 105 queries and explored 6.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.01ms on average).
DijkstraRouter spent 0.00s answering queries (0.00ms on average).

0 comments on commit 0393fcd

Please sign in to comment.