added test refs #14205, #21

eclipse-sumo · Apr 12, 2024 · 59b2744 · 59b2744
1 parent 64526dd
commit 59b2744
Show file tree

Hide file tree

Showing 13 changed files with 167 additions and 0 deletions.
diff --git a/tests/complex/traci/misc/rerouting/rerouter_routingMode/input_additional.add.xml b/tests/complex/traci/misc/rerouting/rerouter_routingMode/input_additional.add.xml
@@ -0,0 +1,11 @@
+<?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">
+    <!-- rerouter notification should not impact vehicle behavior -->
+    <rerouter id="rr" edges="end">
+        <interval begin="1" end="3600">
+            <closingReroute id="middle" allow="authority"/>
+            <closingReroute id="middle2" allow="authority"/>
+        </interval>
+    </rerouter>
+</additional>
diff --git a/...omplex/traci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_default/errors.complex b/...omplex/traci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_default/errors.complex
diff --git a/...mplex/traci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_default/options.complex b/...mplex/traci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_default/options.complex
@@ -0,0 +1 @@
+tests/complex/traci/misc/rerouting/rerouter_routingMode/runner.py
diff --git a/...omplex/traci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_default/output.complex b/...omplex/traci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_default/output.complex
@@ -0,0 +1 @@
+ Retrying in 1 seconds
diff --git a/...lex/traci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_default/vehroutes.complex b/...lex/traci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_default/vehroutes.complex
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-04-12 09:39:20 by Eclipse SUMO sumo Version v1_19_0+1795-64526dd6675
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="input_net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+        <additional-files value="input_additional.add.xml"/>
+    </input>
+
+    <output>
+        <vehroute-output value="vehroutes.xml"/>
+    </output>
+
+    <processing>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+    <traci_server>
+        <remote-port value="36709"/>
+    </traci_server>
+
+</configuration>
+-->
+
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+    <vehicle id="ego" depart="0.00" arrival="46.00">
+        <routeDistribution>
+            <route replacedOnEdge="beg" reason="traci:rerouteTraveltime" replacedAtTime="2.00" probability="0" edges="beg middle2 end"/>
+            <route edges="beg middle3 end"/>
+        </routeDistribution>
+    </vehicle>
+
+</routes>
diff --git a/...traci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_ignoreRerouter/errors.complex b/...traci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_ignoreRerouter/errors.complex
@@ -0,0 +1,2 @@
+Warning: Teleporting vehicle 'ego'; waited too long (wrong lane), lane='beg_0', time=312.00.
+Warning: Vehicle 'ego' ends teleporting on edge 'end', time=321.00.
diff --git a/...raci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_ignoreRerouter/options.complex b/...raci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_ignoreRerouter/options.complex
@@ -0,0 +1 @@
+ignore_transient tests/complex/traci/misc/rerouting/rerouter_routingMode/runner.py
diff --git a/...traci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_ignoreRerouter/output.complex b/...traci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_ignoreRerouter/output.complex
@@ -0,0 +1 @@
+ Retrying in 1 seconds
diff --git a/...ci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_ignoreRerouter/vehroutes.complex b/...ci/misc/rerouting/rerouter_routingMode/rerouteTraveltime_ignoreRerouter/vehroutes.complex
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-04-12 09:40:54 by Eclipse SUMO sumo Version v1_19_0+1795-64526dd6675
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="input_net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+        <additional-files value="input_additional.add.xml"/>
+    </input>
+
+    <output>
+        <vehroute-output value="vehroutes.xml"/>
+    </output>
+
+    <processing>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+    <traci_server>
+        <remote-port value="59203"/>
+    </traci_server>
+
+</configuration>
+-->
+
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+    <vehicle id="ego" depart="0.00" arrival="328.00">
+        <routeDistribution>
+            <route replacedOnEdge="beg" reason="traci:rerouteTraveltime" replacedAtTime="2.00" probability="0" edges="beg middle2 end"/>
+            <route edges="beg middle end"/>
+        </routeDistribution>
+    </vehicle>
+
+</routes>
diff --git a/tests/complex/traci/misc/rerouting/rerouter_routingMode/runner.py b/tests/complex/traci/misc/rerouting/rerouter_routingMode/runner.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+# Copyright (C) 2008-2024 German Aerospace Center (DLR) and others.
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# https://www.eclipse.org/legal/epl-2.0/
+# This Source Code may also be made available under the following Secondary
+# Licenses when the conditions for such availability set forth in the Eclipse
+# Public License 2.0 are satisfied: GNU General Public License, version 2
+# or later which is available at
+# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+
+# @file    runner.py
+# @author  Jakob Erdmann
+# @date    2017-01-23
+
+
+from __future__ import print_function
+from __future__ import absolute_import
+import os
+import sys
+
+if "SUMO_HOME" in os.environ:
+    sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
+import traci  # noqa
+import sumolib  # noqa
+
+traci.start([sumolib.checkBinary('sumo'),'-c', 'sumo.sumocfg'])
+traci.simulationStep()
+traci.simulationStep()
+for vehID in traci.vehicle.getIDList():
+    if "ignore_transient" in sys.argv:
+        traci.vehicle.setRoutingMode(vehID, traci.constants.ROUTING_MODE_IGNORE_TRANSIENT_PERMISSIONS)
+    traci.vehicle.rerouteTraveltime(vehID)
+
+while traci.simulation.getMinExpectedNumber() > 0:
+    traci.simulationStep()
+traci.close()
diff --git a/tests/complex/traci/misc/rerouting/rerouter_routingMode/sumo.sumocfg b/tests/complex/traci/misc/rerouting/rerouter_routingMode/sumo.sumocfg
@@ -0,0 +1,22 @@
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="input_net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+        <additional-files value="input_additional.add.xml"/>
+    </input>
+
+    <processing>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+    <output>
+        <vehroute-output value="vehroutes.xml"/>
+    </output>
+
+</configuration>
diff --git a/tests/complex/traci/misc/rerouting/rerouter_routingMode/testsuite.complex b/tests/complex/traci/misc/rerouting/rerouter_routingMode/testsuite.complex
@@ -0,0 +1,5 @@
+# Copy of rerouteTraveltime_default
+rerouteTraveltime_default
+
+# ignore permission changes by rerouter
+rerouteTraveltime_ignoreRerouter
diff --git a/tests/complex/traci/misc/rerouting/testsuite.complex b/tests/complex/traci/misc/rerouting/testsuite.complex
@@ -17,6 +17,9 @@ rerouteParkingArea_undeparted
 # tests for behavior when using setRoutingMode
 routingMode
 
+# interaction between transient permission changes (closingReroute) and routingMode
+rerouter_routingMode
+
 # rerouting person
 person
 findIntermodalRoute