From 2f20a9c2b5457e4e1d9a064f43e1d3b5d324b7d8 Mon Sep 17 00:00:00 2001
From: Ahp06 <axno@hotmail.fr>
Date: Sun, 20 Jan 2019 15:56:05 +0100
Subject: [PATCH] Separated data loading and simulation run

---
 sumo_project/config.py                        |   9 +-
 sumo_project/data.py                          |  19 +--
 .../files/configs/default_config.json         |   2 -
 sumo_project/files/imgs/runner_example.PNG    | Bin 3619 -> 0 bytes
 sumo_project/files/imgs/runner_help.PNG       | Bin 20732 -> 0 bytes
 sumo_project/model.py                         |   7 +-
 sumo_project/runner.py                        | 138 +++++++++---------
 7 files changed, 87 insertions(+), 88 deletions(-)
 delete mode 100644 sumo_project/files/imgs/runner_example.PNG
 delete mode 100644 sumo_project/files/imgs/runner_help.PNG

diff --git a/sumo_project/config.py b/sumo_project/config.py
index 21ba604..4c17a9c 100644
--- a/sumo_project/config.py
+++ b/sumo_project/config.py
@@ -31,7 +31,7 @@ class Config:
         """
         Default constructor
         """
-
+        
     def import_config_file(self, config_file):
         """
         Import your configuration file in JSON format
@@ -78,8 +78,8 @@ class Config:
             f'adjust traffic light mode = {self.adjust_traffic_light_mode},'
             f'RF = {self.trafficLights_duration_rf * 100}%\n'
         )
-
-    def init_traci(self):
+        
+    def init_traci(self, simulation_dir):
         """
         Init the Traci API
         :return:
@@ -89,7 +89,8 @@ class Config:
             sys.path.append(tools)
         else:
             sys.exit("please declare environment variable 'SUMO_HOME'")
-
+        
+        self._SUMOCFG = f'files/simulations/{simulation_dir}/osm.sumocfg'
         sumo_binary = os.path.join(os.environ['SUMO_HOME'], 'bin', self._SUMOCMD)
         self.sumo_cmd = [sumo_binary, "-c", self._SUMOCFG]
 
diff --git a/sumo_project/data.py b/sumo_project/data.py
index 039d4f7..eda25c0 100644
--- a/sumo_project/data.py
+++ b/sumo_project/data.py
@@ -25,30 +25,25 @@ from parse import search
 from shapely.geometry import LineString
 
 import actions
-from config import Config
 from model import Area, Vehicle, Lane, TrafficLight, Phase, Logic, Emission
 
 
 class Data: 
     
-    def __init__(self, map_bounds, config : Config):
+    def __init__(self, map_bounds, areas_number,simulation_dir):
         """
         Data constructor
         """
         self.map_bounds = map_bounds
-        self.config = config
-    
+        self.areas_number = areas_number
+        self.dir = simulation_dir
+        
     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
+        Initialize the grid of the loaded map from the cfg file with areas_number x areas_number areas
         """
         self.grid = list()
-        areas_number = self.config.areas_number
-        window_size = self.config.window_size
+        areas_number = self.areas_number
         
         width = self.map_bounds[1][0] / areas_number
         height = self.map_bounds[1][1] / areas_number
@@ -58,7 +53,7 @@ class Data:
                 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)
+                area = Area(ar_bounds, name)
                 self.grid.append(area)
         return self.grid
     
diff --git a/sumo_project/files/configs/default_config.json b/sumo_project/files/configs/default_config.json
index ddb2037..ded4d80 100644
--- a/sumo_project/files/configs/default_config.json
+++ b/sumo_project/files/configs/default_config.json
@@ -1,8 +1,6 @@
 {
     "_SUMOCMD": "sumo",
-	"_SUMOCFG": "files/simulations/mulhouse_simulation/osm.sumocfg",
 	
-	"areas_number": 10,
 	"emissions_threshold": 500000, 
 	"n_steps": 200,
 	"window_size":100,
diff --git a/sumo_project/files/imgs/runner_example.PNG b/sumo_project/files/imgs/runner_example.PNG
deleted file mode 100644
index 639ce844a3c0072c39b1b5de7f7e23f1ebc7f677..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3619
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

diff --git a/sumo_project/files/imgs/runner_help.PNG b/sumo_project/files/imgs/runner_help.PNG
deleted file mode 100644
index 3eeee9d77ea097ca66605e1c92998fe48d87b2e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20732
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
Bt8oAT

diff --git a/sumo_project/model.py b/sumo_project/model.py
index 25cea9c..2d1593f 100644
--- a/sumo_project/model.py
+++ b/sumo_project/model.py
@@ -153,13 +153,12 @@ class Area:
     The Area class defines a grid area of the simulation map
     """
 
-    def __init__(self, coords, name, window_size):
+    def __init__(self, coords, name):
         """
         Area constructor
         :param coords: The coordinates of the zone,
         defined by the bounds coordinates of this area : (xmin, ymin, xmax, ymax)
         :param name: The Area name
-        :param window_size: The size of the acquisition window
         """
         self.limited_speed = False
         self.locked = False
@@ -168,10 +167,12 @@ class Area:
         self.rectangle = Polygon(coords)
         self.name = name
         self.emissions_by_step = []
-        self.window = collections.deque(maxlen=window_size)
         self._lanes: Set[Lane] = set()
         self._tls: Set[TrafficLight] = set()
 
+    def set_window_size(self, window_size):
+        self.window = collections.deque(maxlen=window_size)
+        
     def __eq__(self, other):
         """
         Overrides the equal definition
diff --git a/sumo_project/runner.py b/sumo_project/runner.py
index 9c1cf7f..e732027 100644
--- a/sumo_project/runner.py
+++ b/sumo_project/runner.py
@@ -1,7 +1,7 @@
 '''
 Created on 19 janv. 2019
 
-@author: Admin
+@author: Axel Huynh-Phuc
 '''
 
 import argparse
@@ -17,50 +17,58 @@ from data import Data
 import emissions
 from model import Emission
 
+"""
+Init the Traci API
+"""
+if 'SUMO_HOME' in os.environ:
+    tools = os.path.join(os.environ['SUMO_HOME'], 'tools')
+    sys.path.append(tools)
+else:
+    sys.exit("please declare environment variable 'SUMO_HOME'")
 
+        
 def add_options(parser):
     """
     Add command line options
     :param parser: The command line parser
     :return:
     """
-    parser.add_argument("-new_dump", "--new_dump", metavar=('config_file', 'dump_name'), nargs=2, type=str,
+    
+    # TODO: Faire que -areas & -simulation_dir soit requis si -new_dump 
+    # Faire que -c soit requis si -run
+     
+    parser.add_argument("-new_dump", "--new_dump", type=str,
                         required=False, help='Load and create a new data dump with the configuration file chosen')
-    parser.add_argument("-run", "--run", type=str, required=False,
+    parser.add_argument("-areas", "--areas", type=int, required=False,
+                        help='Will create a grid with "areas x areas" areas')
+    parser.add_argument("-simulation_dir", "--simulation_dir", type=str, required=False,
+                        help='Choose the simulation directory')
+    
+    parser.add_argument("-run", "--run", type=str,
                         help='Run a simulation with the dump chosen')
-        
+    parser.add_argument("-c", "--c", type=str, 
+                        help='Choose your configuration file from your working directory')
     parser.add_argument("-save", "--save", action="store_true",
                         help='Save the logs into the logs folder')
     parser.add_argument("-csv", "--csv", action="store_true",
                         help="Export all data emissions into a CSV file")
+
     
-    parser.add_argument("-steps", "--steps", type=int, default=200, required=False,
-                        help='Choose the simulated time (in seconds)')
-    parser.add_argument("-ref", "--ref", action="store_true",
-                        help='Launch a reference simulation (without acting on areas)')
-    parser.add_argument("-gui", "--gui", action="store_true",
-                        help="Set GUI mode")
-
-
-def create_dump(config_file, dump_name):
+def create_dump(dump_name, simulation_dir, areas_number):
     """
     Create a new dump with config file and dump_name chosen 
-    :param config_file: The configuration file 
-    :param dump_name: The dump name
+    :param cfg_file: The simulation file 
+    :param areas_number: The number of areas in grid 
     :return:
     """
-    config = Config()
-    config.import_config_file(config_file)
-    config.check_config()
-    config.init_traci()
     
     sumo_binary = os.path.join(os.environ['SUMO_HOME'], 'bin', 'sumo')
-    sumo_cmd = [sumo_binary, "-c", config._SUMOCFG]
+    sumo_cmd = [sumo_binary, "-c", f'files/simulations/{simulation_dir}/osm.sumocfg']
     
     traci.start(sumo_cmd)
     if not os.path.isfile(f'files/dump/{dump_name}.json'):
         start = time.perf_counter()
-        data = Data(traci.simulation.getNetBoundary(), config)
+        data = Data(traci.simulation.getNetBoundary(), areas_number, simulation_dir)
         data.init_grid()
         data.add_data_to_areas() 
         data.save(dump_name)
@@ -74,32 +82,33 @@ def create_dump(config_file, dump_name):
     traci.close(False)
 
 
-def run(data : Data, logger):
+def run(data : Data, config : Config, logger):
     """
     Run a data set 
     :param data: The data instance 
     :param logger: The logger instance
     """
     try:
-        traci.start(data.config.sumo_cmd)
+        traci.start(config.sumo_cmd)
                         
-        for area in data.grid: 
+        for area in data.grid: # Set acquisition window size 
+            area.set_window_size(config.window_size)
             traci.polygon.add(area.name, area.rectangle.exterior.coords, (255, 0, 0))  # Add polygon for UI
 
-        logger.info(f'Loaded simulation file : {data.config._SUMOCFG}')
+        logger.info(f'Loaded simulation file : {config._SUMOCFG}')
         logger.info('Loading data for the simulation')
         start = time.perf_counter()
         
         logger.info('Simulation started...')
         step = 0
-        while step < data.config.n_steps:
+        while step < config.n_steps:
             traci.simulationStep()
     
             vehicles = emissions.get_all_vehicles()
-            emissions.get_emissions(data.grid, vehicles, step, data.config, logger)
+            emissions.get_emissions(data.grid, vehicles, step, config, logger)
             step += 1
     
-            print(f'step = {step}/{data.config.n_steps}', end='\r')
+            print(f'step = {step}/{config.n_steps}', end='\r')
     
     finally:
         traci.close(False)
@@ -116,59 +125,54 @@ def main(args):
     args = parser.parse_args(args)
     
     if args.new_dump is not None:
-        create_dump(args.new_dump[0], args.new_dump[1])  # (config_file, dump_name)
+        if (args.simulation_dir is not None) and (args.areas is not None): 
+            create_dump(args.new_dump, args.simulation_dir, args.areas)
     
     if args.run is not None:
         dump_path = f'files/dump/{args.run}.json'
         if os.path.isfile(dump_path):
             with open(dump_path, 'r') as f:
                 data = jsonpickle.decode(f.read())
-                
-            data.config.init_traci()
-            logger = data.config.init_logger(dump_name=args.run, save_logs=args.save)
-                
-            if args.gui: 
-                data.config._SUMOCMD = "sumo-gui"
-                
-            if args.ref:
-                data.config.without_actions_mode = True
-                logger.info(f'Reference simulation')
-
-            if args.steps:
-                data.config.n_steps = args.steps
             
-            data.config.check_config()    
+            config = Config() 
+            if args.c is not None: 
+                config.import_config_file(args.c)
+                config.init_traci(data.dir)
+                logger = config.init_logger(dump_name=args.run, save_logs=args.save)
+                config.check_config() 
             
             logger.info(f'Running simulation dump {args.run}...')  
             start = time.perf_counter()
-            run(data, logger)
+            
+            run(data, config, logger)
+            
             simulation_time = round(time.perf_counter() - start, 2)
             logger.info(f'End of the simulation ({simulation_time}s)')
     
-    if args.csv:
-        emissions.export_data_to_csv(data.config, data.grid, dump_name=args.run)
-        logger.info(f'Exported data into the csv folder')
+            if args.csv:
+                emissions.export_data_to_csv(config, data.grid, dump_name=args.run)
+                logger.info(f'Exported data into the csv folder')
     
-    # 1 step is equal to one second simulated
-    logger.info(f'Real-time factor : {data.config.n_steps / simulation_time}')
-    
-    total_emissions = Emission()
-    for area in data.grid:
-        total_emissions += area.sum_all_emissions()
-    
-    logger.info(f'Total emissions = {total_emissions.value()} mg')
-    
-    if not data.config.without_actions_mode:  # If it's not a simulation without actions
-        ref = data.config.get_ref_emissions()
-        if not (ref is None):  # If a reference value exist (add yours into config.py)
-            global_diff = (ref.value() - total_emissions.value()) / ref.value()
-    
-            logger.info(f'Global reduction percentage of emissions = {global_diff * 100} %')
-            logger.info(f'-> CO2 emissions = {emissions.get_reduction_percentage(ref.co2, total_emissions.co2)} %')
-            logger.info(f'-> CO emissions = {emissions.get_reduction_percentage(ref.co, total_emissions.co)} %')
-            logger.info(f'-> Nox emissions = {emissions.get_reduction_percentage(ref.nox, total_emissions.nox)} %')
-            logger.info(f'-> HC emissions = {emissions.get_reduction_percentage(ref.hc, total_emissions.hc)} %')
-            logger.info(f'-> PMx emissions = {emissions.get_reduction_percentage(ref.pmx, total_emissions.pmx)} %')    
+            # 1 step is equal to one second simulated
+            logger.info(f'Real-time factor : {config.n_steps / simulation_time}')
+            
+            total_emissions = Emission()
+            for area in data.grid:
+                total_emissions += area.sum_all_emissions()
+            
+            logger.info(f'Total emissions = {total_emissions.value()} mg')
+            
+            if not config.without_actions_mode:  # If it's not a simulation without actions
+                ref = config.get_ref_emissions()
+                if not (ref is None):  # If a reference value exist (add yours into config.py)
+                    global_diff = (ref.value() - total_emissions.value()) / ref.value()
+            
+                    logger.info(f'Global reduction percentage of emissions = {global_diff * 100} %')
+                    logger.info(f'-> CO2 emissions = {emissions.get_reduction_percentage(ref.co2, total_emissions.co2)} %')
+                    logger.info(f'-> CO emissions = {emissions.get_reduction_percentage(ref.co, total_emissions.co)} %')
+                    logger.info(f'-> Nox emissions = {emissions.get_reduction_percentage(ref.nox, total_emissions.nox)} %')
+                    logger.info(f'-> HC emissions = {emissions.get_reduction_percentage(ref.hc, total_emissions.hc)} %')
+                    logger.info(f'-> PMx emissions = {emissions.get_reduction_percentage(ref.pmx, total_emissions.pmx)} %')    
 
     
 if __name__ == '__main__':