From 487fb82f6d98a5b1cea9077746026cbcf908d453 Mon Sep 17 00:00:00 2001 From: Jakob Erdmann Date: Wed, 20 Mar 2024 07:57:16 +0100 Subject: [PATCH] adding test refs #21, #14552 --- .../traci/edge/setMaxSpeed/errors.complex | 7 ++ .../edge/setMaxSpeed/input_routes.rou.xml | 6 ++ .../traci/edge/setMaxSpeed/options.complex | 1 + .../traci/edge/setMaxSpeed/output.complex | 71 +++++++++++++++++++ .../edge/setMaxSpeed/output.complex.meso | 1 + .../complex/traci/edge/setMaxSpeed/runner.py | 45 ++++++++++++ .../traci/edge/setMaxSpeed/tripinfo.complex | 52 ++++++++++++++ tests/complex/traci/edge/testsuite.complex | 3 + 8 files changed, 186 insertions(+) create mode 100644 tests/complex/traci/edge/setMaxSpeed/errors.complex create mode 100644 tests/complex/traci/edge/setMaxSpeed/input_routes.rou.xml create mode 100644 tests/complex/traci/edge/setMaxSpeed/options.complex create mode 100644 tests/complex/traci/edge/setMaxSpeed/output.complex create mode 100644 tests/complex/traci/edge/setMaxSpeed/output.complex.meso create mode 100755 tests/complex/traci/edge/setMaxSpeed/runner.py create mode 100644 tests/complex/traci/edge/setMaxSpeed/tripinfo.complex diff --git a/tests/complex/traci/edge/setMaxSpeed/errors.complex b/tests/complex/traci/edge/setMaxSpeed/errors.complex new file mode 100644 index 00000000000..dc7192ac69a --- /dev/null +++ b/tests/complex/traci/edge/setMaxSpeed/errors.complex @@ -0,0 +1,7 @@ +Warning: Network contains internal links which are ignored. Vehicles will 'jump' across junctions and thus underestimate route lengths and travel times. +Warning: Teleporting vehicle 'v.17'; waited too long, from edge 'A0A1':0, time=476.63. +Warning: Vehicle 'v.17' ends teleporting on edge 'A2A3':0, time=483.26. +Warning: Teleporting vehicle 'v.18'; waited too long, from edge 'A0A1':0, time=778.30. +Warning: Vehicle 'v.18' ends teleporting on edge 'A2A3':0, time=784.93. +Warning: Teleporting vehicle 'v.19'; waited too long, from edge 'A0A1':0, time=1078.30. +Warning: Vehicle 'v.19' ends teleporting on edge 'A2A3':0, time=1084.93. diff --git a/tests/complex/traci/edge/setMaxSpeed/input_routes.rou.xml b/tests/complex/traci/edge/setMaxSpeed/input_routes.rou.xml new file mode 100644 index 00000000000..6eccad107e0 --- /dev/null +++ b/tests/complex/traci/edge/setMaxSpeed/input_routes.rou.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/tests/complex/traci/edge/setMaxSpeed/options.complex b/tests/complex/traci/edge/setMaxSpeed/options.complex new file mode 100644 index 00000000000..56346ef5f28 --- /dev/null +++ b/tests/complex/traci/edge/setMaxSpeed/options.complex @@ -0,0 +1 @@ +tests/complex/traci/edge/setMaxSpeed/runner.py diff --git a/tests/complex/traci/edge/setMaxSpeed/output.complex b/tests/complex/traci/edge/setMaxSpeed/output.complex new file mode 100644 index 00000000000..e9e696fbf38 --- /dev/null +++ b/tests/complex/traci/edge/setMaxSpeed/output.complex @@ -0,0 +1,71 @@ +step 0 +step 1 +step 2 +edges ('1fi', '1o', '1si', '2fi', '2o', '2si', '3fi', '3o', '3si', '4fi', '4o', '4si', 'taz12-sink', 'taz12-source', 'taz34-sink', 'taz34-source') +edge count 16 +examining 2fi +laneNumber 1 +streetName exampleStreetName1 +adaptedTraveltime -1.0 +effort -1.0 +CO2 4962.098029013955 +CO 148.4043943117062 +HC 0.793287746205698 +PMx 0.10689025015863887 +NOx 2.197042560996833 +Fuel 1582.7018914848818 +Noise 68.96613013111516 +Elec 0.0 +meanSpeed 4.033343723951839 +occupancy 0.02012072434607646 +lastLength 5.0 +traveltime 61.61141152545303 +numVeh 1 +haltVeh 0 +vehIds ('horiz',) +personIds ('p0',) +waiting time 0.0 +angle (with default relative position) 270.0 +angle (with some relative position) 270.0 +checking occupancy with unicode id 0.02012072434607646 +traveltime after adaption 61.61141152545303 +adaptedTraveltime after adaption 42.0 +adaptedTraveltime after adaption in interval (check time 0) 42.0 +adaptedTraveltime after adaption in interval (check time 15) 24.0 +adaptedTraveltime after adaption in interval (check time 25) 42.0 +effort after adaption 1234.0 +effort after adaption in interval (check time 0) 1234.0 +effort after adaption in interval (check time 15) 2468.0 +effort after adaption in interval (check time 25) 1234.0 +max speed after adaption 23.0 +{16: 1} +step 3 +{16: 1} +step 4 +{16: 1} +step 5 +{16: 1} +{'2fi': {16: 1}} +3si count=1 meanSpeed=10.26 travelTime=23.114035087719298 +pending ('veh3',) +3si count=1 meanSpeed=10.26 travelTime=23.114035087719298 +pending ('veh3',) +3si count=1 meanSpeed=10.26 travelTime=23.114035087719298 +pending ('veh3',) +3si count=2 meanSpeed=8.06975 travelTime=29.387527494655966 +pending () +3si count=2 meanSpeed=8.06975 travelTime=29.387527494655966 +pending () +3si count=2 meanSpeed=8.445 travelTime=28.08170515097691 +pending () +3si count=2 meanSpeed=8.445 travelTime=28.08170515097691 +pending () +3si count=2 meanSpeed=8.445 travelTime=28.08170515097691 +pending () +3si count=2 meanSpeed=8.445 travelTime=28.08170515097691 +pending () +3si count=2 meanSpeed=8.445 travelTime=28.08170515097691 +pending () +allow_0 () +allow_1 ('bicycle',) +allow_2 ('pedestrian', 'bicycle') diff --git a/tests/complex/traci/edge/setMaxSpeed/output.complex.meso b/tests/complex/traci/edge/setMaxSpeed/output.complex.meso new file mode 100644 index 00000000000..5d18fa49f33 --- /dev/null +++ b/tests/complex/traci/edge/setMaxSpeed/output.complex.meso @@ -0,0 +1 @@ + Retrying in 1 seconds diff --git a/tests/complex/traci/edge/setMaxSpeed/runner.py b/tests/complex/traci/edge/setMaxSpeed/runner.py new file mode 100755 index 00000000000..1013d76c253 --- /dev/null +++ b/tests/complex/traci/edge/setMaxSpeed/runner.py @@ -0,0 +1,45 @@ +#!/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 Michael Behrisch +# @author Daniel Krajzewicz +# @date 2011-03-04 + + +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'), + "--no-step-log", + "-n", "input_net4.net.xml", + '-r', 'input_routes.rou.xml', + '--tripinfo-output', 'tripinfo.xml' + ] + sys.argv[1:]) + +while traci.simulation.getMinExpectedNumber() > 0: + traci.simulationStep() + if traci.simulation.getTime() == 50: + traci.edge.setMaxSpeed("A1A2", 0) + elif traci.simulation.getTime() == 150: + traci.edge.setMaxSpeed("A1A2", 13.89) + +traci.close() diff --git a/tests/complex/traci/edge/setMaxSpeed/tripinfo.complex b/tests/complex/traci/edge/setMaxSpeed/tripinfo.complex new file mode 100644 index 00000000000..082548cb429 --- /dev/null +++ b/tests/complex/traci/edge/setMaxSpeed/tripinfo.complex @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/complex/traci/edge/testsuite.complex b/tests/complex/traci/edge/testsuite.complex index 1c5b37e103e..9f10cdae4e4 100644 --- a/tests/complex/traci/edge/testsuite.complex +++ b/tests/complex/traci/edge/testsuite.complex @@ -1,2 +1,5 @@ # Tests the edge API edge + +# see #14552 +setMaxSpeed