From 8fd5b69e8ef168f79e806a2be6538ad5cd2d2811 Mon Sep 17 00:00:00 2001 From: Jenish Patel Date: Wed, 19 May 2021 17:16:22 +0000 Subject: [PATCH 1/3] update existing maps --- ultra/tests/test_analysis.py | 2 + ultra/ultra/scenarios/generate_scenarios.py | 9 +- ultra/ultra/scenarios/interface.py | 11 +- .../scenarios/pool/2lane_c/100kmh/map.net.xml | 430 +++++++-------- .../scenarios/pool/2lane_c/50kmh/map.net.xml | 430 +++++++-------- .../scenarios/pool/2lane_c/70kmh/map.net.xml | 430 +++++++-------- ultra/ultra/scenarios/pool/2lane_c/info.json | 0 .../pool/2lane_curvy_t/100kmh/map.net.xml | 248 ++++----- .../pool/2lane_curvy_t/50kmh/map.net.xml | 248 ++++----- .../pool/2lane_curvy_t/70kmh/map.net.xml | 266 ++++------ .../scenarios/pool/2lane_curvy_t/info.json | 0 .../scenarios/pool/2lane_t/100kmh/map.net.xml | 248 ++++----- .../scenarios/pool/2lane_t/50kmh/map.net.xml | 248 ++++----- .../scenarios/pool/2lane_t/70kmh/map.net.xml | 248 ++++----- ultra/ultra/scenarios/pool/2lane_t/info.json | 0 .../scenarios/pool/3lane_c/100kmh/map.net.xml | 442 ++++++++------- .../scenarios/pool/3lane_c/50kmh/map.net.xml | 442 ++++++++------- .../scenarios/pool/3lane_c/70kmh/map.net.xml | 442 ++++++++------- ultra/ultra/scenarios/pool/3lane_c/info.json | 0 .../scenarios/pool/3lane_t/100kmh/map.net.xml | 270 +++++----- .../scenarios/pool/3lane_t/50kmh/map.net.xml | 270 +++++----- .../scenarios/pool/3lane_t/70kmh/map.net.xml | 270 +++++----- ultra/ultra/scenarios/pool/3lane_t/info.json | 0 .../scenarios/pool/4lane_c/100kmh/map.net.xml | 478 ++++++++--------- .../scenarios/pool/4lane_c/50kmh/map.net.xml | 478 ++++++++--------- .../scenarios/pool/4lane_c/70kmh/map.net.xml | 478 ++++++++--------- ultra/ultra/scenarios/pool/4lane_c/info.json | 0 .../scenarios/pool/4lane_t/100kmh/map.net.xml | 286 +++++----- .../scenarios/pool/4lane_t/50kmh/map.net.xml | 286 +++++----- .../scenarios/pool/4lane_t/70kmh/map.net.xml | 286 +++++----- ultra/ultra/scenarios/pool/4lane_t/info.json | 0 .../scenarios/pool/5lane_c/100kmh/map.net.xml | 490 ++++++++--------- .../scenarios/pool/5lane_c/50kmh/map.net.xml | 490 ++++++++--------- .../scenarios/pool/5lane_c/70kmh/map.net.xml | 490 ++++++++--------- ultra/ultra/scenarios/pool/5lane_c/info.json | 0 .../scenarios/pool/5lane_t/100kmh/map.net.xml | 318 +++++------ .../scenarios/pool/5lane_t/50kmh/map.net.xml | 318 +++++------ .../scenarios/pool/5lane_t/70kmh/map.net.xml | 318 +++++------ ultra/ultra/scenarios/pool/5lane_t/info.json | 0 .../scenarios/pool/6lane_c/100kmh/map.net.xml | 502 +++++++++--------- .../scenarios/pool/6lane_c/50kmh/map.net.xml | 502 +++++++++--------- .../scenarios/pool/6lane_c/70kmh/map.net.xml | 502 +++++++++--------- ultra/ultra/scenarios/pool/6lane_c/info.json | 0 .../scenarios/pool/6lane_t/100kmh/map.net.xml | 330 ++++++------ .../scenarios/pool/6lane_t/50kmh/map.net.xml | 330 ++++++------ .../scenarios/pool/6lane_t/70kmh/map.net.xml | 330 ++++++------ ultra/ultra/scenarios/pool/6lane_t/info.json | 0 .../analysis_pool/2lane_c/100kmh/map.net.xml | 226 ++++++++ .../analysis_pool/2lane_c/50kmh/map.net.xml | 226 ++++++++ .../analysis_pool/2lane_c/70kmh/map.net.xml | 226 ++++++++ .../pool/analysis_pool/2lane_c/info.json | 4 + .../2lane_curvy_t/100kmh/map.net.xml | 135 +++++ .../2lane_curvy_t/50kmh/map.net.xml | 135 +++++ .../2lane_curvy_t/70kmh/map.net.xml | 153 ++++++ .../analysis_pool/2lane_curvy_t/info.json | 2 + .../analysis_pool/2lane_t/100kmh/map.net.xml | 135 +++++ .../analysis_pool/2lane_t/50kmh/map.net.xml | 135 +++++ .../analysis_pool/2lane_t/70kmh/map.net.xml | 135 +++++ .../pool/analysis_pool/2lane_t/info.json | 2 + .../analysis_pool/3lane_c/100kmh/map.net.xml | 232 ++++++++ .../analysis_pool/3lane_c/50kmh/map.net.xml | 232 ++++++++ .../analysis_pool/3lane_c/70kmh/map.net.xml | 232 ++++++++ .../pool/analysis_pool/3lane_c/info.json | 4 + .../analysis_pool/3lane_t/100kmh/map.net.xml | 146 +++++ .../analysis_pool/3lane_t/50kmh/map.net.xml | 146 +++++ .../analysis_pool/3lane_t/70kmh/map.net.xml | 146 +++++ .../pool/analysis_pool/3lane_t/info.json | 2 + .../analysis_pool/4lane_c/100kmh/map.net.xml | 250 +++++++++ .../analysis_pool/4lane_c/50kmh/map.net.xml | 250 +++++++++ .../analysis_pool/4lane_c/70kmh/map.net.xml | 250 +++++++++ .../pool/analysis_pool/4lane_c/info.json | 4 + .../analysis_pool/4lane_t/100kmh/map.net.xml | 154 ++++++ .../analysis_pool/4lane_t/50kmh/map.net.xml | 154 ++++++ .../analysis_pool/4lane_t/70kmh/map.net.xml | 154 ++++++ .../pool/analysis_pool/4lane_t/info.json | 2 + .../analysis_pool/5lane_c/100kmh/map.net.xml | 256 +++++++++ .../analysis_pool/5lane_c/50kmh/map.net.xml | 256 +++++++++ .../analysis_pool/5lane_c/70kmh/map.net.xml | 256 +++++++++ .../pool/analysis_pool/5lane_c/info.json | 4 + .../analysis_pool/5lane_t/100kmh/map.net.xml | 171 ++++++ .../analysis_pool/5lane_t/50kmh/map.net.xml | 171 ++++++ .../analysis_pool/5lane_t/70kmh/map.net.xml | 171 ++++++ .../pool/analysis_pool/5lane_t/info.json | 2 + .../analysis_pool/6lane_c/100kmh/map.net.xml | 262 +++++++++ .../analysis_pool/6lane_c/50kmh/map.net.xml | 262 +++++++++ .../analysis_pool/6lane_c/70kmh/map.net.xml | 262 +++++++++ .../pool/analysis_pool/6lane_c/info.json | 4 + .../analysis_pool/6lane_t/100kmh/map.net.xml | 177 ++++++ .../analysis_pool/6lane_t/50kmh/map.net.xml | 177 ++++++ .../analysis_pool/6lane_t/70kmh/map.net.xml | 177 ++++++ .../pool/analysis_pool/6lane_t/info.json | 2 + .../behavior_race/70kmh/map.net.xml | 140 +++++ .../behavior_race/70kmh/road_speeds.json | 1 + .../analysis_pool/behavior_race/info.json | 4 + .../pool/behavior_race/70kmh/map.net.xml | 258 ++++----- 95 files changed, 12457 insertions(+), 6594 deletions(-) mode change 100755 => 100644 ultra/ultra/scenarios/pool/2lane_c/100kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/2lane_c/50kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/2lane_c/70kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/2lane_c/info.json mode change 100755 => 100644 ultra/ultra/scenarios/pool/2lane_curvy_t/100kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/2lane_curvy_t/50kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/2lane_curvy_t/70kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/2lane_curvy_t/info.json mode change 100755 => 100644 ultra/ultra/scenarios/pool/2lane_t/100kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/2lane_t/50kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/2lane_t/70kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/2lane_t/info.json mode change 100755 => 100644 ultra/ultra/scenarios/pool/3lane_c/100kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/3lane_c/50kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/3lane_c/70kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/3lane_c/info.json mode change 100755 => 100644 ultra/ultra/scenarios/pool/3lane_t/100kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/3lane_t/50kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/3lane_t/70kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/3lane_t/info.json mode change 100755 => 100644 ultra/ultra/scenarios/pool/4lane_c/100kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/4lane_c/50kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/4lane_c/70kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/4lane_c/info.json mode change 100755 => 100644 ultra/ultra/scenarios/pool/4lane_t/100kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/4lane_t/50kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/4lane_t/70kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/4lane_t/info.json mode change 100755 => 100644 ultra/ultra/scenarios/pool/5lane_c/100kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/5lane_c/50kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/5lane_c/70kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/5lane_c/info.json mode change 100755 => 100644 ultra/ultra/scenarios/pool/5lane_t/100kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/5lane_t/50kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/5lane_t/70kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/5lane_t/info.json mode change 100755 => 100644 ultra/ultra/scenarios/pool/6lane_c/100kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/6lane_c/50kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/6lane_c/70kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/6lane_c/info.json mode change 100755 => 100644 ultra/ultra/scenarios/pool/6lane_t/100kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/6lane_t/50kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/6lane_t/70kmh/map.net.xml mode change 100755 => 100644 ultra/ultra/scenarios/pool/6lane_t/info.json create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/2lane_c/100kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/2lane_c/50kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/2lane_c/70kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/2lane_c/info.json create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/100kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/50kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/70kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/info.json create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/2lane_t/100kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/2lane_t/50kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/2lane_t/70kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/2lane_t/info.json create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/3lane_c/100kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/3lane_c/50kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/3lane_c/70kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/3lane_c/info.json create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/3lane_t/100kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/3lane_t/50kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/3lane_t/70kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/3lane_t/info.json create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/4lane_c/100kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/4lane_c/50kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/4lane_c/70kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/4lane_c/info.json create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/4lane_t/100kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/4lane_t/50kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/4lane_t/70kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/4lane_t/info.json create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/5lane_c/100kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/5lane_c/50kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/5lane_c/70kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/5lane_c/info.json create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/5lane_t/100kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/5lane_t/50kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/5lane_t/70kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/5lane_t/info.json create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/6lane_c/100kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/6lane_c/50kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/6lane_c/70kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/6lane_c/info.json create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/6lane_t/100kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/6lane_t/50kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/6lane_t/70kmh/map.net.xml create mode 100755 ultra/ultra/scenarios/pool/analysis_pool/6lane_t/info.json create mode 100644 ultra/ultra/scenarios/pool/analysis_pool/behavior_race/70kmh/map.net.xml create mode 100644 ultra/ultra/scenarios/pool/analysis_pool/behavior_race/70kmh/road_speeds.json create mode 100644 ultra/ultra/scenarios/pool/analysis_pool/behavior_race/info.json diff --git a/ultra/tests/test_analysis.py b/ultra/tests/test_analysis.py index d9e756ef63..0d0c144f96 100644 --- a/ultra/tests/test_analysis.py +++ b/ultra/tests/test_analysis.py @@ -54,6 +54,7 @@ def test_interface_analyze(self): stopwatcher_route="south-west", root_path="tests/scenarios", save_dir=save_dir, + pool_dir="pool/analysis_pool" ) if not os.path.exists(output): @@ -98,6 +99,7 @@ def test_analyze_scenario(self): stopwatcher_route="south-west", root_path="tests/scenarios", save_dir=save_dir, + pool_dir="pool/analysis_pool", ) scenarios = glob.glob(f"{save_dir}") try: diff --git a/ultra/ultra/scenarios/generate_scenarios.py b/ultra/ultra/scenarios/generate_scenarios.py index 39a9bdd3c9..9b20db5f29 100644 --- a/ultra/ultra/scenarios/generate_scenarios.py +++ b/ultra/ultra/scenarios/generate_scenarios.py @@ -686,6 +686,7 @@ def build_scenarios( stopwatcher_route, save_dir, root_path, + pool_dir=None, dynamic_pattern_func=None, ): print("Generating Scenario ...") @@ -700,7 +701,11 @@ def build_scenarios( level_config = task_config["levels"][level_name] scenarios_dir = os.path.dirname(os.path.realpath(__file__)) task_dir = f"{scenarios_dir}/{task}" - pool_dir = f"{scenarios_dir}/pool" + + if pool_dir is None: + pool_path = os.path.join(scenarios_dir, "pool") + else: + pool_path = os.path.join(scenarios_dir, pool_dir) train_total, test_total = ( int(level_config["train"]["total"]), @@ -751,7 +756,7 @@ def build_scenarios( reverse=True, ) seed_count = 0 - map_dir = f"{pool_dir}/{intersection_type}" + map_dir = f"{pool_path}/{intersection_type}" with open(f"{map_dir}/info.json") as jsonfile: map_metadata = json.load(jsonfile) route_lanes = map_metadata["num_lanes"] diff --git a/ultra/ultra/scenarios/interface.py b/ultra/ultra/scenarios/interface.py index 85a7d6cfa1..aabf9290dd 100644 --- a/ultra/ultra/scenarios/interface.py +++ b/ultra/ultra/scenarios/interface.py @@ -53,14 +53,20 @@ "--task", help="type a task id [0, 1, 2, 3]", type=str ) parser_generate_scenarios.add_argument( - "--save-dir", help="directory for saving maps", type=str, default=None + "--save-dir", help="directory for saving scenarios", type=str, default=None ) parser_generate_scenarios.add_argument( "--root-dir", - help="directory for saving maps", + help="directory for saving scenarios", type=str, default="ultra/scenarios", ) + parser_generate_scenarios.add_argument( + "--pool-dir", + help="directory for locating maps", + type=str, + default=None, + ) parser_generate_scenarios.add_argument("--level", help="easy/medium/hard", type=str) parser_generate_scenarios.add_argument( "--stopwatcher", @@ -133,6 +139,7 @@ stopwatcher_route=stopwatcher_route, save_dir=args.save_dir, root_path=args.root_dir, + pool_dir=args.pool_dir, ) else: ray.init() diff --git a/ultra/ultra/scenarios/pool/2lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/2lane_c/100kmh/map.net.xml old mode 100755 new mode 100644 index 5f716e1964..faebdb2ece --- a/ultra/ultra/scenarios/pool/2lane_c/100kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/2lane_c/100kmh/map.net.xml @@ -1,226 +1,204 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/2lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/2lane_c/50kmh/map.net.xml old mode 100755 new mode 100644 index 14bbacb5d4..e6267a4e09 --- a/ultra/ultra/scenarios/pool/2lane_c/50kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/2lane_c/50kmh/map.net.xml @@ -1,226 +1,204 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/2lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/2lane_c/70kmh/map.net.xml old mode 100755 new mode 100644 index 80552e7a96..0e6b3e88b5 --- a/ultra/ultra/scenarios/pool/2lane_c/70kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/2lane_c/70kmh/map.net.xml @@ -1,226 +1,204 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/2lane_c/info.json b/ultra/ultra/scenarios/pool/2lane_c/info.json old mode 100755 new mode 100644 diff --git a/ultra/ultra/scenarios/pool/2lane_curvy_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/2lane_curvy_t/100kmh/map.net.xml old mode 100755 new mode 100644 index 7fede6d22f..b979834161 --- a/ultra/ultra/scenarios/pool/2lane_curvy_t/100kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/2lane_curvy_t/100kmh/map.net.xml @@ -1,135 +1,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/2lane_curvy_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/2lane_curvy_t/50kmh/map.net.xml old mode 100755 new mode 100644 index 732f175344..5554ac5ebc --- a/ultra/ultra/scenarios/pool/2lane_curvy_t/50kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/2lane_curvy_t/50kmh/map.net.xml @@ -1,135 +1,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/2lane_curvy_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/2lane_curvy_t/70kmh/map.net.xml old mode 100755 new mode 100644 index a1c4f06afd..18cb3317c1 --- a/ultra/ultra/scenarios/pool/2lane_curvy_t/70kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/2lane_curvy_t/70kmh/map.net.xml @@ -1,153 +1,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/2lane_curvy_t/info.json b/ultra/ultra/scenarios/pool/2lane_curvy_t/info.json old mode 100755 new mode 100644 diff --git a/ultra/ultra/scenarios/pool/2lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/2lane_t/100kmh/map.net.xml old mode 100755 new mode 100644 index c237673787..e471bd4f7b --- a/ultra/ultra/scenarios/pool/2lane_t/100kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/2lane_t/100kmh/map.net.xml @@ -1,135 +1,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/2lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/2lane_t/50kmh/map.net.xml old mode 100755 new mode 100644 index 7481187183..d95c743bdc --- a/ultra/ultra/scenarios/pool/2lane_t/50kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/2lane_t/50kmh/map.net.xml @@ -1,135 +1,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/2lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/2lane_t/70kmh/map.net.xml old mode 100755 new mode 100644 index de13cd75b4..1364e0daaf --- a/ultra/ultra/scenarios/pool/2lane_t/70kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/2lane_t/70kmh/map.net.xml @@ -1,135 +1,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/2lane_t/info.json b/ultra/ultra/scenarios/pool/2lane_t/info.json old mode 100755 new mode 100644 diff --git a/ultra/ultra/scenarios/pool/3lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/3lane_c/100kmh/map.net.xml old mode 100755 new mode 100644 index 2626a4259f..07c8629289 --- a/ultra/ultra/scenarios/pool/3lane_c/100kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/3lane_c/100kmh/map.net.xml @@ -1,232 +1,210 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/3lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/3lane_c/50kmh/map.net.xml old mode 100755 new mode 100644 index 7f9a1e9ff4..4a443aa080 --- a/ultra/ultra/scenarios/pool/3lane_c/50kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/3lane_c/50kmh/map.net.xml @@ -1,232 +1,210 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/3lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/3lane_c/70kmh/map.net.xml old mode 100755 new mode 100644 index 73361a2983..2b9fd98b21 --- a/ultra/ultra/scenarios/pool/3lane_c/70kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/3lane_c/70kmh/map.net.xml @@ -1,232 +1,210 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/3lane_c/info.json b/ultra/ultra/scenarios/pool/3lane_c/info.json old mode 100755 new mode 100644 diff --git a/ultra/ultra/scenarios/pool/3lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/3lane_t/100kmh/map.net.xml old mode 100755 new mode 100644 index e8ec2f6167..63f9ba71ab --- a/ultra/ultra/scenarios/pool/3lane_t/100kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/3lane_t/100kmh/map.net.xml @@ -1,146 +1,124 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/3lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/3lane_t/50kmh/map.net.xml old mode 100755 new mode 100644 index 6336328bdd..67d92011e7 --- a/ultra/ultra/scenarios/pool/3lane_t/50kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/3lane_t/50kmh/map.net.xml @@ -1,146 +1,124 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/3lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/3lane_t/70kmh/map.net.xml old mode 100755 new mode 100644 index a80b5a1323..1ade4e62e0 --- a/ultra/ultra/scenarios/pool/3lane_t/70kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/3lane_t/70kmh/map.net.xml @@ -1,146 +1,124 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/3lane_t/info.json b/ultra/ultra/scenarios/pool/3lane_t/info.json old mode 100755 new mode 100644 diff --git a/ultra/ultra/scenarios/pool/4lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/4lane_c/100kmh/map.net.xml old mode 100755 new mode 100644 index 1a86868793..f05b9e3e39 --- a/ultra/ultra/scenarios/pool/4lane_c/100kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/4lane_c/100kmh/map.net.xml @@ -1,250 +1,228 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/4lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/4lane_c/50kmh/map.net.xml old mode 100755 new mode 100644 index b0c35eb228..0c42e860a5 --- a/ultra/ultra/scenarios/pool/4lane_c/50kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/4lane_c/50kmh/map.net.xml @@ -1,250 +1,228 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/4lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/4lane_c/70kmh/map.net.xml old mode 100755 new mode 100644 index d2931112f5..020ec44e68 --- a/ultra/ultra/scenarios/pool/4lane_c/70kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/4lane_c/70kmh/map.net.xml @@ -1,250 +1,228 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/4lane_c/info.json b/ultra/ultra/scenarios/pool/4lane_c/info.json old mode 100755 new mode 100644 diff --git a/ultra/ultra/scenarios/pool/4lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/4lane_t/100kmh/map.net.xml old mode 100755 new mode 100644 index 2ed52f8865..b423a2b9ac --- a/ultra/ultra/scenarios/pool/4lane_t/100kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/4lane_t/100kmh/map.net.xml @@ -1,154 +1,132 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/4lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/4lane_t/50kmh/map.net.xml old mode 100755 new mode 100644 index ed49d0e6ac..09cfc2319a --- a/ultra/ultra/scenarios/pool/4lane_t/50kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/4lane_t/50kmh/map.net.xml @@ -1,154 +1,132 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/4lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/4lane_t/70kmh/map.net.xml old mode 100755 new mode 100644 index b9950093a4..95f4465be6 --- a/ultra/ultra/scenarios/pool/4lane_t/70kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/4lane_t/70kmh/map.net.xml @@ -1,154 +1,132 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/4lane_t/info.json b/ultra/ultra/scenarios/pool/4lane_t/info.json old mode 100755 new mode 100644 diff --git a/ultra/ultra/scenarios/pool/5lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/5lane_c/100kmh/map.net.xml old mode 100755 new mode 100644 index 8c53b1623d..4d13414329 --- a/ultra/ultra/scenarios/pool/5lane_c/100kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/5lane_c/100kmh/map.net.xml @@ -1,256 +1,234 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/5lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/5lane_c/50kmh/map.net.xml old mode 100755 new mode 100644 index 79f08fc267..94aa260a39 --- a/ultra/ultra/scenarios/pool/5lane_c/50kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/5lane_c/50kmh/map.net.xml @@ -1,256 +1,234 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/5lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/5lane_c/70kmh/map.net.xml old mode 100755 new mode 100644 index dd368ccedb..37a8bf0731 --- a/ultra/ultra/scenarios/pool/5lane_c/70kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/5lane_c/70kmh/map.net.xml @@ -1,256 +1,234 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/5lane_c/info.json b/ultra/ultra/scenarios/pool/5lane_c/info.json old mode 100755 new mode 100644 diff --git a/ultra/ultra/scenarios/pool/5lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/5lane_t/100kmh/map.net.xml old mode 100755 new mode 100644 index 86530adc29..cb7e1abf83 --- a/ultra/ultra/scenarios/pool/5lane_t/100kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/5lane_t/100kmh/map.net.xml @@ -1,171 +1,147 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/5lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/5lane_t/50kmh/map.net.xml old mode 100755 new mode 100644 index 387bd57c54..4c4ab8b92c --- a/ultra/ultra/scenarios/pool/5lane_t/50kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/5lane_t/50kmh/map.net.xml @@ -1,171 +1,147 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/5lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/5lane_t/70kmh/map.net.xml old mode 100755 new mode 100644 index 072016a009..ba21f5f9d3 --- a/ultra/ultra/scenarios/pool/5lane_t/70kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/5lane_t/70kmh/map.net.xml @@ -1,171 +1,147 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/5lane_t/info.json b/ultra/ultra/scenarios/pool/5lane_t/info.json old mode 100755 new mode 100644 diff --git a/ultra/ultra/scenarios/pool/6lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/6lane_c/100kmh/map.net.xml old mode 100755 new mode 100644 index e7142db6bf..36070dc7f1 --- a/ultra/ultra/scenarios/pool/6lane_c/100kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/6lane_c/100kmh/map.net.xml @@ -1,262 +1,240 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/6lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/6lane_c/50kmh/map.net.xml old mode 100755 new mode 100644 index aeeba1fcf2..d2eb541791 --- a/ultra/ultra/scenarios/pool/6lane_c/50kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/6lane_c/50kmh/map.net.xml @@ -1,262 +1,240 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/6lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/6lane_c/70kmh/map.net.xml old mode 100755 new mode 100644 index f2c7412af4..a31f043d47 --- a/ultra/ultra/scenarios/pool/6lane_c/70kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/6lane_c/70kmh/map.net.xml @@ -1,262 +1,240 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/6lane_c/info.json b/ultra/ultra/scenarios/pool/6lane_c/info.json old mode 100755 new mode 100644 diff --git a/ultra/ultra/scenarios/pool/6lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/6lane_t/100kmh/map.net.xml old mode 100755 new mode 100644 index 7bd42adeb7..e1ab33b7a8 --- a/ultra/ultra/scenarios/pool/6lane_t/100kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/6lane_t/100kmh/map.net.xml @@ -1,177 +1,153 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/6lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/6lane_t/50kmh/map.net.xml old mode 100755 new mode 100644 index eaecbccb65..913d56e728 --- a/ultra/ultra/scenarios/pool/6lane_t/50kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/6lane_t/50kmh/map.net.xml @@ -1,177 +1,153 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/6lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/6lane_t/70kmh/map.net.xml old mode 100755 new mode 100644 index 6417498ec0..fffc009728 --- a/ultra/ultra/scenarios/pool/6lane_t/70kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/6lane_t/70kmh/map.net.xml @@ -1,177 +1,153 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/6lane_t/info.json b/ultra/ultra/scenarios/pool/6lane_t/info.json old mode 100755 new mode 100644 diff --git a/ultra/ultra/scenarios/pool/analysis_pool/2lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/2lane_c/100kmh/map.net.xml new file mode 100755 index 0000000000..5f716e1964 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/2lane_c/100kmh/map.net.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/2lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/2lane_c/50kmh/map.net.xml new file mode 100755 index 0000000000..14bbacb5d4 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/2lane_c/50kmh/map.net.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/2lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/2lane_c/70kmh/map.net.xml new file mode 100755 index 0000000000..80552e7a96 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/2lane_c/70kmh/map.net.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/2lane_c/info.json b/ultra/ultra/scenarios/pool/analysis_pool/2lane_c/info.json new file mode 100755 index 0000000000..b333c9150c --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/2lane_c/info.json @@ -0,0 +1,4 @@ +{ + "routes" : [["north-NS", "south-NS"],["north-NS", "east-WE"],["north-NS", "west-EW"], ["south-SN", "west-EW"], ["south-SN", "east-WE"], ["south-SN", "north-SN"], ["east-EW","west-EW"], ["east-EW","south-NS"], ["east-EW", "north-SN"], ["west-WE","east-WE"],["west-WE","north-SN"],["west-WE","south-NS"] ], + "num_lanes": {"north-NS":1, "south-NS":1, "east-WE":1, "west-EW":1, "south-NS":1, "south-SN":1, "north-SN":1, "east-EW":1, "west-WE":1} +} diff --git a/ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/100kmh/map.net.xml new file mode 100755 index 0000000000..7fede6d22f --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/100kmh/map.net.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/50kmh/map.net.xml new file mode 100755 index 0000000000..732f175344 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/50kmh/map.net.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/70kmh/map.net.xml new file mode 100755 index 0000000000..a1c4f06afd --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/70kmh/map.net.xml @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/info.json b/ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/info.json new file mode 100755 index 0000000000..9e248172a2 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/2lane_curvy_t/info.json @@ -0,0 +1,2 @@ +{"routes": [["east-EW", "west-EW"], ["east-EW", "south-NS"], ["west-WE", "east-WE"], ["west-WE", "south-NS"], ["south-SN", "east-WE"], ["south-SN", "west-EW"]], +"num_lanes": {"east-EW": 1, "east-WE": 1, "west-EW": 1, "west-WE": 1, "south-SN": 1, "south-NS": 1}} diff --git a/ultra/ultra/scenarios/pool/analysis_pool/2lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/2lane_t/100kmh/map.net.xml new file mode 100755 index 0000000000..c237673787 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/2lane_t/100kmh/map.net.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/2lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/2lane_t/50kmh/map.net.xml new file mode 100755 index 0000000000..7481187183 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/2lane_t/50kmh/map.net.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/2lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/2lane_t/70kmh/map.net.xml new file mode 100755 index 0000000000..de13cd75b4 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/2lane_t/70kmh/map.net.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/2lane_t/info.json b/ultra/ultra/scenarios/pool/analysis_pool/2lane_t/info.json new file mode 100755 index 0000000000..9e248172a2 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/2lane_t/info.json @@ -0,0 +1,2 @@ +{"routes": [["east-EW", "west-EW"], ["east-EW", "south-NS"], ["west-WE", "east-WE"], ["west-WE", "south-NS"], ["south-SN", "east-WE"], ["south-SN", "west-EW"]], +"num_lanes": {"east-EW": 1, "east-WE": 1, "west-EW": 1, "west-WE": 1, "south-SN": 1, "south-NS": 1}} diff --git a/ultra/ultra/scenarios/pool/analysis_pool/3lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/3lane_c/100kmh/map.net.xml new file mode 100755 index 0000000000..2626a4259f --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/3lane_c/100kmh/map.net.xml @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/3lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/3lane_c/50kmh/map.net.xml new file mode 100755 index 0000000000..7f9a1e9ff4 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/3lane_c/50kmh/map.net.xml @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/3lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/3lane_c/70kmh/map.net.xml new file mode 100755 index 0000000000..73361a2983 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/3lane_c/70kmh/map.net.xml @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/3lane_c/info.json b/ultra/ultra/scenarios/pool/analysis_pool/3lane_c/info.json new file mode 100755 index 0000000000..ffb6cb7b37 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/3lane_c/info.json @@ -0,0 +1,4 @@ +{ + "routes" : [["north-NS", "south-NS"],["north-NS", "east-WE"],["north-NS", "west-EW"], ["south-SN", "west-EW"], ["south-SN", "east-WE"], ["south-SN", "north-SN"], ["east-EW","west-EW"], ["east-EW","south-NS"], ["east-EW", "north-SN"], ["west-WE","east-WE"],["west-WE","north-SN"],["west-WE","south-NS"] ], + "num_lanes": {"north-NS":1, "south-NS":1, "east-WE":2, "west-EW":1, "south-NS":1, "south-SN":1, "north-SN":1, "east-EW":1, "west-WE":2} +} diff --git a/ultra/ultra/scenarios/pool/analysis_pool/3lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/3lane_t/100kmh/map.net.xml new file mode 100755 index 0000000000..e8ec2f6167 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/3lane_t/100kmh/map.net.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/3lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/3lane_t/50kmh/map.net.xml new file mode 100755 index 0000000000..6336328bdd --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/3lane_t/50kmh/map.net.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/3lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/3lane_t/70kmh/map.net.xml new file mode 100755 index 0000000000..a80b5a1323 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/3lane_t/70kmh/map.net.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/3lane_t/info.json b/ultra/ultra/scenarios/pool/analysis_pool/3lane_t/info.json new file mode 100755 index 0000000000..59c0a60187 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/3lane_t/info.json @@ -0,0 +1,2 @@ +{"routes":[["east-EW", "west-EW"],["east-EW", "south-NS"],["west-WE", "east-WE"],["west-WE", "south-NS"],["south-SN", "east-WE"],["south-SN", "west-EW"]], +"num_lanes":{"east-EW":1, "west-EW":1, "west-WE":2, "east-WE":2, "south-NS":1, "south-SN":1}} diff --git a/ultra/ultra/scenarios/pool/analysis_pool/4lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/4lane_c/100kmh/map.net.xml new file mode 100755 index 0000000000..1a86868793 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/4lane_c/100kmh/map.net.xml @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/4lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/4lane_c/50kmh/map.net.xml new file mode 100755 index 0000000000..b0c35eb228 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/4lane_c/50kmh/map.net.xml @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/4lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/4lane_c/70kmh/map.net.xml new file mode 100755 index 0000000000..d2931112f5 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/4lane_c/70kmh/map.net.xml @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/4lane_c/info.json b/ultra/ultra/scenarios/pool/analysis_pool/4lane_c/info.json new file mode 100755 index 0000000000..b96ce845dd --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/4lane_c/info.json @@ -0,0 +1,4 @@ +{ + "routes" : [["north-NS", "south-NS"],["north-NS", "east-WE"],["north-NS", "west-EW"], ["south-SN", "west-EW"], ["south-SN", "east-WE"], ["south-SN", "north-SN"], ["east-EW","west-EW"], ["east-EW","south-NS"], ["east-EW", "north-SN"], ["west-WE","east-WE"],["west-WE","north-SN"],["west-WE","south-NS"]], + "num_lanes": {"north-NS":2, "south-NS":2, "east-WE":2, "west-EW":2, "south-NS":2, "south-SN":2, "north-SN":2, "east-EW":2, "west-WE":2} +} diff --git a/ultra/ultra/scenarios/pool/analysis_pool/4lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/4lane_t/100kmh/map.net.xml new file mode 100755 index 0000000000..2ed52f8865 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/4lane_t/100kmh/map.net.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/4lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/4lane_t/50kmh/map.net.xml new file mode 100755 index 0000000000..ed49d0e6ac --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/4lane_t/50kmh/map.net.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/4lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/4lane_t/70kmh/map.net.xml new file mode 100755 index 0000000000..b9950093a4 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/4lane_t/70kmh/map.net.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/4lane_t/info.json b/ultra/ultra/scenarios/pool/analysis_pool/4lane_t/info.json new file mode 100755 index 0000000000..e281b4bcfe --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/4lane_t/info.json @@ -0,0 +1,2 @@ +{"routes":[["east-EW", "west-EW"], ["east-EW", "south-NS"], ["west-WE", "east-WE"], ["west-WE", "south-NS"], ["south-SN", "west-EW"],["south-SN", "east-WE"]], + "num_lanes":{"east-EW":2, "west-EW":2, "south-NS":2, "south-SN":2, "east-WE":2, "west-WE":2}} diff --git a/ultra/ultra/scenarios/pool/analysis_pool/5lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/5lane_c/100kmh/map.net.xml new file mode 100755 index 0000000000..8c53b1623d --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/5lane_c/100kmh/map.net.xml @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/5lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/5lane_c/50kmh/map.net.xml new file mode 100755 index 0000000000..79f08fc267 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/5lane_c/50kmh/map.net.xml @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/5lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/5lane_c/70kmh/map.net.xml new file mode 100755 index 0000000000..dd368ccedb --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/5lane_c/70kmh/map.net.xml @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/5lane_c/info.json b/ultra/ultra/scenarios/pool/analysis_pool/5lane_c/info.json new file mode 100755 index 0000000000..8ad33ede9d --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/5lane_c/info.json @@ -0,0 +1,4 @@ +{ + "routes" : [["north-NS", "south-NS"],["north-NS", "east-WE"],["north-NS", "west-EW"], ["south-SN", "west-EW"], ["south-SN", "east-WE"], ["south-SN", "north-SN"], ["east-EW","west-EW"], ["east-EW","south-NS"], ["east-EW", "north-SN"], ["west-WE","east-WE"],["west-WE","north-SN"],["west-WE","south-NS"] ], + "num_lanes": {"north-NS":2, "south-NS":2, "east-WE":2, "west-EW":3, "south-NS":2, "south-SN":2, "north-SN":2, "east-EW":3, "west-WE":2} +} diff --git a/ultra/ultra/scenarios/pool/analysis_pool/5lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/5lane_t/100kmh/map.net.xml new file mode 100755 index 0000000000..86530adc29 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/5lane_t/100kmh/map.net.xml @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/5lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/5lane_t/50kmh/map.net.xml new file mode 100755 index 0000000000..387bd57c54 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/5lane_t/50kmh/map.net.xml @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/5lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/5lane_t/70kmh/map.net.xml new file mode 100755 index 0000000000..072016a009 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/5lane_t/70kmh/map.net.xml @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/5lane_t/info.json b/ultra/ultra/scenarios/pool/analysis_pool/5lane_t/info.json new file mode 100755 index 0000000000..94ee7ee6ce --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/5lane_t/info.json @@ -0,0 +1,2 @@ +{"routes":[["east-EW", "west-EW"], ["east-EW", "south-NS"], ["west-WE", "east-WE"], ["west-WE", "south-NS"], ["south-SN", "west-EW"],["south-SN", "east-WE"]], + "num_lanes":{"east-EW":3, "west-EW":3, "south-NS":2, "south-SN":2, "east-WE":2, "west-WE":2}} diff --git a/ultra/ultra/scenarios/pool/analysis_pool/6lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/6lane_c/100kmh/map.net.xml new file mode 100755 index 0000000000..e7142db6bf --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/6lane_c/100kmh/map.net.xml @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/6lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/6lane_c/50kmh/map.net.xml new file mode 100755 index 0000000000..aeeba1fcf2 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/6lane_c/50kmh/map.net.xml @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/6lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/6lane_c/70kmh/map.net.xml new file mode 100755 index 0000000000..f2c7412af4 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/6lane_c/70kmh/map.net.xml @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/6lane_c/info.json b/ultra/ultra/scenarios/pool/analysis_pool/6lane_c/info.json new file mode 100755 index 0000000000..92ca2e3b95 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/6lane_c/info.json @@ -0,0 +1,4 @@ +{ + "routes" : [["north-NS", "south-NS"],["north-NS", "east-WE"],["north-NS", "west-EW"], ["south-SN", "west-EW"], ["south-SN", "east-WE"], ["south-SN", "north-SN"], ["east-EW","west-EW"], ["east-EW","south-NS"], ["east-EW", "north-SN"], ["west-WE","east-WE"],["west-WE","north-SN"],["west-WE","south-NS"] ], + "num_lanes": {"north-NS":2, "south-NS":2, "east-WE":3, "west-EW":3, "south-NS":2, "south-SN":2, "north-SN":2, "east-EW":3, "west-WE":3} +} diff --git a/ultra/ultra/scenarios/pool/analysis_pool/6lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/6lane_t/100kmh/map.net.xml new file mode 100755 index 0000000000..7bd42adeb7 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/6lane_t/100kmh/map.net.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/6lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/6lane_t/50kmh/map.net.xml new file mode 100755 index 0000000000..eaecbccb65 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/6lane_t/50kmh/map.net.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/6lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/6lane_t/70kmh/map.net.xml new file mode 100755 index 0000000000..6417498ec0 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/6lane_t/70kmh/map.net.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/6lane_t/info.json b/ultra/ultra/scenarios/pool/analysis_pool/6lane_t/info.json new file mode 100755 index 0000000000..2fa6a30e5c --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/6lane_t/info.json @@ -0,0 +1,2 @@ +{"routes":[["east-EW", "west-EW"], ["east-EW", "south-NS"], ["west-WE", "east-WE"], ["west-WE", "south-NS"], ["south-SN", "west-EW"],["south-SN", "east-WE"]], + "num_lanes":{"east-EW":3, "west-EW":3, "south-NS":2, "south-SN":2, "east-WE":3, "west-WE":3}} diff --git a/ultra/ultra/scenarios/pool/analysis_pool/behavior_race/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/analysis_pool/behavior_race/70kmh/map.net.xml new file mode 100644 index 0000000000..5bf65115d8 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/behavior_race/70kmh/map.net.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ultra/ultra/scenarios/pool/analysis_pool/behavior_race/70kmh/road_speeds.json b/ultra/ultra/scenarios/pool/analysis_pool/behavior_race/70kmh/road_speeds.json new file mode 100644 index 0000000000..b3eb40c0e8 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/behavior_race/70kmh/road_speeds.json @@ -0,0 +1 @@ +{"(\"east-EW\",\"west-EW\")": 19.44} \ No newline at end of file diff --git a/ultra/ultra/scenarios/pool/analysis_pool/behavior_race/info.json b/ultra/ultra/scenarios/pool/analysis_pool/behavior_race/info.json new file mode 100644 index 0000000000..cbbc2264e4 --- /dev/null +++ b/ultra/ultra/scenarios/pool/analysis_pool/behavior_race/info.json @@ -0,0 +1,4 @@ +{ + "routes" : [["east-EW","west-EW"]], + "num_lanes": {"east-EW":10, "west-EW":10} +} diff --git a/ultra/ultra/scenarios/pool/behavior_race/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/behavior_race/70kmh/map.net.xml index 5bf65115d8..07bb46c3db 100644 --- a/ultra/ultra/scenarios/pool/behavior_race/70kmh/map.net.xml +++ b/ultra/ultra/scenarios/pool/behavior_race/70kmh/map.net.xml @@ -1,140 +1,118 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f857477008ba7d5510f887d94713a480b74260fd Mon Sep 17 00:00:00 2001 From: Jenish Patel Date: Wed, 19 May 2021 17:26:35 +0000 Subject: [PATCH 2/3] formatted --- ultra/tests/test_analysis.py | 2 +- ultra/ultra/scenarios/generate_scenarios.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ultra/tests/test_analysis.py b/ultra/tests/test_analysis.py index 0d0c144f96..fe986777cf 100644 --- a/ultra/tests/test_analysis.py +++ b/ultra/tests/test_analysis.py @@ -54,7 +54,7 @@ def test_interface_analyze(self): stopwatcher_route="south-west", root_path="tests/scenarios", save_dir=save_dir, - pool_dir="pool/analysis_pool" + pool_dir="pool/analysis_pool", ) if not os.path.exists(output): diff --git a/ultra/ultra/scenarios/generate_scenarios.py b/ultra/ultra/scenarios/generate_scenarios.py index 9b20db5f29..f6b001920d 100644 --- a/ultra/ultra/scenarios/generate_scenarios.py +++ b/ultra/ultra/scenarios/generate_scenarios.py @@ -701,7 +701,7 @@ def build_scenarios( level_config = task_config["levels"][level_name] scenarios_dir = os.path.dirname(os.path.realpath(__file__)) task_dir = f"{scenarios_dir}/{task}" - + if pool_dir is None: pool_path = os.path.join(scenarios_dir, "pool") else: From 30ebf22e45b44c4e19e67dc68f12b864fc2415c1 Mon Sep 17 00:00:00 2001 From: Jenish Patel Date: Wed, 19 May 2021 22:32:28 +0000 Subject: [PATCH 3/3] changes from review --- ultra/ultra/scenarios/generate_scenarios.py | 2 +- ultra/ultra/scenarios/interface.py | 2 +- .../pool/{ => experiment_pool}/2lane_c/100kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/2lane_c/50kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/2lane_c/70kmh/map.net.xml | 0 .../scenarios/pool/{ => experiment_pool}/2lane_c/info.json | 0 .../pool/{ => experiment_pool}/2lane_curvy_t/100kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/2lane_curvy_t/50kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/2lane_curvy_t/70kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/2lane_curvy_t/info.json | 0 .../pool/{ => experiment_pool}/2lane_t/100kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/2lane_t/50kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/2lane_t/70kmh/map.net.xml | 0 .../scenarios/pool/{ => experiment_pool}/2lane_t/info.json | 0 .../pool/{ => experiment_pool}/3lane_c/100kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/3lane_c/50kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/3lane_c/70kmh/map.net.xml | 0 .../scenarios/pool/{ => experiment_pool}/3lane_c/info.json | 0 .../pool/{ => experiment_pool}/3lane_t/100kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/3lane_t/50kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/3lane_t/70kmh/map.net.xml | 0 .../scenarios/pool/{ => experiment_pool}/3lane_t/info.json | 0 .../pool/{ => experiment_pool}/4lane_c/100kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/4lane_c/50kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/4lane_c/70kmh/map.net.xml | 0 .../scenarios/pool/{ => experiment_pool}/4lane_c/info.json | 0 .../pool/{ => experiment_pool}/4lane_t/100kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/4lane_t/50kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/4lane_t/70kmh/map.net.xml | 0 .../scenarios/pool/{ => experiment_pool}/4lane_t/info.json | 0 .../pool/{ => experiment_pool}/5lane_c/100kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/5lane_c/50kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/5lane_c/70kmh/map.net.xml | 0 .../scenarios/pool/{ => experiment_pool}/5lane_c/info.json | 0 .../pool/{ => experiment_pool}/5lane_t/100kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/5lane_t/50kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/5lane_t/70kmh/map.net.xml | 0 .../scenarios/pool/{ => experiment_pool}/5lane_t/info.json | 0 .../pool/{ => experiment_pool}/6lane_c/100kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/6lane_c/50kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/6lane_c/70kmh/map.net.xml | 0 .../scenarios/pool/{ => experiment_pool}/6lane_c/info.json | 0 .../pool/{ => experiment_pool}/6lane_t/100kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/6lane_t/50kmh/map.net.xml | 0 .../pool/{ => experiment_pool}/6lane_t/70kmh/map.net.xml | 0 .../scenarios/pool/{ => experiment_pool}/6lane_t/info.json | 0 .../pool/{ => experiment_pool}/behavior_race/70kmh/map.net.xml | 0 .../{ => experiment_pool}/behavior_race/70kmh/road_speeds.json | 0 .../pool/{ => experiment_pool}/behavior_race/info.json | 0 49 files changed, 2 insertions(+), 2 deletions(-) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/2lane_c/100kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/2lane_c/50kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/2lane_c/70kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/2lane_c/info.json (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/2lane_curvy_t/100kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/2lane_curvy_t/50kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/2lane_curvy_t/70kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/2lane_curvy_t/info.json (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/2lane_t/100kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/2lane_t/50kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/2lane_t/70kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/2lane_t/info.json (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/3lane_c/100kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/3lane_c/50kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/3lane_c/70kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/3lane_c/info.json (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/3lane_t/100kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/3lane_t/50kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/3lane_t/70kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/3lane_t/info.json (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/4lane_c/100kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/4lane_c/50kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/4lane_c/70kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/4lane_c/info.json (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/4lane_t/100kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/4lane_t/50kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/4lane_t/70kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/4lane_t/info.json (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/5lane_c/100kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/5lane_c/50kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/5lane_c/70kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/5lane_c/info.json (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/5lane_t/100kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/5lane_t/50kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/5lane_t/70kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/5lane_t/info.json (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/6lane_c/100kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/6lane_c/50kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/6lane_c/70kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/6lane_c/info.json (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/6lane_t/100kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/6lane_t/50kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/6lane_t/70kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/6lane_t/info.json (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/behavior_race/70kmh/map.net.xml (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/behavior_race/70kmh/road_speeds.json (100%) rename ultra/ultra/scenarios/pool/{ => experiment_pool}/behavior_race/info.json (100%) diff --git a/ultra/ultra/scenarios/generate_scenarios.py b/ultra/ultra/scenarios/generate_scenarios.py index f6b001920d..e5a87d6802 100644 --- a/ultra/ultra/scenarios/generate_scenarios.py +++ b/ultra/ultra/scenarios/generate_scenarios.py @@ -703,7 +703,7 @@ def build_scenarios( task_dir = f"{scenarios_dir}/{task}" if pool_dir is None: - pool_path = os.path.join(scenarios_dir, "pool") + pool_path = os.path.join(scenarios_dir, "pool/experiment_pool") else: pool_path = os.path.join(scenarios_dir, pool_dir) diff --git a/ultra/ultra/scenarios/interface.py b/ultra/ultra/scenarios/interface.py index aabf9290dd..917b04ce17 100644 --- a/ultra/ultra/scenarios/interface.py +++ b/ultra/ultra/scenarios/interface.py @@ -57,7 +57,7 @@ ) parser_generate_scenarios.add_argument( "--root-dir", - help="directory for saving scenarios", + help="path to task directory", type=str, default="ultra/scenarios", ) diff --git a/ultra/ultra/scenarios/pool/2lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/2lane_c/100kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/2lane_c/100kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/2lane_c/100kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/2lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/2lane_c/50kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/2lane_c/50kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/2lane_c/50kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/2lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/2lane_c/70kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/2lane_c/70kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/2lane_c/70kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/2lane_c/info.json b/ultra/ultra/scenarios/pool/experiment_pool/2lane_c/info.json similarity index 100% rename from ultra/ultra/scenarios/pool/2lane_c/info.json rename to ultra/ultra/scenarios/pool/experiment_pool/2lane_c/info.json diff --git a/ultra/ultra/scenarios/pool/2lane_curvy_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/2lane_curvy_t/100kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/2lane_curvy_t/100kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/2lane_curvy_t/100kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/2lane_curvy_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/2lane_curvy_t/50kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/2lane_curvy_t/50kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/2lane_curvy_t/50kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/2lane_curvy_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/2lane_curvy_t/70kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/2lane_curvy_t/70kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/2lane_curvy_t/70kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/2lane_curvy_t/info.json b/ultra/ultra/scenarios/pool/experiment_pool/2lane_curvy_t/info.json similarity index 100% rename from ultra/ultra/scenarios/pool/2lane_curvy_t/info.json rename to ultra/ultra/scenarios/pool/experiment_pool/2lane_curvy_t/info.json diff --git a/ultra/ultra/scenarios/pool/2lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/2lane_t/100kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/2lane_t/100kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/2lane_t/100kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/2lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/2lane_t/50kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/2lane_t/50kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/2lane_t/50kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/2lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/2lane_t/70kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/2lane_t/70kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/2lane_t/70kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/2lane_t/info.json b/ultra/ultra/scenarios/pool/experiment_pool/2lane_t/info.json similarity index 100% rename from ultra/ultra/scenarios/pool/2lane_t/info.json rename to ultra/ultra/scenarios/pool/experiment_pool/2lane_t/info.json diff --git a/ultra/ultra/scenarios/pool/3lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/3lane_c/100kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/3lane_c/100kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/3lane_c/100kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/3lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/3lane_c/50kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/3lane_c/50kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/3lane_c/50kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/3lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/3lane_c/70kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/3lane_c/70kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/3lane_c/70kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/3lane_c/info.json b/ultra/ultra/scenarios/pool/experiment_pool/3lane_c/info.json similarity index 100% rename from ultra/ultra/scenarios/pool/3lane_c/info.json rename to ultra/ultra/scenarios/pool/experiment_pool/3lane_c/info.json diff --git a/ultra/ultra/scenarios/pool/3lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/3lane_t/100kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/3lane_t/100kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/3lane_t/100kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/3lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/3lane_t/50kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/3lane_t/50kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/3lane_t/50kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/3lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/3lane_t/70kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/3lane_t/70kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/3lane_t/70kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/3lane_t/info.json b/ultra/ultra/scenarios/pool/experiment_pool/3lane_t/info.json similarity index 100% rename from ultra/ultra/scenarios/pool/3lane_t/info.json rename to ultra/ultra/scenarios/pool/experiment_pool/3lane_t/info.json diff --git a/ultra/ultra/scenarios/pool/4lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/4lane_c/100kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/4lane_c/100kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/4lane_c/100kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/4lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/4lane_c/50kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/4lane_c/50kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/4lane_c/50kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/4lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/4lane_c/70kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/4lane_c/70kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/4lane_c/70kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/4lane_c/info.json b/ultra/ultra/scenarios/pool/experiment_pool/4lane_c/info.json similarity index 100% rename from ultra/ultra/scenarios/pool/4lane_c/info.json rename to ultra/ultra/scenarios/pool/experiment_pool/4lane_c/info.json diff --git a/ultra/ultra/scenarios/pool/4lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/4lane_t/100kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/4lane_t/100kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/4lane_t/100kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/4lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/4lane_t/50kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/4lane_t/50kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/4lane_t/50kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/4lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/4lane_t/70kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/4lane_t/70kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/4lane_t/70kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/4lane_t/info.json b/ultra/ultra/scenarios/pool/experiment_pool/4lane_t/info.json similarity index 100% rename from ultra/ultra/scenarios/pool/4lane_t/info.json rename to ultra/ultra/scenarios/pool/experiment_pool/4lane_t/info.json diff --git a/ultra/ultra/scenarios/pool/5lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/5lane_c/100kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/5lane_c/100kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/5lane_c/100kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/5lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/5lane_c/50kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/5lane_c/50kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/5lane_c/50kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/5lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/5lane_c/70kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/5lane_c/70kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/5lane_c/70kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/5lane_c/info.json b/ultra/ultra/scenarios/pool/experiment_pool/5lane_c/info.json similarity index 100% rename from ultra/ultra/scenarios/pool/5lane_c/info.json rename to ultra/ultra/scenarios/pool/experiment_pool/5lane_c/info.json diff --git a/ultra/ultra/scenarios/pool/5lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/5lane_t/100kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/5lane_t/100kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/5lane_t/100kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/5lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/5lane_t/50kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/5lane_t/50kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/5lane_t/50kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/5lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/5lane_t/70kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/5lane_t/70kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/5lane_t/70kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/5lane_t/info.json b/ultra/ultra/scenarios/pool/experiment_pool/5lane_t/info.json similarity index 100% rename from ultra/ultra/scenarios/pool/5lane_t/info.json rename to ultra/ultra/scenarios/pool/experiment_pool/5lane_t/info.json diff --git a/ultra/ultra/scenarios/pool/6lane_c/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/6lane_c/100kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/6lane_c/100kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/6lane_c/100kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/6lane_c/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/6lane_c/50kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/6lane_c/50kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/6lane_c/50kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/6lane_c/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/6lane_c/70kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/6lane_c/70kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/6lane_c/70kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/6lane_c/info.json b/ultra/ultra/scenarios/pool/experiment_pool/6lane_c/info.json similarity index 100% rename from ultra/ultra/scenarios/pool/6lane_c/info.json rename to ultra/ultra/scenarios/pool/experiment_pool/6lane_c/info.json diff --git a/ultra/ultra/scenarios/pool/6lane_t/100kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/6lane_t/100kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/6lane_t/100kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/6lane_t/100kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/6lane_t/50kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/6lane_t/50kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/6lane_t/50kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/6lane_t/50kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/6lane_t/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/6lane_t/70kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/6lane_t/70kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/6lane_t/70kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/6lane_t/info.json b/ultra/ultra/scenarios/pool/experiment_pool/6lane_t/info.json similarity index 100% rename from ultra/ultra/scenarios/pool/6lane_t/info.json rename to ultra/ultra/scenarios/pool/experiment_pool/6lane_t/info.json diff --git a/ultra/ultra/scenarios/pool/behavior_race/70kmh/map.net.xml b/ultra/ultra/scenarios/pool/experiment_pool/behavior_race/70kmh/map.net.xml similarity index 100% rename from ultra/ultra/scenarios/pool/behavior_race/70kmh/map.net.xml rename to ultra/ultra/scenarios/pool/experiment_pool/behavior_race/70kmh/map.net.xml diff --git a/ultra/ultra/scenarios/pool/behavior_race/70kmh/road_speeds.json b/ultra/ultra/scenarios/pool/experiment_pool/behavior_race/70kmh/road_speeds.json similarity index 100% rename from ultra/ultra/scenarios/pool/behavior_race/70kmh/road_speeds.json rename to ultra/ultra/scenarios/pool/experiment_pool/behavior_race/70kmh/road_speeds.json diff --git a/ultra/ultra/scenarios/pool/behavior_race/info.json b/ultra/ultra/scenarios/pool/experiment_pool/behavior_race/info.json similarity index 100% rename from ultra/ultra/scenarios/pool/behavior_race/info.json rename to ultra/ultra/scenarios/pool/experiment_pool/behavior_race/info.json