Reformat code

sumo_project/actions.py

@@ -14,28 +14,31 @@ from model import Area, Vehicle
 def remove_vehicle(veh_id):
     traci.vehicle.remove(veh_id, traci.constants.REMOVE_PARKING)
 
+
 def lanes_in_area(area):
     for lane_id in traci.lane.getIDList():
         polygon_lane = LineString(traci.lane.getShape(lane_id))
         if area.rectangle.intersects(polygon_lane):
             yield lane_id
 
-def computeEdgeWeight(edge_id):
-    return (traci.edge.getCOEmission(edge_id)
-    + traci.edge.getNOxEmission(edge_id)
-    + traci.edge.getHCEmission(edge_id)
-    + traci.edge.getPMxEmission(edge_id)
-    + traci.edge.getCO2Emission(edge_id))
-        
-def adjustEdgesWeight():
-    for edge_id in traci.edge.getIDList():
-        weight = computeEdgeWeight(edge_id) #by default edges weight = length/mean speed
-        traci.edge.adaptTraveltime(edge_id, weight) 
 
-def lock_area(area: Area, vehicles: Iterable[Vehicle]):
+def compute_edge_weight(edge_id):
+    return (traci.edge.getCOEmission(edge_id)
+            + traci.edge.getNOxEmission(edge_id)
+            + traci.edge.getHCEmission(edge_id)
+            + traci.edge.getPMxEmission(edge_id)
+            + traci.edge.getCO2Emission(edge_id))
+
+
+def adjust_edges_weights():
+    for edge_id in traci.edge.getIDList():
+        weight = compute_edge_weight(edge_id)  # by default edges weight = length/mean speed
+        traci.edge.adaptTraveltime(edge_id, weight)
+
+
+def lock_area(area: Area):
     max_speed = 30
     print(f'Setting max speed into {area.name} to {max_speed} km/h')
     area.locked = True
     for lane in area._lanes:
-        traci.lane.setMaxSpeed(lane.lane_id, max_speed/3.6)
+        traci.lane.setMaxSpeed(lane.lane_id, max_speed / 3.6)
-    

sumo_project/emissions.py

@@ -20,17 +20,19 @@ def init_grid(simulation_bounds, cells_number):
                          ((i + 1) * width, (j + 1) * height), ((i + 1) * width, j * height))
             area = Area(ar_bounds)
             area.name = 'area ({},{})'.format(i, j)
-            areas.append(area)
+            grid.append(area)
             traci.polygon.add(area.name, ar_bounds, (0, 255, 0))
-    return areas
+    return grid
+
 
 def compute_vehicle_emissions(veh_id):
     return (traci.vehicle.getCOEmission(veh_id)
-    + traci.vehicle.getNOxEmission(veh_id)
+            + traci.vehicle.getNOxEmission(veh_id)
-    + traci.vehicle.getHCEmission(veh_id)
+            + traci.vehicle.getHCEmission(veh_id)
-    + traci.vehicle.getPMxEmission(veh_id)
+            + traci.vehicle.getPMxEmission(veh_id)
-    + traci.vehicle.getCO2Emission(veh_id))
+            + traci.vehicle.getCO2Emission(veh_id))
-    
+
+
 def get_all_vehicles() -> List[Vehicle]:
     vehicles = list()
     for veh_id in traci.vehicle.getIDList():
@@ -55,8 +57,8 @@ def get_emissions(grid: List[Area], vehicles: List[Vehicle]):
         for vehicle in vehicles:
             if vehicle.pos in area:
                 area.emissions += vehicle.emissions
-        if config.lock_mode == True and area.emissions > config.EMISSIONS_THRESHOLD and area.locked == False:
+        if config.lock_mode and area.emissions > config.EMISSIONS_THRESHOLD and area.locked == False:
-            actions.lock_area(area, vehicles)
+            actions.lock_area(area)
             traci.polygon.setColor(area.name, (255, 0, 0))
             traci.polygon.setFilled(area.name, True)
 

sumo_project/model.py

@@ -62,4 +62,3 @@ class Vehicle:
 
     def __repr__(self) -> str:
         return str(self.__dict__)
-