changing from the white-space to the comma in the conf file to work w…

…ith the development version of sumo
lcodeca · Mar 16, 2018 · 6ab45a6 · 6ab45a6
1 parent b6a2150
commit 6ab45a6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/generation/routes.person.duacfg b/generation/routes.person.duacfg
@@ -23,8 +23,8 @@
 
     <input>
         <net-file value="../scenario/in/most.net.xml"/>
-        <route-files value="out/most.buses.flows.xml out/most.trains.flows.xml out/most.pedestrian.trips.xml"/>
-        <additional-files value="../scenario/in/add/most.busstops.add.xml ../scenario/in/add/most.trainstops.add.xml ../scenario/in/add/most.parkings.add.xml ../scenario/in/add/basic.vType.xml"/>
+        <route-files value="out/most.buses.flows.xml,out/most.trains.flows.xml,out/most.pedestrian.trips.xml"/>
+        <additional-files value="../scenario/in/add/most.busstops.add.xml,../scenario/in/add/most.trainstops.add.xml,../scenario/in/add/most.parkings.add.xml,../scenario/in/add/basic.vType.xml"/>
     </input>
 
     <output>

diff --git a/generation/routes.vehicle.duacfg b/generation/routes.vehicle.duacfg
@@ -23,7 +23,7 @@
 
     <input>
         <net-file value="../scenario/in/most.net.xml"/>
-        <additional-files value="../scenario/in/add/most.busstops.add.xml ../scenario/in/add/most.trainstops.add.xml ../scenario/in/add/most.parkings.add.xml ../scenario/in/add/basic.vType.xml"/>
+        <additional-files value="../scenario/in/add/most.busstops.add.xml,../scenario/in/add/most.trainstops.add.xml,../scenario/in/add/most.parkings.add.xml,../scenario/in/add/basic.vType.xml"/>
     </input>
 
     <output>

diff --git a/misc/iter1.fromosm.netcfg b/misc/iter1.fromosm.netcfg
@@ -22,7 +22,7 @@
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
-        <type-files value="typemap/osmNetconvert.typ.xml typemap/osmNetconvertUrbanDe.typ.xml typemap/osmNetconvertPedestrians.typ.xml typemap/osmNetconvertBicycle.typ.xml typemap/osmBidiRailNetconvert.typ.xml"/>
+        <type-files value="typemap/osmNetconvert.typ.xml,typemap/osmNetconvertUrbanDe.typ.xml,typemap/osmNetconvertPedestrians.typ.xml,typemap/osmNetconvertBicycle.typ.xml,typemap/osmBidiRailNetconvert.typ.xml"/>
         <osm-files value="most.raw.osm"/>
     </input>
 

diff --git a/scenario/most.sumocfg b/scenario/most.sumocfg
@@ -23,8 +23,8 @@
 
     <input>
         <net-file value="in/most.net.xml"/>
-        <route-files value="in/route/most.buses.flows.xml in/route/most.trains.flows.xml in/route/most.pedestrian.rou.xml in/route/most.bicycle.rou.xml in/route/most.2wheeler.rou.xml in/route/most.passenger.rou.xml in/route/most.evehicle.rou.xml in/route/most.other.rou.xml in/route/most.gateways.rou.xml"/>
-        <additional-files value="in/add/most.poly.xml in/add/most.busstops.add.xml in/add/most.trainstops.add.xml in/add/most.parkings.add.xml in/add/basic.vType.xml"/>
+        <route-files value="in/route/most.buses.flows.xml,in/route/most.trains.flows.xml,in/route/most.pedestrian.rou.xml,in/route/most.bicycle.rou.xml,in/route/most.2wheeler.rou.xml,in/route/most.passenger.rou.xml,in/route/most.evehicle.rou.xml,in/route/most.other.rou.xml,in/route/most.gateways.rou.xml"/>
+        <additional-files value="in/add/most.poly.xml,in/add/most.busstops.add.xml,in/add/most.trainstops.add.xml,in/add/most.parkings.add.xml,in/add/basic.vType.xml"/>
     </input>
 
     <time>