restoring gzipped files when under test and using collate_script to e…

…nsure comparability by texttest. refs eclipse-sumo#21, eclipse-sumo#7713
PASSIONDFIRE · Sep 14, 2022 · 977fd4a · 977fd4a
1 parent b59318f
commit 977fd4a
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 69 deletions.
diff --git a/tests/tools/config.tools b/tests/tools/config.tools
@@ -169,7 +169,7 @@ xmlstats1:001/stats.xml
 xmlstats1:1.stats.xml
 xmlstats2:2.stats.xml
 xmlstats3:3.stats.xml
-osmimport:*/osm.net.xml
+osmimport:*/osm.net.xml.gz
 osmstops:*/osm_stops.add.xml
 osmlines:*/osm_ptlines.xml
 ptroutes:*/osm_pt.rou.xml
@@ -204,6 +204,9 @@ gtfs_routes:gtfs_pt_vehicles.add.xml
 gtfs_additional:gtfs_pt_stops.add.xml
 aggregatebattery:aggregatebattery.xml
 
+[collate_script]
+osmimport:$SUMO_HOME/tests/unzip.py
+
 [run_dependent_text]
 output:Begin time
 output:End time

diff --git a/tests/tools/import/OSM/webWizard/osmbatch.tools b/tests/tools/import/OSM/webWizard/osmbatch.tools
@@ -1,6 +1,6 @@
 #!/bin/bash
-python "$SUMO_HOME/tools/ptlines2flows.py" -n osm.net.xml -e 900 -p 600 --random-begin --seed 42 --ptstops osm_stops.add.xml --ptlines osm_ptlines.xml -o osm_pt.rou.xml --ignore-errors --vtype-prefix pt_ --stopinfos-file stopinfos.xml --routes-file vehroutes.xml --trips-file trips.trips.xml --min-stops 0 --extend-to-fringe --verbose
-python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml --fringe-factor 1 --insertion-density 4 -o osm.pedestrian.trips.xml -r osm.pedestrian.rou.xml -e 900 --vehicle-class pedestrian --prefix ped --persontrips --trip-attributes "modes=\"public\"" --additional-files osm_stops.add.xml,osm_pt.rou.xml --persontrip.walk-opposite-factor 0.8
-python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml --fringe-factor 2 --insertion-density 2 -o osm.bicycle.trips.xml -r osm.bicycle.rou.xml -e 900 --trip-attributes "departLane=\"best\"" --fringe-start-attributes "departSpeed=\"max\"" --validate --remove-loops --vehicle-class bicycle --vclass bicycle --prefix bike --max-distance 8000
-python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml --fringe-factor 5 --insertion-density 6 -o osm.passenger.trips.xml -r osm.passenger.rou.xml -e 900 --trip-attributes "departLane=\"best\"" --fringe-start-attributes "departSpeed=\"max\"" --validate --remove-loops --vehicle-class passenger --vclass passenger --prefix veh --min-distance 300 --min-distance.fringe 0 --allow-fringe.min-length 1000 --lanes
-python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml --fringe-factor 40 --insertion-density 1 -o osm.ship.trips.xml -r osm.ship.rou.xml -e 900 --vehicle-class ship --vclass ship --prefix ship --fringe-start-attributes "departSpeed=\"max\"" --validate
+python "$SUMO_HOME/tools/ptlines2flows.py" -n osm.net.xml.gz -e 900 -p 600 --random-begin --seed 42 --ptstops osm_stops.add.xml --ptlines osm_ptlines.xml -o osm_pt.rou.xml --ignore-errors --vtype-prefix pt_ --stopinfos-file stopinfos.xml --routes-file vehroutes.xml --trips-file trips.trips.xml --min-stops 0 --extend-to-fringe --verbose
+python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 1 --insertion-density 4 -o osm.pedestrian.trips.xml -r osm.pedestrian.rou.xml -e 900 --vehicle-class pedestrian --prefix ped --persontrips --trip-attributes "modes=\"public\"" --additional-files osm_stops.add.xml,osm_pt.rou.xml --persontrip.walk-opposite-factor 0.8
+python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 2 --insertion-density 2 -o osm.bicycle.trips.xml -r osm.bicycle.rou.xml -e 900 --trip-attributes "departLane=\"best\"" --fringe-start-attributes "departSpeed=\"max\"" --validate --remove-loops --vehicle-class bicycle --vclass bicycle --prefix bike --max-distance 8000
+python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 5 --insertion-density 6 -o osm.passenger.trips.xml -r osm.passenger.rou.xml -e 900 --trip-attributes "departLane=\"best\"" --fringe-start-attributes "departSpeed=\"max\"" --validate --remove-loops --vehicle-class passenger --vclass passenger --prefix veh --min-distance 300 --min-distance.fringe 0 --allow-fringe.min-length 1000 --lanes
+python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 40 --insertion-density 1 -o osm.ship.trips.xml -r osm.ship.rou.xml -e 900 --vehicle-class ship --vclass ship --prefix ship --fringe-start-attributes "departSpeed=\"max\"" --validate
diff --git a/tests/tools/import/OSM/webWizard/osmimport.tools b/tests/tools/import/OSM/webWizard/osmimport.tools
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-09-13 16:54:27 by Eclipse SUMO netconvert Version v1_14_1+0990-ad3506bf07c
+<!-- generated on 2022-09-14 10:18:20 by Eclipse SUMO netconvert Version v1_14_1+1010-b8e21c2f0f7
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
         <type-files value="/home/kobo/dlr/sumo/data/typemap/osmNetconvert.typ.xml,/home/kobo/dlr/sumo/data/typemap/osmNetconvertUrbanDe.typ.xml,/home/kobo/dlr/sumo/data/typemap/osmNetconvertPedestrians.typ.xml,/home/kobo/dlr/sumo/data/typemap/osmNetconvertShips.typ.xml,/home/kobo/dlr/sumo/data/typemap/osmNetconvertBicycle.typ.xml"/>
-        <osm-files value="/home/kobo/.texttest/tmp/tools.13Sep165410.1165510/tools/import/OSM/webWizard/osm_bbox.osm.xml"/>
+        <osm-files value="/home/kobo/.texttest/tmp/tools.14Sep101814.1195674/tools/import/OSM/webWizard/osm_bbox.osm.xml"/>
     </input>
 
     <output>
-        <output-file value="osm.net.xml"/>
+        <output-file value="osm.net.xml.gz"/>
         <output.street-names value="true"/>
         <output.original-names value="true"/>
         <ptstop-output value="osm_stops.add.xml"/>
@@ -83035,3 +83035,4 @@
     <connection from=":cluster_611334710_611335401_w1" to=":cluster_611334710_611335401_c0" fromLane="0" toLane="0" dir="s" state="m"/>
     <connection from=":cluster_611334710_611335401_w1" to="-23809670#5" fromLane="0" toLane="0" dir="s" state="M"/>
 </net>
+