can change to no control

Author: hi6724

src/deadlock.py

@@ -108,15 +108,18 @@ def init(is_gui):
 PRIORITY = {"gneJ12": "PRIORITY"}
 
 
-def simulation(num, is_gui):
+def simulation(num, is_gui, with_program):
 
     init(is_gui)
     make_deadlock_vehicle(num)
     while traci.simulation.getMinExpectedNumber() > 0:
-        solve_deadlock("gneJ12", 0, {})
+        if with_program:
+            solve_deadlock("gneJ12", 0, {})
         traci.simulationStep()
     traci.close()
 
 
 num_of_vehicles = int(input("Num of vehicles :"))
-simulation(num_of_vehicles, True)
+with_program = int(input("With control program (0=false, 1=true):"))
+
+simulation(num_of_vehicles, True, bool(with_program))

src/gridlock.py

@@ -89,7 +89,7 @@ def control_vehicle(vehID, net):
 }
 
 
-def simulation(num_of_vehicles):
+def simulation(num_of_vehicles, with_program):
     init(True)
     for i in range(1, num_of_vehicles):
         traci.route.add(
@@ -109,38 +109,53 @@ def simulation(num_of_vehicles):
             traci.vehicle.setMaxSpeed(f"{k}_{i}", SPEED)
             traci.vehicle.setColor(f"{k}_{i}", color_dic[k])
     while traci.simulation.getMinExpectedNumber() > 0:
-        locked_vehicles = {}
-        leaders = []
-        gridlock = []
-        control_arr = []
-        current_time = traci.simulation.getTime()
-        all_vehicles = traci.vehicle.getIDList()
-
-        for vehicle in all_vehicles:
-            leader = (traci.vehicle.getLeader(vehicle))
-            vehicle_lane = traci.vehicle.getLaneID(vehicle)
-            try:
-                if vehicle_lane[0] != ":":
-                    if leader == None:
-                        leaders.append(vehicle)
-                    else:
-                        leader_lane = traci.vehicle.getLaneID(leader[0])
-                        if vehicle_lane != leader_lane:
+        if with_program:
+            locked_vehicles = {}
+            leaders = []
+            gridlock = []
+            control_arr = []
+            current_time = traci.simulation.getTime()
+            all_vehicles = traci.vehicle.getIDList()
+
+            for vehicle in all_vehicles:
+                leader = (traci.vehicle.getLeader(vehicle))
+                vehicle_lane = traci.vehicle.getLaneID(vehicle)
+                try:
+                    if vehicle_lane[0] != ":":
+                        if leader == None:
                             leaders.append(vehicle)
-            except:
-                pass
-        for leader in leaders:
-            leader_lanes = traci.vehicle.getBestLanes(leader)[0][5]
-            control_arr.append(leader)
-
-            if len(leader_lanes) > 1:
-                locked_veh = detect_gridlock(leader, leader_lanes[1])
-                if locked_veh:
-                    locked_vehicles[locked_veh[0]] = locked_veh[1]
-
-        for init_veh in (locked_vehicles):
-            if len(gridlock) > 0:
-                if init_veh not in gridlock[0]:
+                        else:
+                            leader_lane = traci.vehicle.getLaneID(leader[0])
+                            if vehicle_lane != leader_lane:
+                                leaders.append(vehicle)
+                except:
+                    pass
+            for leader in leaders:
+                leader_lanes = traci.vehicle.getBestLanes(leader)[0][5]
+                control_arr.append(leader)
+
+                if len(leader_lanes) > 1:
+                    locked_veh = detect_gridlock(leader, leader_lanes[1])
+                    if locked_veh:
+                        locked_vehicles[locked_veh[0]] = locked_veh[1]
+
+            for init_veh in (locked_vehicles):
+                if len(gridlock) > 0:
+                    if init_veh not in gridlock[0]:
+                        temp = []
+                        index = init_veh
+                        for k in range(15):
+                            try:
+                                next_vehicle = locked_vehicles[index]
+                                temp.append(next_vehicle)
+                                index = next_vehicle
+                                if next_vehicle == init_veh:
+                                    gridlock.append(temp)
+                                    break
+
+                            except:
+                                break
+                elif len(gridlock) == 0:
                     temp = []
                     index = init_veh
                     for k in range(15):
@@ -154,31 +169,18 @@ def simulation(num_of_vehicles):
 
                         except:
                             break
-            elif len(gridlock) == 0:
-                temp = []
-                index = init_veh
-                for k in range(15):
-                    try:
-                        next_vehicle = locked_vehicles[index]
-                        temp.append(next_vehicle)
-                        index = next_vehicle
-                        if next_vehicle == init_veh:
-                            gridlock.append(temp)
-                            break
-
-                    except:
-                        break
 
-        for v in control_arr:
-            control_vehicle(v, net)
-        for vehicles in gridlock:
-            for v in vehicles:
-                traci.vehicle.setSpeed(v, SPEED)
+            for v in control_arr:
+                control_vehicle(v, net)
+            for vehicles in gridlock:
+                for v in vehicles:
+                    traci.vehicle.setSpeed(v, SPEED)
         traci.simulationStep()
         if traci.simulation.getTime() == 5000:
             traci.close()
     traci.close()
 
 
 num_of_vehicles = int(input("Num of vehicles :"))
-simulation(num_of_vehicles)
+with_program = int(input("With control program (0=false, 1=true):"))
+simulation(num_of_vehicles, bool(with_program))

src/randomScenario.py

@@ -161,35 +161,50 @@ def init(is_gui):
 PRIORITY_ARR = []
 
 
-def simulation(num, is_gui):
+def simulation(num, with_program):
     for node in net.getNodes():
         NODES.append(node.getID())
         PRIORITY[node.getID()] = "PRIORITY"
-    init(is_gui)
+    init(True)
     teleportNum = 0
     departedNum = 0
     arrivedNum = 0
     for i in range(num):
         make_vehicle(f"vehicle_{i}", make_random_route(i), 0)
     while traci.simulation.getMinExpectedNumber() > 0:
-        locked_vehicle = {}
-        collisions_arr = traci.simulation.getCollisions()
-        if collisions_arr:
-            print(traci.simulation.getCollisions())
-        for index, node in enumerate(NODES):
-            solve_deadlock(node, index, locked_vehicle)
-        del_arr = []
-        for vehicle_key in locked_vehicle.keys():
-            if vehicle_key not in locked_vehicle.values():
-                del_arr.append(vehicle_key)
-        for key in del_arr:
-            del locked_vehicle[key]
-
-        #GRIDLOCK
-        gridlock = []
-        for init_veh in (locked_vehicle):
-            if len(gridlock) > 0:
-                if init_veh not in gridlock[0]:
+        if with_program:
+            locked_vehicle = {}
+            collisions_arr = traci.simulation.getCollisions()
+            if collisions_arr:
+                print(traci.simulation.getCollisions())
+            for index, node in enumerate(NODES):
+                solve_deadlock(node, index, locked_vehicle)
+            del_arr = []
+            for vehicle_key in locked_vehicle.keys():
+                if vehicle_key not in locked_vehicle.values():
+                    del_arr.append(vehicle_key)
+            for key in del_arr:
+                del locked_vehicle[key]
+
+            #GRIDLOCK
+            gridlock = []
+            for init_veh in (locked_vehicle):
+                if len(gridlock) > 0:
+                    if init_veh not in gridlock[0]:
+                        temp = []
+                        index = init_veh
+                        for k in range(6):
+                            try:
+                                next_vehicle = locked_vehicle[index]
+                                temp.append(next_vehicle)
+                                index = next_vehicle
+                                if next_vehicle == init_veh:
+                                    gridlock.append(temp)
+                                    break
+
+                            except:
+                                break
+                elif len(gridlock) == 0:
                     temp = []
                     index = init_veh
                     for k in range(6):
@@ -203,30 +218,16 @@ def simulation(num, is_gui):
 
                         except:
                             break
-            elif len(gridlock) == 0:
-                temp = []
-                index = init_veh
-                for k in range(6):
-                    try:
-                        next_vehicle = locked_vehicle[index]
-                        temp.append(next_vehicle)
-                        index = next_vehicle
-                        if next_vehicle == init_veh:
-                            gridlock.append(temp)
-                            break
 
-                    except:
-                        break
-
-        for vehicles in gridlock:
-            for v in vehicles:
-                traci.vehicle.setSpeed(v, SPEED)
+            for vehicles in gridlock:
+                for v in vehicles:
+                    traci.vehicle.setSpeed(v, SPEED)
         traci.simulationStep()
         if traci.simulation.getTime() == 3600:
             traci.close()
     traci.close()
 
 
 num_of_vehicles = int(input("Num of vehicles :"))
-
-simulation(num_of_vehicles, True)
+with_program = int(input("With control program (0=false, 1=true):"))
+simulation(num_of_vehicles, with_program)