added tests refs #21, #16077

eclipse-sumo · Jan 23, 2025 · d4b31ae · d4b31ae
1 parent 6244952
commit d4b31ae
Show file tree

Hide file tree

Showing 6 changed files with 126 additions and 0 deletions.
diff --git a/tests/tools/trip/randomTrips/marouter_flows/errors.tools b/tests/tools/trip/randomTrips/marouter_flows/errors.tools
diff --git a/tests/tools/trip/randomTrips/marouter_flows/options.tools b/tests/tools/trip/randomTrips/marouter_flows/options.tools
@@ -0,0 +1,3 @@
+-n net2.net.xml -s 42 --fringe-factor 1000 -e 10 -r out.rou.xml
+--flows 2
+--marouter
diff --git a/tests/tools/trip/randomTrips/marouter_flows/output.tools b/tests/tools/trip/randomTrips/marouter_flows/output.tools
@@ -0,0 +1,2 @@
+calling /scr1/sumo/bin/duarouter -n net2.net.xml -r NUL --ignore-errors --begin 0 --end 10 --no-step-log --no-warnings -o out.rou.xml
+Success.
diff --git a/tests/tools/trip/randomTrips/marouter_flows/routes.tools b/tests/tools/trip/randomTrips/marouter_flows/routes.tools
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2025-01-23 17:27:10.284420 by randomTrips.py v1_21_0+1998-8c1b6d1bcd5
+<configuration>
+    <net-file value="net2.net.xml"/>
+    <route-file value="out.rou.xml"/>
+    <fringe-factor value="1000"/>
+    <marouter value="True"/>
+    <end value="10.0"/>
+    <flows value="2"/>
+</configuration>
+-->
+
+<!-- generated on 2025-01-23 17:27:10 by Eclipse SUMO marouter Version v1_21_0+1996-d77561bb29a
+<marouterConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/marouterConfiguration.xsd">
+
+    <input>
+        <net-file value="net2.net.xml"/>
+        <route-files value="trips.trips.xml"/>
+    </input>
+
+    <output>
+        <output-file value="out.rou.xml"/>
+    </output>
+
+    <time>
+        <begin value="0"/>
+        <end value="10.0"/>
+    </time>
+
+    <report>
+        <no-warnings value="true"/>
+        <ignore-errors value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</marouterConfiguration>
+-->
+
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+    <vehicle id="0" depart="0.00" departLane="free" departSpeed="max">
+        <routeDistribution>
+            <route cost="126.60" probability="9.00000000" edges="beg middle end rend"/>
+            <route cost="126.61" probability="1.00000000" edges="beg beg2left left left2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+    <vehicle id="1" depart="0.00" departLane="free" departSpeed="max">
+        <routeDistribution>
+            <route cost="126.60" probability="9.00000000" edges="beg middle end rend"/>
+            <route cost="126.61" probability="1.00000000" edges="beg beg2left left left2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+    <vehicle id="0.1" depart="2.00" departLane="free" departSpeed="max">
+        <routeDistribution>
+            <route cost="126.60" probability="9.00000000" edges="beg middle end rend"/>
+            <route cost="126.61" probability="1.00000000" edges="beg beg2left left left2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+    <vehicle id="1.1" depart="2.00" departLane="free" departSpeed="max">
+        <routeDistribution>
+            <route cost="126.60" probability="9.00000000" edges="beg middle end rend"/>
+            <route cost="126.61" probability="1.00000000" edges="beg beg2left left left2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+    <vehicle id="0.2" depart="4.00" departLane="free" departSpeed="max">
+        <routeDistribution>
+            <route cost="126.60" probability="9.00000000" edges="beg middle end rend"/>
+            <route cost="126.61" probability="1.00000000" edges="beg beg2left left left2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+    <vehicle id="1.2" depart="4.00" departLane="free" departSpeed="max">
+        <routeDistribution>
+            <route cost="126.60" probability="9.00000000" edges="beg middle end rend"/>
+            <route cost="126.61" probability="1.00000000" edges="beg beg2left left left2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+    <vehicle id="0.3" depart="6.00" departLane="free" departSpeed="max">
+        <routeDistribution>
+            <route cost="126.60" probability="9.00000000" edges="beg middle end rend"/>
+            <route cost="126.61" probability="1.00000000" edges="beg beg2left left left2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+    <vehicle id="1.3" depart="6.00" departLane="free" departSpeed="max">
+        <routeDistribution>
+            <route cost="126.60" probability="9.00000000" edges="beg middle end rend"/>
+            <route cost="126.61" probability="1.00000000" edges="beg beg2left left left2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+    <vehicle id="0.4" depart="8.00" departLane="free" departSpeed="max">
+        <routeDistribution>
+            <route cost="126.60" probability="9.00000000" edges="beg middle end rend"/>
+            <route cost="126.61" probability="1.00000000" edges="beg beg2left left left2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+    <vehicle id="1.4" depart="8.00" departLane="free" departSpeed="max">
+        <routeDistribution>
+            <route cost="126.60" probability="9.00000000" edges="beg middle end rend"/>
+            <route cost="126.61" probability="1.00000000" edges="beg beg2left left left2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+</routes>
diff --git a/tests/tools/trip/randomTrips/marouter_flows/trips.tools b/tests/tools/trip/randomTrips/marouter_flows/trips.tools
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2025-01-23 17:27:10.251258 by randomTrips.py v1_21_0+1998-8c1b6d1bcd5
+<configuration>
+    <net-file value="net2.net.xml"/>
+    <route-file value="out.rou.xml"/>
+    <fringe-factor value="1000"/>
+    <marouter value="True"/>
+    <end value="10.0"/>
+    <flows value="2"/>
+</configuration>
+-->
+
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+    <flow id="0" begin="0" end="10" period="2" from="beg" to="rend"/>
+    <flow id="1" begin="0" end="10" period="2" from="beg" to="rend"/>
+</routes>
diff --git a/tests/tools/trip/randomTrips/testsuite.tools b/tests/tools/trip/randomTrips/testsuite.tools
@@ -37,6 +37,9 @@ random-routing-factor
 # call marouter instead of duarouter
 marouter
 
+# call marouter instead of duarouter
+marouter_flows
+
 # consider vehicle class when picking source- and destination edges if option --vclass is used
 vclass
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		calling /scr1/sumo/bin/duarouter -n net2.net.xml -r NUL --ignore-errors --begin 0 --end 10 --no-step-log --no-warnings -o out.rou.xml
		Success.