added test refs #14400, #21

eclipse-sumo · Apr 16, 2024 · 4dde625 · 4dde625
1 parent 7af62cb
commit 4dde625
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/tests/complex/traci/trafficlight/trafficlight/output.complex b/tests/complex/traci/trafficlight/trafficlight/output.complex
@@ -15,14 +15,48 @@ phase 4
 phaseName setByTraCI
 switch 26.0
 duration 20.0
+spent 0.0
 numDefs=2 numPhases=[8, 6]
 {0: ('0',)}
 step 3
 {0: ('0',)}
+examining 0
+ryg rrrrGGggrrrrGGgg
+rygdef (Logic(programID='0', type=0, currentPhaseIndex=0, phases=(Phase(duration=31.0, state='GGggrrrrGGggrrrr', minDur=31.0, maxDur=31.0, name='major 1'), Phase(duration=4.0, state='yyggrrrryyggrrrr', minDur=4.0, maxDur=4.0, name='transition 1-2'), Phase(duration=6.0, state='rrGGrrrrrrGGrrrr', minDur=6.0, maxDur=6.0, name='major 2'), Phase(duration=4.0, state='rryyrrrrrryyrrrr', minDur=4.0, maxDur=4.0, name='transition 2-3'), Phase(duration=31.0, state='rrrrGGggrrrrGGgg', minDur=31.0, maxDur=31.0, name='major 3'), Phase(duration=4.0, state='rrrryyggrrrryygg', minDur=4.0, maxDur=4.0, name='transition 3-4'), Phase(duration=6.0, state='rrrrrrGGrrrrrrGG', minDur=6.0, maxDur=6.0, name='major 4'), Phase(duration=4.0, state='rrrrrryyrrrrrryy', minDur=4.0, maxDur=4.0, name='transition 4-1')), subParameter={}), Logic(programID='custom', type=0, currentPhaseIndex=4, phases=(Phase(duration=30.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0, name='setViaComplete', next='(1, 2, 3)'), Phase(duration=10.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0), Phase(duration=40.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0), Phase(duration=20.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0), Phase(duration=20.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0, name='setByTraCI'), Phase(duration=20.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0)), subParameter={}))
+lanes ('4si_0', '4si_1', '4si_2', '4si_2', '2si_0', '2si_1', '2si_2', '2si_2', '3si_0', '3si_1', '3si_2', '3si_2', '1si_0', '1si_1', '1si_2', '1si_2')
+links [[('4si_0', '1o_0', '')], [('4si_1', '3o_0', '')], [('4si_2', '2o_0', '')], [('4si_2', '4o_0', '')], [('2si_0', '4o_0', '')], [('2si_1', '1o_0', '')], [('2si_2', '3o_0', '')], [('2si_2', '2o_0', '')], [('3si_0', '2o_0', '')], [('3si_1', '4o_0', '')], [('3si_2', '1o_0', '')], [('3si_2', '3o_0', '')], [('1si_0', '3o_0', '')], [('1si_1', '2o_0', '')], [('1si_2', '4o_0', '')], [('1si_2', '1o_0', '')]]
+program custom
+phase 4
+phaseName setByTraCI
+switch 26.0
+duration 20.0
+spent 1.0
 step 4
 {0: ('0',)}
+examining 0
+ryg rrrrGGggrrrrGGgg
+rygdef (Logic(programID='0', type=0, currentPhaseIndex=0, phases=(Phase(duration=31.0, state='GGggrrrrGGggrrrr', minDur=31.0, maxDur=31.0, name='major 1'), Phase(duration=4.0, state='yyggrrrryyggrrrr', minDur=4.0, maxDur=4.0, name='transition 1-2'), Phase(duration=6.0, state='rrGGrrrrrrGGrrrr', minDur=6.0, maxDur=6.0, name='major 2'), Phase(duration=4.0, state='rryyrrrrrryyrrrr', minDur=4.0, maxDur=4.0, name='transition 2-3'), Phase(duration=31.0, state='rrrrGGggrrrrGGgg', minDur=31.0, maxDur=31.0, name='major 3'), Phase(duration=4.0, state='rrrryyggrrrryygg', minDur=4.0, maxDur=4.0, name='transition 3-4'), Phase(duration=6.0, state='rrrrrrGGrrrrrrGG', minDur=6.0, maxDur=6.0, name='major 4'), Phase(duration=4.0, state='rrrrrryyrrrrrryy', minDur=4.0, maxDur=4.0, name='transition 4-1')), subParameter={}), Logic(programID='custom', type=0, currentPhaseIndex=4, phases=(Phase(duration=30.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0, name='setViaComplete', next='(1, 2, 3)'), Phase(duration=10.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0), Phase(duration=40.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0), Phase(duration=20.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0), Phase(duration=20.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0, name='setByTraCI'), Phase(duration=20.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0)), subParameter={}))
+lanes ('4si_0', '4si_1', '4si_2', '4si_2', '2si_0', '2si_1', '2si_2', '2si_2', '3si_0', '3si_1', '3si_2', '3si_2', '1si_0', '1si_1', '1si_2', '1si_2')
+links [[('4si_0', '1o_0', '')], [('4si_1', '3o_0', '')], [('4si_2', '2o_0', '')], [('4si_2', '4o_0', '')], [('2si_0', '4o_0', '')], [('2si_1', '1o_0', '')], [('2si_2', '3o_0', '')], [('2si_2', '2o_0', '')], [('3si_0', '2o_0', '')], [('3si_1', '4o_0', '')], [('3si_2', '1o_0', '')], [('3si_2', '3o_0', '')], [('1si_0', '3o_0', '')], [('1si_1', '2o_0', '')], [('1si_2', '4o_0', '')], [('1si_2', '1o_0', '')]]
+program custom
+phase 4
+phaseName setByTraCI
+switch 26.0
+duration 20.0
+spent 2.0
 step 5
 {0: ('0',)}
+examining 0
+ryg rrrrGGggrrrrGGgg
+rygdef (Logic(programID='0', type=0, currentPhaseIndex=0, phases=(Phase(duration=31.0, state='GGggrrrrGGggrrrr', minDur=31.0, maxDur=31.0, name='major 1'), Phase(duration=4.0, state='yyggrrrryyggrrrr', minDur=4.0, maxDur=4.0, name='transition 1-2'), Phase(duration=6.0, state='rrGGrrrrrrGGrrrr', minDur=6.0, maxDur=6.0, name='major 2'), Phase(duration=4.0, state='rryyrrrrrryyrrrr', minDur=4.0, maxDur=4.0, name='transition 2-3'), Phase(duration=31.0, state='rrrrGGggrrrrGGgg', minDur=31.0, maxDur=31.0, name='major 3'), Phase(duration=4.0, state='rrrryyggrrrryygg', minDur=4.0, maxDur=4.0, name='transition 3-4'), Phase(duration=6.0, state='rrrrrrGGrrrrrrGG', minDur=6.0, maxDur=6.0, name='major 4'), Phase(duration=4.0, state='rrrrrryyrrrrrryy', minDur=4.0, maxDur=4.0, name='transition 4-1')), subParameter={}), Logic(programID='custom', type=0, currentPhaseIndex=4, phases=(Phase(duration=30.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0, name='setViaComplete', next='(1, 2, 3)'), Phase(duration=10.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0), Phase(duration=40.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0), Phase(duration=20.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0), Phase(duration=20.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0, name='setByTraCI'), Phase(duration=20.0, state='rrrrGGggrrrrGGgg', minDur=0.0, maxDur=0.0)), subParameter={}))
+lanes ('4si_0', '4si_1', '4si_2', '4si_2', '2si_0', '2si_1', '2si_2', '2si_2', '3si_0', '3si_1', '3si_2', '3si_2', '1si_0', '1si_1', '1si_2', '1si_2')
+links [[('4si_0', '1o_0', '')], [('4si_1', '3o_0', '')], [('4si_2', '2o_0', '')], [('4si_2', '4o_0', '')], [('2si_0', '4o_0', '')], [('2si_1', '1o_0', '')], [('2si_2', '3o_0', '')], [('2si_2', '2o_0', '')], [('3si_0', '2o_0', '')], [('3si_1', '4o_0', '')], [('3si_2', '1o_0', '')], [('3si_2', '3o_0', '')], [('1si_0', '3o_0', '')], [('1si_1', '2o_0', '')], [('1si_2', '4o_0', '')], [('1si_2', '1o_0', '')]]
+program custom
+phase 4
+phaseName setByTraCI
+switch 26.0
+duration 20.0
+spent 3.0
 caught Invalid tlsLinkIndex 16 for tls '0' with maximum index 15.
 examining 0
 ryg rrrruGggrrrrGGgg
@@ -34,6 +68,7 @@ phase 0
 phaseName 
 switch 7.0
 duration 1.0
+spent 0.0
 set ryg gGyruOorrrrrrrrr
 program online
 ryg oooooooooooooooo
diff --git a/tests/complex/traci/trafficlight/trafficlight/runner.py b/tests/complex/traci/trafficlight/trafficlight/runner.py
@@ -48,6 +48,7 @@ def check():
     print("phaseName", traci.trafficlight.getPhaseName(tlsID))
     print("switch", traci.trafficlight.getNextSwitch(tlsID))
     print("duration", traci.trafficlight.getPhaseDuration(tlsID))
+    print("spent", traci.trafficlight.getSpentDuration(tlsID))
 
 
 phases = []
@@ -74,6 +75,7 @@ def check():
     print("step", step)
     traci.simulationStep()
     print(traci.trafficlight.getSubscriptionResults(tlsID))
+    check()
 traci.trafficlight.setLinkState(tlsID, 4, 'u')
 try:
     traci.trafficlight.setLinkState(tlsID, 16, 'u')