thib8956/sumo-emissions
1
0
Fork 0
mirror of https://github.com/Ahp06/SUMO_Emissions.git synced 2024-11-22 03:26:30 +00:00
Code Issues Releases Wiki Activity

Added c_dir option for loading multiple configs from a directory

Browse Source
This commit is contained in:
Ahp06 2019-01-23 14:56:41 +01:00
parent 882d1bf515
commit 4128060396
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sumo_project/config.py
View File

@ -42,7 +42,7 @@ class Config:
:param config_file: The path to your configuration file :param config_file: The path to your configuration file
:return: :return:
""" """
with open(f'files/configs/{config_file}.json', 'r') as f: with open(f'{config_file}.json', 'r') as f:
data = json.load(f) data = json.load(f)
for option in data: for option in data:

0
sumo_project/files/configs/config2.json → sumo_project/files/configs/config4.json
View File

BIN
sumo_project/files/imgs/runner_help.PNG
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 29 KiB

28
sumo_project/runner.py
View File

@ -204,6 +204,8 @@ def add_options(parser):
help='Run a simulation process with the dump chosen') help='Run a simulation process with the dump chosen')
parser.add_argument("-c", "--c", metavar =('config1','config2'), nargs='+', type=str, parser.add_argument("-c", "--c", metavar =('config1','config2'), nargs='+', type=str,
help='Choose your(s) configuration file(s) from your working directory') help='Choose your(s) configuration file(s) from your working directory')
parser.add_argument("-c_dir", "--c_dir", type=str,
help='Choose a directory which contains your(s) configuration file(s)')
parser.add_argument("-save", "--save", action="store_true", parser.add_argument("-save", "--save", action="store_true",
help='Save the logs into the logs folder') help='Save the logs into the logs folder')
parser.add_argument("-csv", "--csv", action="store_true", parser.add_argument("-csv", "--csv", action="store_true",
@ -230,17 +232,27 @@ def main(args):
data = jsonpickle.decode(f.read()) data = jsonpickle.decode(f.read())
process = [] process = []
files = []
if args.c is not None: if args.c is not None:
for conf in args.c: # Initialize all process for config in args.c:
files.append(f'files/configs/{config}')
config = Config(conf,data)
p = RunProcess(data, config,args.save,args.csv) if args.c_dir is not None:
process.append(p) path = f'files/configs/{args.c_dir}/'
p.start() bundle_files = [f for f in os.listdir(path) if os.path.isfile(os.path.join(path, f))]
for config in bundle_files:
for p in process : p.join() conf_formatted = config.replace('.json','')
files.append(f'files/configs/{args.c_dir}/{conf_formatted}')
for conf in files: # Initialize all process
config = Config(conf,data)
p = RunProcess(data, config,args.save,args.csv)
process.append(p)
p.start()
for p in process : p.join()
if __name__ == '__main__': if __name__ == '__main__':
main(sys.argv[1:]) main(sys.argv[1:])