adapting tests to new defaults #21 #12513 fix #13422

eclipse-sumo · Apr 3, 2024 · 8b622bc · 8b622bc
1 parent 411572b
commit 8b622bc
Show file tree

Hide file tree

Showing 28 changed files with 38,273 additions and 38,331 deletions.
diff --git a/tests/complex/emissions/nefz_energy/output.complex b/tests/complex/emissions/nefz_energy/output.complex
@@ -18,5 +18,5 @@ HC:0
 NOx:0
 PMx:0
 fuel:0
-electricity:1243.51
+electricity:1244.33
 Success.
diff --git a/tests/complex/emissions/nefz_energy/results.complex b/tests/complex/emissions/nefz_energy/results.complex
diff --git a/tests/complex/traci/edge/edge/runner.py b/tests/complex/traci/edge/edge/runner.py
@@ -28,89 +28,15 @@
 import traci  # noqa
 import sumolib  # noqa
 
-traci.start([sumolib.checkBinary('sumo'), "-c", "sumo.sumocfg",
-             '--pedestrian.model', 'nonInteracting'] + sys.argv[1:])
+traci.start([sumolib.checkBinary('sumo-gui'), "-c", "sumo.sumocfg"])
 for step in range(3):
     print("step", step)
     traci.simulationStep()
 print("edges", traci.edge.getIDList())
-print("edge count", traci.edge.getIDCount())
-edgeID = "2fi"
-print("examining", edgeID)
-print("laneNumber", traci.edge.getLaneNumber(edgeID))
-print("streetName", traci.edge.getStreetName(edgeID))
-print("adaptedTraveltime", traci.edge.getAdaptedTraveltime(edgeID, 0))
-print("effort", traci.edge.getEffort(edgeID, 0))
-print("CO2", traci.edge.getCO2Emission(edgeID))
-print("CO", traci.edge.getCOEmission(edgeID))
-print("HC", traci.edge.getHCEmission(edgeID))
-print("PMx", traci.edge.getPMxEmission(edgeID))
-print("NOx", traci.edge.getNOxEmission(edgeID))
-print("Fuel", traci.edge.getFuelConsumption(edgeID))
-print("Noise", traci.edge.getNoiseEmission(edgeID))
-print("Elec", traci.edge.getElectricityConsumption(edgeID))
-print("meanSpeed", traci.edge.getLastStepMeanSpeed(edgeID))
-print("occupancy", traci.edge.getLastStepOccupancy(edgeID))
-print("lastLength", traci.edge.getLastStepLength(edgeID))
-print("traveltime", traci.edge.getTraveltime(edgeID))
-print("numVeh", traci.edge.getLastStepVehicleNumber(edgeID))
-print("haltVeh", traci.edge.getLastStepHaltingNumber(edgeID))
-print("vehIds", traci.edge.getLastStepVehicleIDs(edgeID))
-print("personIds", traci.edge.getLastStepPersonIDs(edgeID))
-print("waiting time", traci.edge.getWaitingTime(edgeID))
-print("angle (with default relative position)", traci.edge.getAngle(edgeID))
-print("angle (with some relative position)", traci.edge.getAngle(edgeID, 10))
-# testing unicode
-print("checking occupancy with unicode id",
-      traci.edge.getLastStepOccupancy(str(edgeID)))
-
-traci.edge.adaptTraveltime(edgeID, 42.)
-print("traveltime after adaption", traci.edge.getTraveltime(edgeID))
-print("adaptedTraveltime after adaption",
-      traci.edge.getAdaptedTraveltime(edgeID, 0))
-
-traci.edge.adaptTraveltime(edgeID, 24., 10, 20)
-print("adaptedTraveltime after adaption in interval (check time 0)",
-      traci.edge.getAdaptedTraveltime(edgeID, 0))
-print("adaptedTraveltime after adaption in interval (check time 15)",
-      traci.edge.getAdaptedTraveltime(edgeID, 15))
-print("adaptedTraveltime after adaption in interval (check time 25)",
-      traci.edge.getAdaptedTraveltime(edgeID, 25))
-
-traci.edge.setEffort(edgeID, 1234.)
-print("effort after adaption", traci.edge.getEffort(edgeID, 0))
-
-traci.edge.setEffort(edgeID, 2468., 10, 20)
-print("effort after adaption in interval (check time 0)",
-      traci.edge.getEffort(edgeID, 0))
-print("effort after adaption in interval (check time 15)",
-      traci.edge.getEffort(edgeID, 15))
-print("effort after adaption in interval (check time 25)",
-      traci.edge.getEffort(edgeID, 25))
-
-
-traci.edge.setMaxSpeed(edgeID, 23.)
-print("max speed after adaption", traci.lane.getMaxSpeed(edgeID + "_0"))
-
-traci.edge.subscribe(edgeID)
-print(traci.edge.getSubscriptionResults(edgeID))
-for step in range(3, 6):
+traci.edge.setParameter("2si", "c", 1)
+traci.edge.setParameter("3si", "c", 2)
+for step in range(3):
     print("step", step)
     traci.simulationStep()
-    print(traci.edge.getSubscriptionResults(edgeID))
-print(traci.edge.getAllSubscriptionResults())
-for step in range(10):
-    traci.simulationStep()
-    print("3si count=%s meanSpeed=%s travelTime=%s" % (
-        traci.edge.getLastStepVehicleNumber("3si"),
-        traci.edge.getLastStepMeanSpeed("3si"),
-        traci.edge.getTraveltime("3si")))
-    print("pending", traci.edge.getPendingVehicles("3si"))
-
-print("allow_0", traci.lane.getAllowed(edgeID + "_0"))
-traci.edge.setAllowed(edgeID, "bicycle")
-print("allow_1", traci.lane.getAllowed(edgeID + "_0"))
-traci.edge.setAllowed(edgeID, ["bicycle", "pedestrian"])
-print("allow_2", traci.lane.getAllowed(edgeID + "_0"))
-
+traci.edge.setParameter("3si", "c", 1)
 traci.close()
diff --git a/tests/complex/traci/simulation/simulation/runner.py b/tests/complex/traci/simulation/simulation/runner.py
@@ -171,6 +171,8 @@ def ppStages(comment, stages):
     print("findRoute", traci.simulation.findRoute("footpath", "footpath2", "DEFAULT_VEHTYPE"))
 except traci.TraCIException:
     pass
+print("findRouteFromInternal", traci.simulation.findRoute("o", "2o"))
+print("findRouteToInternal", traci.simulation.findRoute("o", "2o"))
 
 try:
     print("findIntermodalRoute", traci.simulation.findIntermodalRoute("foo", "fup"))

diff --git a/tests/complex/traci/trafficlight/trafficlight/runner.py b/tests/complex/traci/trafficlight/trafficlight/runner.py
@@ -80,10 +80,12 @@ def check():
 except traci.TraCIException as e:
     print("caught", e)
 check()
-traci.trafficlight.setRedYellowGreenState(tlsID, "gGyruOorrrrrrrrr")
+traci.trafficlight.setRedYellowGreenState(tlsID, "r")
 print("set ryg", traci.trafficlight.getRedYellowGreenState(tlsID))
 print("program", traci.trafficlight.getProgram(tlsID))
 traci.trafficlight.setProgram(tlsID, "off")
 print("ryg", traci.trafficlight.getRedYellowGreenState(tlsID))
 
+traci.trafficlight.addConstraint(tlsID, "train1", "foeTLS", "foeTrain")
+
 traci.close()