Changed code structure by adding Data class for map loading

sumo_project/configs/default_config.json

@@ -7,7 +7,7 @@
 	"n_steps": 200,
 	"window_size":100,
 	
-	"without_actions_mode": false,
+	"without_actions_mode": true,
 	
 	"limit_speed_mode": true,
 	"speed_rf": 0.1,

sumo_project/data.py

@@ -0,0 +1,131 @@
+"""
+Created on 17 oct. 2018
+
+@author: Axel Huynh-Phuc, Thibaud Gasser
+"""
+
+import argparse
+import csv
+import datetime
+import itertools
+import os
+import sys
+import time
+from typing import List
+import json
+import jsonpickle
+import pprint
+
+import actions
+import traci
+from config import Config
+from model import Area, Vehicle, Lane, TrafficLight, Phase, Logic, Emission
+from parse import search
+from shapely.geometry import LineString
+
+"""
+This module is used for loading simulation data 
+"""
+
+
+class Data: 
+    
+    def __init__(self, map_bounds, config : Config):
+        """
+        Data constructor
+        """
+        self.map_bounds = map_bounds
+        self.config = config
+    
+    def init_grid(self):
+        """
+        Initialize the grid of the loaded map from the configuration
+        :param self.map_bounds: The map bounds
+        :param areas_number: The number of areas
+        :param window_size: The size of the acquisition window
+        :return: A list of areas
+        """
+        from distutils.command.config import config
+        self.grid = list()
+        areas_number = self.config.areas_number
+        window_size = self.config.window_size
+        
+        width = self.map_bounds[1][0] / areas_number
+        height = self.map_bounds[1][1] / areas_number
+        for i in range(areas_number):
+            for j in range(areas_number):
+                # bounds coordinates for the area : (xmin, ymin, xmax, ymax)
+                ar_bounds = ((i * width, j * height), (i * width, (j + 1) * height),
+                             ((i + 1) * width, (j + 1) * height), ((i + 1) * width, j * height))
+                name = 'Area ({},{})'.format(i, j)
+                area = Area(ar_bounds, name, window_size)
+                self.grid.append(area)
+                traci.polygon.add(area.name, ar_bounds, (255, 0, 0))  # Add polygon for UI
+        return self.grid
+    
+    def get_all_lanes(self) -> List[Lane]:
+        """
+        Recover and creates a list of Lane objects
+        :return: The lanes list
+        """
+        lanes = []
+        for lane_id in traci.lane.getIDList():
+            polygon_lane = LineString(traci.lane.getShape(lane_id))
+            initial_max_speed = traci.lane.getMaxSpeed(lane_id)
+            lanes.append(Lane(lane_id, polygon_lane, initial_max_speed))
+        return lanes
+    
+    def parse_phase(self, phase_repr):
+        """
+        Because the SUMO object Phase does not contain accessors,
+        we parse the string representation to retrieve data members.
+        :param phase_repr: The Phase string representation
+        :return: An new Phase instance
+        """
+        duration = search('duration: {:f}', phase_repr)
+        min_duration = search('minDuration: {:f}', phase_repr)
+        max_duration = search('maxDuration: {:f}', phase_repr)
+        phase_def = search('phaseDef: {}\n', phase_repr)
+    
+        if phase_def is None:
+            phase_def = ''
+        else:
+            phase_def = phase_def[0]
+    
+        return Phase(duration[0], min_duration[0], max_duration[0], phase_def)
+    
+    def add_data_to_areas(self):
+        """
+        Adds all recovered data to different areas
+        :param areas: The list of areas
+        :return:
+        """
+        lanes = self.get_all_lanes()
+        for area in self.grid:
+            for lane in lanes:  # add lanes 
+                if area.rectangle.intersects(lane.polygon):
+                    area.add_lane(lane)
+                    for tl_id in traci.trafficlight.getIDList():  # add traffic lights 
+                        if lane.lane_id in traci.trafficlight.getControlledLanes(tl_id):
+                            logics = []
+                            for l in traci.trafficlight.getCompleteRedYellowGreenDefinition(tl_id):  # add logics 
+                                phases = []
+                                for phase in traci.trafficlight.Logic.getPhases(l):  # add phases to logics
+                                    phases.append(self.parse_phase(phase.__repr__()))
+                                logics.append(Logic(l, phases))
+                            area.add_tl(TrafficLight(tl_id, logics))
+                            
+    def save(self,dump_name):
+        """
+        Save simulation data into a json file 
+        :param dump_name: The name of your data dump
+        :return:
+        """
+        dump_dir = 'dump'
+        if not os.path.exists(dump_dir):
+            os.mkdir(dump_dir)
+        
+        s = json.dumps(json.loads(jsonpickle.encode(self)), indent=4) # for pretty JSON 
+        with open(f'{dump_dir}/{dump_name}.json', 'w') as f:
+            f.write(s)
+        

sumo_project/emissions.py

@@ -13,6 +13,8 @@ import sys
 import time
 from typing import List
 
+
+from data import Data
 import actions
 import traci
 from config import Config
@@ -24,85 +26,6 @@ from shapely.geometry import LineString
 This module defines the entry point of the application 
 """
 
-
-def init_grid(simulation_bounds, areas_number, window_size):
-    """
-    Initialize the grid of the loaded map from the configuration
-    :param simulation_bounds: The map bounds
-    :param areas_number: The number of areas
-    :param window_size: The size of the acquisition window
-    :return: A list of areas
-    """
-    grid = list()
-    width = simulation_bounds[1][0] / areas_number
-    height = simulation_bounds[1][1] / areas_number
-    for i in range(areas_number):
-        for j in range(areas_number):
-            # bounds coordinates for the area : (xmin, ymin, xmax, ymax)
-            ar_bounds = ((i * width, j * height), (i * width, (j + 1) * height),
-                         ((i + 1) * width, (j + 1) * height), ((i + 1) * width, j * height))
-            name = 'Area ({},{})'.format(i, j)
-            area = Area(ar_bounds, name, window_size)
-            grid.append(area)
-            traci.polygon.add(area.name, ar_bounds, (255, 0, 0))  # Add polygon for UI
-    return grid
-
-
-def get_all_lanes() -> List[Lane]:
-    """
-    Recover and creates a list of Lane objects
-    :return: The lanes list
-    """
-    lanes = []
-    for lane_id in traci.lane.getIDList():
-        polygon_lane = LineString(traci.lane.getShape(lane_id))
-        initial_max_speed = traci.lane.getMaxSpeed(lane_id)
-        lanes.append(Lane(lane_id, polygon_lane, initial_max_speed))
-    return lanes
-
-
-def parse_phase(phase_repr):
-    """
-    Because the SUMO object Phase does not contain accessors,
-    we parse the string representation to retrieve data members.
-    :param phase_repr: The Phase string representation
-    :return: An new Phase instance
-    """
-    duration = search('duration: {:f}', phase_repr)
-    min_duration = search('minDuration: {:f}', phase_repr)
-    max_duration = search('maxDuration: {:f}', phase_repr)
-    phase_def = search('phaseDef: {}\n', phase_repr)
-
-    if phase_def is None:
-        phase_def = ''
-    else:
-        phase_def = phase_def[0]
-
-    return Phase(duration[0], min_duration[0], max_duration[0], phase_def)
-
-
-def add_data_to_areas(areas: List[Area]):
-    """
-    Adds all recovered data to different areas
-    :param areas: The list of areas
-    :return:
-    """
-    lanes = get_all_lanes()
-    for area in areas:
-        for lane in lanes:  # add lanes 
-            if area.rectangle.intersects(lane.polygon):
-                area.add_lane(lane)
-                for tl_id in traci.trafficlight.getIDList():  # add traffic lights 
-                    if lane.lane_id in traci.trafficlight.getControlledLanes(tl_id):
-                        logics = []
-                        for l in traci.trafficlight.getCompleteRedYellowGreenDefinition(tl_id):  # add logics 
-                            phases = []
-                            for phase in traci.trafficlight.Logic.getPhases(l):  # add phases to logics
-                                phases.append(parse_phase(phase.__repr__()))
-                            logics.append(Logic(l, phases))
-                        area.add_tl(TrafficLight(tl_id, logics))
-
-
 def compute_vehicle_emissions(veh_id):
     """
     Recover the emissions of different pollutants from a vehicle and create an Emission instance
@@ -211,22 +134,24 @@ def export_data_to_csv(config, grid):
             writer.writerow(itertools.chain((step,), em_for_step))
 
 
-def run(config, logger, csv_export):
+def run(config, logger, csv_export, dump_name):
     """
     Run the simulation with the configuration chosen
     :param config: The simulation configuration
     :param logger: The simulation logger
     :return:
     """
-    grid = list()
+    
     try:
         traci.start(config.sumo_cmd)
         logger.info(f'Loaded simulation file : {config._SUMOCFG}')
         logger.info('Loading data for the simulation')
         start = time.perf_counter()
 
-        grid = init_grid(traci.simulation.getNetBoundary(), config.areas_number, config.window_size)
+        data = Data(traci.simulation.getNetBoundary(), config)
-        add_data_to_areas(grid)
+        data.init_grid()
+        data.add_data_to_areas() 
+        data.save(dump_name)
 
         loading_time = round(time.perf_counter() - start, 2)
         logger.info(f'Data loaded ({loading_time}s)')
@@ -237,7 +162,7 @@ def run(config, logger, csv_export):
             traci.simulationStep()
 
             vehicles = get_all_vehicles()
-            get_emissions(grid, vehicles, step, config, logger)
+            get_emissions(data.grid, vehicles, step, config, logger)
             step += 1
 
             print(f'step = {step}/{config.n_steps}', end='\r')
@@ -246,7 +171,7 @@ def run(config, logger, csv_export):
         traci.close(False)
         
         if csv_export:
-            export_data_to_csv(config, grid)
+            export_data_to_csv(config, data.grid)
             logger.info(f'Exported data into the csv folder')
 
         simulation_time = round(time.perf_counter() - start, 2)
@@ -256,7 +181,7 @@ def run(config, logger, csv_export):
         logger.info(f'Real-time factor : {config.n_steps / simulation_time}')
 
         total_emissions = Emission()
-        for area in grid:
+        for area in data.grid:
             total_emissions += area.sum_all_emissions()
 
         logger.info(f'Total emissions = {total_emissions.value()} mg')
@@ -280,6 +205,8 @@ def add_options(parser):
     :param parser: The command line parser
     :return:
     """
+    parser.add_argument("-f", "--configfile", type=str, default='configs/default_config.json', required=False,
+                        help='Choose your configuration file from your working directory')
     parser.add_argument("-f", "--configfile", type=str, default='configs/default_config.json', required=False,
                         help='Choose your configuration file from your working directory')
     parser.add_argument("-save", "--save", action="store_true",
@@ -327,7 +254,7 @@ def main(args):
 
     logger.info(f'Loaded configuration file : {args.configfile}')
     logger.info(f'Simulated time : {args.steps}s')
-    run(config, logger, csv_export)
+    run(config, logger, csv_export, dump_name)
 
 
 if __name__ == '__main__':