From abcb09e86c01f1f50c9278fc316b6571429228b6 Mon Sep 17 00:00:00 2001
From: namdre <jakob.erdmann@dlr.de>
Date: Mon, 2 Jul 2018 09:06:20 +0200
Subject: [PATCH] added test refs #4031

---
 .../rerouter/routeProb_type/errors.sumo       |   0
 .../routeProb_type/input_additional.add.xml   |   7 +
 .../routeProb_type/input_definition.def.xml   |   7 +
 .../routeProb_type/input_routes.rou.xml       |   9 ++
 .../rerouter/routeProb_type/options.sumo      |   1 +
 .../rerouter/routeProb_type/output.sumo       |   0
 .../rerouter/routeProb_type/vehroutes.sumo    | 146 ++++++++++++++++++
 tests/sumo/extended/rerouter/testsuite.sumo   |   5 +-
 8 files changed, 174 insertions(+), 1 deletion(-)
 create mode 100644 tests/sumo/extended/rerouter/routeProb_type/errors.sumo
 create mode 100644 tests/sumo/extended/rerouter/routeProb_type/input_additional.add.xml
 create mode 100644 tests/sumo/extended/rerouter/routeProb_type/input_definition.def.xml
 create mode 100644 tests/sumo/extended/rerouter/routeProb_type/input_routes.rou.xml
 create mode 100644 tests/sumo/extended/rerouter/routeProb_type/options.sumo
 create mode 100644 tests/sumo/extended/rerouter/routeProb_type/output.sumo
 create mode 100644 tests/sumo/extended/rerouter/routeProb_type/vehroutes.sumo

diff --git a/tests/sumo/extended/rerouter/routeProb_type/errors.sumo b/tests/sumo/extended/rerouter/routeProb_type/errors.sumo
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/sumo/extended/rerouter/routeProb_type/input_additional.add.xml b/tests/sumo/extended/rerouter/routeProb_type/input_additional.add.xml
new file mode 100644
index 000000000000..c5be91d5b50b
--- /dev/null
+++ b/tests/sumo/extended/rerouter/routeProb_type/input_additional.add.xml
@@ -0,0 +1,7 @@
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+    <route id="r0" edges="beg middle end rend"/>
+    <route id="r1" edges="beg beg2left left left2end end rend"/>
+    <route id="r2" edges="beg beg2right right right2end end rend"/>
+
+    <rerouter id="rerouter" edges="beg" file="input_definition.def.xml" vTypes="canReroute"/>
+</additional>
diff --git a/tests/sumo/extended/rerouter/routeProb_type/input_definition.def.xml b/tests/sumo/extended/rerouter/routeProb_type/input_definition.def.xml
new file mode 100644
index 000000000000..a624458e9507
--- /dev/null
+++ b/tests/sumo/extended/rerouter/routeProb_type/input_definition.def.xml
@@ -0,0 +1,7 @@
+<rerouter>
+   <interval begin="0" end="86400">
+       <routeProbReroute id="r0" probability="1"/>
+       <routeProbReroute id="r1" probability="1"/>
+       <routeProbReroute id="r2" probability="1"/>
+   </interval>
+</rerouter>
diff --git a/tests/sumo/extended/rerouter/routeProb_type/input_routes.rou.xml b/tests/sumo/extended/rerouter/routeProb_type/input_routes.rou.xml
new file mode 100644
index 000000000000..e071ec9dc1f6
--- /dev/null
+++ b/tests/sumo/extended/rerouter/routeProb_type/input_routes.rou.xml
@@ -0,0 +1,9 @@
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+	<vType id="noReroute" sigma="0"/>
+	<vType id="canReroute" sigma="0"/>
+
+
+    <flow id="noReroute" type="noReroute" begin="0" end="100" number="10" route="r0"/>
+    <flow id="canReroute" type="canReroute" begin="5" end="105" number="10" route="r0"/>
+
+</routes>
diff --git a/tests/sumo/extended/rerouter/routeProb_type/options.sumo b/tests/sumo/extended/rerouter/routeProb_type/options.sumo
new file mode 100644
index 000000000000..26625a829758
--- /dev/null
+++ b/tests/sumo/extended/rerouter/routeProb_type/options.sumo
@@ -0,0 +1 @@
+--no-step-log -b 0 --no-duration-log --net-file=three_split.net.xml --route-files=input_routes.rou.xml --additional-files=input_additional.add.xml --vehroutes=vehroutes.xml
diff --git a/tests/sumo/extended/rerouter/routeProb_type/output.sumo b/tests/sumo/extended/rerouter/routeProb_type/output.sumo
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/sumo/extended/rerouter/routeProb_type/vehroutes.sumo b/tests/sumo/extended/rerouter/routeProb_type/vehroutes.sumo
new file mode 100644
index 000000000000..2b163b9780c9
--- /dev/null
+++ b/tests/sumo/extended/rerouter/routeProb_type/vehroutes.sumo
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Mon Jul  2 09:05:36 2018 by Eclipse SUMO Version 32548ca
+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
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="three_split.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+        <additional-files value="input_additional.add.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <vehroute-output value="vehroutes.xml"/>
+    </output>
+
+    <time>
+        <begin value="0"/>
+    </time>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+    <vehicle id="noReroute.0" type="noReroute" depart="0.00" arrival="95.00">
+        <route edges="beg middle end rend"/>
+    </vehicle>
+
+    <vehicle id="noReroute.1" type="noReroute" depart="10.00" arrival="105.00">
+        <route edges="beg middle end rend"/>
+    </vehicle>
+
+    <vehicle id="canReroute.1" type="canReroute" depart="15.00" arrival="110.00">
+        <routeDistribution>
+            <route replacedOnEdge="beg" reason="rerouter" replacedAtTime="15.00" probability="0" edges="beg middle end rend"/>
+            <route edges="beg middle end rend"/>
+        </routeDistribution>
+    </vehicle>
+
+    <vehicle id="noReroute.2" type="noReroute" depart="20.00" arrival="115.00">
+        <route edges="beg middle end rend"/>
+    </vehicle>
+
+    <vehicle id="canReroute.2" type="canReroute" depart="25.00" arrival="120.00">
+        <routeDistribution>
+            <route replacedOnEdge="beg" reason="rerouter" replacedAtTime="25.00" probability="0" edges="beg middle end rend"/>
+            <route edges="beg middle end rend"/>
+        </routeDistribution>
+    </vehicle>
+
+    <vehicle id="noReroute.3" type="noReroute" depart="30.00" arrival="125.00">
+        <route edges="beg middle end rend"/>
+    </vehicle>
+
+    <vehicle id="noReroute.4" type="noReroute" depart="40.00" arrival="135.00">
+        <route edges="beg middle end rend"/>
+    </vehicle>
+
+    <vehicle id="canReroute.4" type="canReroute" depart="45.00" arrival="140.00">
+        <routeDistribution>
+            <route replacedOnEdge="beg" reason="rerouter" replacedAtTime="45.00" probability="0" edges="beg middle end rend"/>
+            <route edges="beg middle end rend"/>
+        </routeDistribution>
+    </vehicle>
+
+    <vehicle id="noReroute.5" type="noReroute" depart="50.00" arrival="145.00">
+        <route edges="beg middle end rend"/>
+    </vehicle>
+
+    <vehicle id="noReroute.6" type="noReroute" depart="60.00" arrival="155.00">
+        <route edges="beg middle end rend"/>
+    </vehicle>
+
+    <vehicle id="noReroute.7" type="noReroute" depart="70.00" arrival="165.00">
+        <route edges="beg middle end rend"/>
+    </vehicle>
+
+    <vehicle id="noReroute.8" type="noReroute" depart="80.00" arrival="175.00">
+        <route edges="beg middle end rend"/>
+    </vehicle>
+
+    <vehicle id="canReroute.8" type="canReroute" depart="85.00" arrival="180.00">
+        <routeDistribution>
+            <route replacedOnEdge="beg" reason="rerouter" replacedAtTime="85.00" probability="0" edges="beg middle end rend"/>
+            <route edges="beg middle end rend"/>
+        </routeDistribution>
+    </vehicle>
+
+    <vehicle id="noReroute.9" type="noReroute" depart="90.00" arrival="185.00">
+        <route edges="beg middle end rend"/>
+    </vehicle>
+
+    <vehicle id="canReroute.9" type="canReroute" depart="95.00" arrival="190.00">
+        <routeDistribution>
+            <route replacedOnEdge="beg" reason="rerouter" replacedAtTime="95.00" probability="0" edges="beg middle end rend"/>
+            <route edges="beg middle end rend"/>
+        </routeDistribution>
+    </vehicle>
+
+    <vehicle id="canReroute.0" type="canReroute" depart="5.00" arrival="212.00">
+        <routeDistribution>
+            <route replacedOnEdge="beg" reason="rerouter" replacedAtTime="5.00" probability="0" edges="beg middle end rend"/>
+            <route edges="beg beg2right right right2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+
+    <vehicle id="canReroute.3" type="canReroute" depart="35.00" arrival="242.00">
+        <routeDistribution>
+            <route replacedOnEdge="beg" reason="rerouter" replacedAtTime="35.00" probability="0" edges="beg middle end rend"/>
+            <route edges="beg beg2right right right2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+
+    <vehicle id="canReroute.5" type="canReroute" depart="55.00" arrival="262.00">
+        <routeDistribution>
+            <route replacedOnEdge="beg" reason="rerouter" replacedAtTime="55.00" probability="0" edges="beg middle end rend"/>
+            <route edges="beg beg2right right right2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+
+    <vehicle id="canReroute.6" type="canReroute" depart="65.00" arrival="272.00">
+        <routeDistribution>
+            <route replacedOnEdge="beg" reason="rerouter" replacedAtTime="65.00" probability="0" edges="beg middle end rend"/>
+            <route edges="beg beg2right right right2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+
+    <vehicle id="canReroute.7" type="canReroute" depart="75.00" arrival="282.00">
+        <routeDistribution>
+            <route replacedOnEdge="beg" reason="rerouter" replacedAtTime="75.00" probability="0" edges="beg middle end rend"/>
+            <route edges="beg beg2right right right2end end rend"/>
+        </routeDistribution>
+    </vehicle>
+
+</routes>
diff --git a/tests/sumo/extended/rerouter/testsuite.sumo b/tests/sumo/extended/rerouter/testsuite.sumo
index 5f5d5cc85881..552514e4bec4 100644
--- a/tests/sumo/extended/rerouter/testsuite.sumo
+++ b/tests/sumo/extended/rerouter/testsuite.sumo
@@ -16,6 +16,10 @@ closing_and_dest_prob_and_specialDestinations
 # Vehicles that do not drive through the closed area should not be affected
 closing_and_dest_prob_unaffected
 
+# routeProbRreroute that filters by vehicle type
+# 
+routeProb_type
+
 # closing an edge with probability 0.5
 closing_with_prob
 
@@ -52,4 +56,3 @@ closingLane
 
 # closing 2 lanes from a 3-lane road which results in reduced flow and causes some vehicles to reroute
 closingLane_with_rerouting
-