Skip to content

Commit

Permalink
adapting tests #2
Browse files Browse the repository at this point in the history
  • Loading branch information
behrisch committed Dec 9, 2022
1 parent 1c33096 commit 218dd9a
Show file tree
Hide file tree
Showing 57 changed files with 3,314 additions and 624 deletions.
6 changes: 3 additions & 3 deletions tests/tsc/data/twoPersonsOnly.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
p_id,hh_id,start_time_min,mode,lon_start,lat_start,lon_end,lat_end,travel_time_sec,taz_id_start,taz_id_end,activity_duration_min,car_type,is_restricted,sumo_type
1000005,1000001,817,2,13.380531,52.514820,13.461528,52.524022,684.152223469,110110312,110311212,10,16,False,medium_passenger_gasoline
1000005,1000001,850,2,13.461528,52.524022,13.380531,52.514820,607.976480667,110110212,110311312,830,16,False,medium_passenger_gasoline
1000019,1000003,813,2,13.378419,52.511280,13.458323,52.524985,720.941161084,110110312,110311212,25,1,False,small_passenger_gasoline
1000019,1000003,850,2,13.458323,52.524985,13.378419,52.511280,816.11969581,110110312,110311212,840,1,False,small_passenger_gasoline
1000005,1000001,850,2,13.461528,52.524022,13.380531,52.514820,607.976480667,110311212,110110312,830,16,False,medium_passenger_gasoline
1000019,1000003,813,2,13.378419,52.511280,13.458323,52.524985,720.941161084,110110311,110311212,25,1,False,small_passenger_gasoline
1000019,1000003,850,2,13.458323,52.524985,13.378419,52.511280,816.11969581,110311212,110110311,840,1,False,small_passenger_gasoline
6 changes: 3 additions & 3 deletions tests/tsc/data/twoPersonsOnly_sharing.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
p_id,hh_id,start_time_min,mode,lon_start,lat_start,lon_end,lat_end,travel_time_sec,taz_id_start,taz_id_end,activity_duration_min,car_type,is_restricted,sumo_type
1000005,1000001,817,6,13.380531,52.514820,13.461528,52.524022,684.152223469,110110312,110311212,10,16,False,medium_passenger_gasoline
1000005,1000001,850,6,13.461528,52.524022,13.380531,52.514820,607.976480667,110110312,110311212,830,16,False,medium_passenger_gasoline
1000019,1000003,813,6,13.378419,52.511280,13.458323,52.524985,720.941161084,110110312,110311212,25,1,False,small_passenger_gasoline
1000019,1000003,850,6,13.458323,52.524985,13.378419,52.511280,816.11969581,110110312,110311212,840,1,False,small_passenger_gasoline
1000005,1000001,850,6,13.461528,52.524022,13.380531,52.514820,607.976480667,110311212,110110312,830,16,False,medium_passenger_gasoline
1000019,1000003,813,6,13.378419,52.511280,13.458323,52.524985,720.941161084,110110311,110311212,25,1,False,small_passenger_gasoline
1000019,1000003,850,6,13.458323,52.524985,13.378419,52.511280,816.11969581,110311212,110110311,840,1,False,small_passenger_gasoline
5 changes: 5 additions & 0 deletions tests/tsc/data/twoPersonsOnly_walking.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
p_id,hh_id,start_time_min,mode,lon_start,lat_start,lon_end,lat_end,travel_time_sec,taz_id_start,taz_id_end,activity_duration_min,car_type,is_restricted,sumo_type
1000005,1000001,817,0,13.380531,52.514820,13.461528,52.524022,684.152223469,110110312,110311212,10,16,False,medium_passenger_gasoline
1000005,1000001,850,0,13.461528,52.524022,13.380531,52.514820,607.976480667,110311212,110110312,830,16,False,medium_passenger_gasoline
1000019,1000003,813,0,13.378419,52.511280,13.458323,52.524985,720.941161084,110110311,110311212,25,1,False,small_passenger_gasoline
1000019,1000003,850,0,13.458323,52.524985,13.378419,52.511280,816.11969581,110311212,110110311,840,1,False,small_passenger_gasoline
5 changes: 5 additions & 0 deletions tests/tsc/data/twoPersonsWrongTaz.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
p_id,hh_id,start_time_min,mode,lon_start,lat_start,lon_end,lat_end,travel_time_sec,taz_id_start,taz_id_end,activity_duration_min,car_type,is_restricted,sumo_type
1000005,1000001,817,2,13.380531,52.514820,13.461528,52.524022,684.152223469,110110312,110311212,10,16,False,medium_passenger_gasoline
1000005,1000001,850,2,13.461528,52.524022,13.380531,52.514820,607.976480667,110110212,110311312,830,16,False,medium_passenger_gasoline
1000019,1000003,813,2,13.378419,52.511280,13.458323,52.524985,720.941161084,110110312,110311212,25,1,False,small_passenger_gasoline
1000019,1000003,850,2,13.458323,52.524985,13.378419,52.511280,816.11969581,110110312,110311212,840,1,False,small_passenger_gasoline
66 changes: 66 additions & 0 deletions tests/tsc/template/sharing/catalogue.tsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
The following new files/directories were created:
<Test Directory>
----__pycache__
--------tscdefs.cpython-310.pyc
----core.db
----data
--------tsc.log
--------scenario_workdir
------------mitte_net
----------------Berlin_1223.taz.xml
----------------RBS_OD_ORT_1412.taz.xml
----------------bidi.taz.xml
----------------districts.taz.xml
----------------net.net.xml
----------------vtypes.xml
----------------iteration000
--------------------emission_routes.xml
--------------------emissions.sumo.log
--------------------emissions.sumocfg
--------------------person_tripinfo.xml
--------------------persons.sumo.log
--------------------persons.sumocfg
--------------------persons.xml
--------------------allpairs
------------------------aggregated_oneshot_meso.xml
------------------------all_pairs_passenger24.csv
------------------------all_pairs_public.csv
------------------------mapped_all_pairs_passenger24.csv
------------------------mapped_all_pairs_public.csv
------------------------miv_all_pairs_passenger24.trips.duarcfg
------------------------miv_all_pairs_passenger24.trips.log
------------------------miv_all_pairs_passenger24.trips.rou.xml.gz
------------------------miv_all_pairs_passenger24.trips.xml
------------------------miv_all_pairs_public.trips.duarcfg
------------------------miv_all_pairs_public.trips.log
------------------------miv_all_pairs_public.trips.rou.xml.gz
------------------------miv_all_pairs_public.trips.xml
------------------------rectified_all_pairs_passenger24.csv
------------------------rectified_all_pairs_public.csv
------------------------t2s_map_all_pairs_passenger24.log
------------------------t2s_map_all_pairs_public.log
--------------------oneshot
------------------------aggregated_oneshot_meso.xml
------------------------dump_oneshot_meso.xml
------------------------oneshot_meso.sumo.log
------------------------oneshot_meso.sumocfg
------------------------state_0.00.xml.gz
------------------------state_3600.00.xml.gz
------------------------state_7200.00.xml.gz
------------------------summary.xml.gz
------------------------vehroutes_oneshot_meso.rou.xml
--------------------trips
------------------------emission_types.xml
------------------------mapped_twoPersonsOnly_sharing.csv
------------------------miv_twoPersonsOnly_sharing.trips.xml
------------------------rectified_twoPersonsOnly_sharing.csv
------------------------t2s_map_twoPersonsOnly_sharing.log
------------------------t2s_rectify_twoPersonsOnly_sharing.log
--------test_templates
------------__pycache__
----------------__init__.cpython-310.pyc
------------mitte_net
----------------__pycache__
--------------------__init__.cpython-310.pyc
----public.db
----tmp.db
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<vType id="taxi" vClass="taxi">
<param key="has.taxi.device" value="true"/>
</vType>
<trip id="taxi_busStop_0_0" type="taxi" depart="0.00"><stop busStop="busStop_0" triggered="person"/></trip>
<trip id="taxi_busStop_0_1" type="taxi" depart="0.00"><stop busStop="busStop_0" triggered="person"/></trip>
</additional>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<busStop id="busStop_0" name="Rosenthaler" lane="740848375_1" startPos="2.83" endPos="22.83"/>
</additional>
20 changes: 20 additions & 0 deletions tests/tsc/template/sharing/errors.tsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Warning: Traffic light type 'actuated' cannot be used in mesoscopic simulation. Using 'static' as fallback.
Warning: Network contains internal links which are ignored. Vehicles will 'jump' across junctions and thus underestimate route lengths and travel times.
Warning: At actuated tlLogic 'GS_25663498', linkIndex 2 has no controlling detector.
Warning: At actuated tlLogic 'GS_25663498', linkIndex 3 has no controlling detector.
Warning: At actuated tlLogic 'GS_25663747', linkIndex 10 has no controlling detector.
Warning: At actuated tlLogic 'GS_25663747', linkIndex 11 has no controlling detector.
Warning: At actuated tlLogic 'GS_cluster_1679221141_1679221142_29271704_29271705', linkIndex 6 has no controlling detector.
Warning: At actuated tlLogic 'GS_cluster_1679221141_1679221142_29271704_29271705', linkIndex 7 has no controlling detector.
Warning: At actuated tlLogic 'GS_cluster_196725581_21487224_29219437_29219438', linkIndex 17 has no controlling detector.
Warning: At actuated tlLogic 'GS_cluster_196725581_21487224_29219437_29219438', linkIndex 18 has no controlling detector.
Warning: At actuated tlLogic 'GS_cluster_262476527_311718989_588159289', linkIndex 12 has no controlling detector.
Warning: At actuated tlLogic 'GS_cluster_262476527_311718989_588159289', linkIndex 13 has no controlling detector.
Warning: At actuated tlLogic 'GS_cluster_964750391_971891590', linkIndex 6 has no controlling detector.
Warning: At actuated tlLogic 'GS_cluster_964750391_971891590', linkIndex 7 has no controlling detector.
Warning: At actuated tlLogic 'cluster_1857304353_29784556_29784557_343372788', linkIndex 6 has no controlling detector.
Warning: At actuated tlLogic 'cluster_1857304353_29784556_29784557_343372788', linkIndex 7 has no controlling detector.
Warning: At actuated tlLogic 'cluster_262471375_343590422_3730313106', linkIndex 5 has no controlling detector.
Warning: At actuated tlLogic 'cluster_262471375_343590422_3730313106', linkIndex 6 has no controlling detector.
Warning: Traffic light type 'actuated' cannot be used in mesoscopic simulation. Using 'static' as fallback.
Warning: Network contains internal links which are ignored. Vehicles will 'jump' across junctions and thus underestimate route lengths and travel times.
Loading

0 comments on commit 218dd9a

Please sign in to comment.