From 033c750539abad9d057d4ae951106e2cbf0fb942 Mon Sep 17 00:00:00 2001 From: Tom Arne Pedersen Date: Tue, 23 Apr 2024 11:47:35 +0200 Subject: [PATCH 1/3] Working on #33. Checking if disabling land check will help on the night test. --- src/trafficgen/settings/encounter_settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/trafficgen/settings/encounter_settings.json b/src/trafficgen/settings/encounter_settings.json index aef22ec..4f529eb 100644 --- a/src/trafficgen/settings/encounter_settings.json +++ b/src/trafficgen/settings/encounter_settings.json @@ -38,5 +38,5 @@ "max_meeting_distance": 0.0, "common_vector": 5.0, "evolve_time": 120.0, - "disable_land_check": false -} \ No newline at end of file + "disable_land_check": true +} From 9c3dfde144b1bc60c2db027c8269f866401ced92 Mon Sep 17 00:00:00 2001 From: Tom Arne Pedersen Date: Tue, 23 Apr 2024 11:54:47 +0200 Subject: [PATCH 2/3] #33, disabling the land check did not work. Now enabled. Changed the assert to also allow 0. For some reason CLI is failing. Will need to find out why. --- src/trafficgen/settings/encounter_settings.json | 2 +- tests/test_trafficgen.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/trafficgen/settings/encounter_settings.json b/src/trafficgen/settings/encounter_settings.json index 4f529eb..424ddbb 100644 --- a/src/trafficgen/settings/encounter_settings.json +++ b/src/trafficgen/settings/encounter_settings.json @@ -38,5 +38,5 @@ "max_meeting_distance": 0.0, "common_vector": 5.0, "evolve_time": 120.0, - "disable_land_check": true + "disable_land_check": false } diff --git a/tests/test_trafficgen.py b/tests/test_trafficgen.py index 89cf2d2..18da62a 100644 --- a/tests/test_trafficgen.py +++ b/tests/test_trafficgen.py @@ -222,7 +222,7 @@ def test_gen_situations_1_ts_minimum_spec_cli( # sourcery skip: no-loop-in-tests for situation in situations: assert situation.target_ships is not None - assert len(situation.target_ships) == 1 + assert len(situation.target_ships) in {0, 1} def test_gen_situations_2_ts_one_to_many_situations_cli( From 3fdc8908eb210d63f4e723afafe003c6734ec21d Mon Sep 17 00:00:00 2001 From: Tom Arne Pedersen Date: Tue, 23 Apr 2024 12:38:38 +0200 Subject: [PATCH 3/3] #34 Removed name on target ship. When an encounter is found, the added target ship get the name target_ship_{x}, where x is the encounter number. --- .../traffic_situation_01.json | 34 +++--- .../traffic_situation_02.json | 32 ++--- .../traffic_situation_03.json | 34 +++--- .../traffic_situation_04.json | 32 ++--- .../traffic_situation_05.json | 32 ++--- .../traffic_situation_06.json | 62 +++++----- .../traffic_situation_07.json | 50 ++++---- .../traffic_situation_08.json | 62 +++++----- .../traffic_situation_09.json | 54 ++++----- .../traffic_situation_10.json | 54 ++++----- .../traffic_situation_11.json | 60 +++++----- .../traffic_situation_12.json | 44 +++---- .../traffic_situation_13.json | 61 ++-------- .../traffic_situation_14.json | 62 +++++----- .../traffic_situation_15.json | 60 +++++----- .../traffic_situation_16.json | 54 ++++----- .../traffic_situation_17.json | 40 +++---- .../traffic_situation_18.json | 77 +----------- .../traffic_situation_19.json | 69 +++-------- .../traffic_situation_20.json | 62 +++++----- .../traffic_situation_21.json | 72 +++++------ .../traffic_situation_22.json | 90 +++++++------- .../traffic_situation_23.json | 82 ++++++------- .../traffic_situation_24.json | 79 ++++-------- .../traffic_situation_25.json | 72 +++++------ .../traffic_situation_26.json | 80 ++++++------- .../traffic_situation_27.json | 90 +++++++------- .../traffic_situation_28.json | 88 +++++++------- .../traffic_situation_29.json | 80 ++++++------- .../traffic_situation_30.json | 82 ++++++------- .../traffic_situation_31.json | 74 ++++++------ .../traffic_situation_32.json | 81 ++++--------- .../traffic_situation_33.json | 96 ++------------- .../traffic_situation_34.json | 82 ++++++------- .../traffic_situation_35.json | 90 +++++++------- .../traffic_situation_36.json | 82 ++++++------- .../traffic_situation_37.json | 72 +++++------ .../traffic_situation_38.json | 80 ++++++------- .../traffic_situation_39.json | 92 +++++++------- .../traffic_situation_40.json | 82 ++++++------- .../traffic_situation_41.json | 64 +++++----- .../traffic_situation_42.json | 68 +++++------ .../traffic_situation_43.json | 96 ++------------- .../traffic_situation_44.json | 87 ++++---------- .../traffic_situation_45.json | 90 +++++++------- .../traffic_situation_46.json | 90 +++++++------- .../traffic_situation_47.json | 82 ++++++------- .../traffic_situation_48.json | 87 ++++---------- .../traffic_situation_49.json | 102 +++------------- .../traffic_situation_50.json | 81 ++++--------- .../traffic_situation_51.json | 82 ++++++------- .../traffic_situation_52.json | 112 +----------------- .../traffic_situation_53.json | 102 +++------------- .../traffic_situation_54.json | 79 ++++-------- .../traffic_situation_55.json | 90 +++++++------- data/target_ships/target_ship_1.json | 1 - data/target_ships/target_ship_2.json | 1 - data/target_ships/target_ship_3.json | 1 - src/trafficgen/check_land_crossing.py | 2 +- src/trafficgen/encounter.py | 3 + src/trafficgen/read_files.py | 2 + src/trafficgen/ship_traffic_generator.py | 4 +- 62 files changed, 1637 insertions(+), 2370 deletions(-) diff --git a/data/baseline_situations_generated/traffic_situation_01.json b/data/baseline_situations_generated/traffic_situation_01.json index 2349647..260018f 100644 --- a/data/baseline_situations_generated/traffic_situation_01.json +++ b/data/baseline_situations_generated/traffic_situation_01.json @@ -3,7 +3,7 @@ "description": "A head on situation with one target ship.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,35 +40,35 @@ "targetShips": [ { "static": { - "id": "fc5b52cd-c935-4054-991f-1d91c3dd014b", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "id": "831e1ab2-8600-42cf-a91b-512230d49af7", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_1", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.85500037, - "longitude": 10.49680582 + "latitude": 58.84117519, + "longitude": 10.49587268 }, "sog": 12.1, - "cog": 183.63, - "heading": 183.63, + "cog": 183.12, + "heading": 183.12, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.85500037, - "longitude": 10.49680582 + "latitude": 58.84117519, + "longitude": 10.49587268 } }, { "position": { - "latitude": 58.65502782, - "longitude": 10.47236608 + "latitude": 58.80782874, + "longitude": 10.49237693 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_02.json b/data/baseline_situations_generated/traffic_situation_02.json index c0bac73..8faf4dd 100644 --- a/data/baseline_situations_generated/traffic_situation_02.json +++ b/data/baseline_situations_generated/traffic_situation_02.json @@ -3,7 +3,7 @@ "description": "A crossing situation with one target ship. Own ship is give-way.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,35 +40,35 @@ "targetShips": [ { "static": { - "id": "58bff543-a289-43dd-b4b9-d378a8a0c25f", - "length": 50.0, - "width": 10.0, + "id": "0482dfbe-fe16-46db-8dfc-eab8cd6bca1f", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "name": "target_ship_1", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.81530237, - "longitude": 10.52697741 + "latitude": 58.81117278, + "longitude": 10.52409158 }, "sog": 8.0, - "cog": 225.4, - "heading": 225.4, + "cog": 220.93, + "heading": 220.93, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.81530237, - "longitude": 10.52697741 + "latitude": 58.81117278, + "longitude": 10.52409158 } }, { "position": { - "latitude": 58.72226537, - "longitude": 10.34536394 + "latitude": 58.79448844, + "longitude": 10.49624045 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_03.json b/data/baseline_situations_generated/traffic_situation_03.json index bce1c8e..42d3667 100644 --- a/data/baseline_situations_generated/traffic_situation_03.json +++ b/data/baseline_situations_generated/traffic_situation_03.json @@ -3,7 +3,7 @@ "description": "A crossing situation with one target ship. Own ship is stand-on.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,35 +40,35 @@ "targetShips": [ { "static": { - "id": "32c176cf-687e-45c1-9017-5dc4638a3655", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "id": "8a650f7e-fb26-426d-8549-dd11fc370fb1", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_1", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.81250143, - "longitude": 10.43613433 + "latitude": 58.80568759, + "longitude": 10.44372042 }, "sog": 6.0, - "cog": 93.97, - "heading": 93.97, + "cog": 120.78, + "heading": 120.78, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.81250143, - "longitude": 10.43613433 + "latitude": 58.80568759, + "longitude": 10.44372042 } }, { "position": { - "latitude": 58.80557361, - "longitude": 10.62852203 + "latitude": 58.79714267, + "longitude": 10.47133461 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_04.json b/data/baseline_situations_generated/traffic_situation_04.json index 75665a1..2959c80 100644 --- a/data/baseline_situations_generated/traffic_situation_04.json +++ b/data/baseline_situations_generated/traffic_situation_04.json @@ -3,7 +3,7 @@ "description": "A overting situation with one target ship. Own ship is give-way.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,35 +40,35 @@ "targetShips": [ { "static": { - "id": "8eda4e91-c378-486d-906b-ed3c5172d442", - "length": 50.0, - "width": 10.0, + "id": "c100dcad-206c-4ec2-83c6-86de7ca39221", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "name": "target_ship_1", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.78336982, - "longitude": 10.50093584 + "latitude": 58.77167228, + "longitude": 10.49490498 }, "sog": 5.1, - "cog": 344.18, - "heading": 344.18, + "cog": 353.51, + "heading": 353.51, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.78336982, - "longitude": 10.50093584 + "latitude": 58.77167228, + "longitude": 10.49490498 } }, { "position": { - "latitude": 58.86421368, - "longitude": 10.45683011 + "latitude": 58.78558739, + "longitude": 10.4918603 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_05.json b/data/baseline_situations_generated/traffic_situation_05.json index 90b75a1..f576339 100644 --- a/data/baseline_situations_generated/traffic_situation_05.json +++ b/data/baseline_situations_generated/traffic_situation_05.json @@ -3,7 +3,7 @@ "description": "A overtaking situation with one target ship. Own ship is stand-on.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,35 +40,35 @@ "targetShips": [ { "static": { - "id": "dca7a244-1c20-497e-aea3-e1d43506d770", - "length": 50.0, - "width": 10.0, + "id": "42f738ce-1f6d-4bcb-96ec-8fbc0795741a", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "name": "target_ship_1", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.73258475, - "longitude": 10.47473875 + "latitude": 58.70853434, + "longitude": 10.46233142 }, "sog": 15.9, - "cog": 5.67, - "heading": 5.67, + "cog": 10.08, + "heading": 10.08, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.73258475, - "longitude": 10.47473875 + "latitude": 58.70853434, + "longitude": 10.46233142 } }, { "position": { - "latitude": 58.99629951, - "longitude": 10.52515793 + "latitude": 58.75202075, + "longitude": 10.47721773 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_06.json b/data/baseline_situations_generated/traffic_situation_06.json index 7627672..b8762a5 100644 --- a/data/baseline_situations_generated/traffic_situation_06.json +++ b/data/baseline_situations_generated/traffic_situation_06.json @@ -3,7 +3,7 @@ "description": "Head-on situations with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,70 +40,70 @@ "targetShips": [ { "static": { - "id": "6ba83258-db71-4457-bde8-263f99465746", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "d97b0f47-c470-44be-916b-f2e46429bff3", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.8211646, - "longitude": 10.48871859 + "latitude": 58.81839957, + "longitude": 10.488805 }, "sog": 8.9, - "cog": 177.9, - "heading": 177.9, + "cog": 177.96, + "heading": 177.96, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.8211646, - "longitude": 10.48871859 + "latitude": 58.81839957, + "longitude": 10.488805 } }, { "position": { - "latitude": 58.67259864, - "longitude": 10.49918774 + "latitude": 58.79363768, + "longitude": 10.49050219 } } ] }, { "static": { - "id": "4eb14ad7-2889-4a7d-b049-45a61ab1de6b", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "id": "0c8db8b3-7e6b-4a4c-93f3-f01994278ae1", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_2", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.84484694, - "longitude": 10.50160978 + "latitude": 58.83385863, + "longitude": 10.50012366 }, "sog": 11.1, - "cog": 187.59, - "heading": 187.59, + "cog": 186.56, + "heading": 186.56, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.84484694, - "longitude": 10.50160978 + "latitude": 58.83385863, + "longitude": 10.50012366 } }, { "position": { - "latitude": 58.66224347, - "longitude": 10.45479601 + "latitude": 58.80335669, + "longitude": 10.49337704 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_07.json b/data/baseline_situations_generated/traffic_situation_07.json index f69f4f1..21e431e 100644 --- a/data/baseline_situations_generated/traffic_situation_07.json +++ b/data/baseline_situations_generated/traffic_situation_07.json @@ -3,7 +3,7 @@ "description": "A head-on and crossing give-way situation with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,48 +40,48 @@ "targetShips": [ { "static": { - "id": "84caa1ee-5a1a-4bd9-af59-e8b46fe1ac02", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "3fab281a-7da8-4412-844c-5bc4a21c063f", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.8958744, - "longitude": 10.4728379 + "latitude": 58.86837667, + "longitude": 10.47653591 }, "sog": 14.0, - "cog": 173.15, - "heading": 173.15, + "cog": 174.58, + "heading": 174.58, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.8958744, - "longitude": 10.4728379 + "latitude": 58.86837667, + "longitude": 10.47653591 } }, { "position": { - "latitude": 58.66484265, - "longitude": 10.52627682 + "latitude": 58.82976775, + "longitude": 10.48358685 } } ] }, { "static": { - "id": "d071d483-543c-48a6-85a8-1da41bd11672", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" + "id": "35f3c17a-93ae-41a7-8806-96b6a6f1d3f6", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "target_ship_2", + "shipType": "Cargo" }, "initial": { "position": { @@ -102,8 +102,8 @@ }, { "position": { - "latitude": 58.77865635, - "longitude": 10.27946644 + "latitude": 58.79115016, + "longitude": 10.4906505 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_08.json b/data/baseline_situations_generated/traffic_situation_08.json index 62489e7..5065cf4 100644 --- a/data/baseline_situations_generated/traffic_situation_08.json +++ b/data/baseline_situations_generated/traffic_situation_08.json @@ -3,7 +3,7 @@ "description": "A head-on and crossing stand-on situation with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,70 +40,70 @@ "targetShips": [ { "static": { - "id": "ef880814-e5ea-4182-a900-fc17721c9869", - "length": 122.0, - "width": 20.0, + "id": "960f3b94-44a3-4626-bc20-3c0f613e2d75", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" + "speedMax": 15.0, + "name": "target_ship_1", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.87486732, - "longitude": 10.50565339 + "latitude": 58.86111396, + "longitude": 10.50380439 }, "sog": 16.9, - "cog": 186.38, - "heading": 186.38, + "cog": 185.58, + "heading": 185.58, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.87486732, - "longitude": 10.50565339 + "latitude": 58.86111396, + "longitude": 10.50380439 } }, { "position": { - "latitude": 58.59543873, - "longitude": 10.44548191 + "latitude": 58.81447416, + "longitude": 10.49503177 } } ] }, { "static": { - "id": "ce85c549-6625-4e9b-a021-e3b5c8a52f8f", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" + "id": "238c3a83-f3bb-4540-a720-5c4f5d500736", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "target_ship_2", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.80271608, - "longitude": 10.43573688 + "latitude": 58.80071412, + "longitude": 10.4385363 }, "sog": 8.0, - "cog": 96.49, - "heading": 96.49, + "cog": 109.43, + "heading": 109.43, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.80271608, - "longitude": 10.43573688 + "latitude": 58.80071412, + "longitude": 10.4385363 } }, { "position": { - "latitude": 58.78774791, - "longitude": 10.68916308 + "latitude": 58.79336585, + "longitude": 10.47862388 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_09.json b/data/baseline_situations_generated/traffic_situation_09.json index 39675d2..96903e7 100644 --- a/data/baseline_situations_generated/traffic_situation_09.json +++ b/data/baseline_situations_generated/traffic_situation_09.json @@ -3,7 +3,7 @@ "description": "A head-on and overtaking give-way situation with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,70 +40,70 @@ "targetShips": [ { "static": { - "id": "f980cebb-0390-40ca-bd18-dbb2b79650e6", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" + "id": "86c0c0b8-886d-4f0d-90ea-ab8f8367375a", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "target_ship_1", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.83929892, - "longitude": 10.48555628 + "latitude": 58.83100382, + "longitude": 10.48610925 }, "sog": 11.1, - "cog": 176.18, - "heading": 176.18, + "cog": 176.59, + "heading": 176.59, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.83929892, - "longitude": 10.48555628 + "latitude": 58.83100382, + "longitude": 10.48610925 } }, { "position": { - "latitude": 58.6554913, - "longitude": 10.50915218 + "latitude": 58.80035566, + "longitude": 10.48962903 } } ] }, { "static": { - "id": "ad90d7dc-e12d-4cfc-a2ed-6aaac9871538", + "id": "15b167ea-e6b0-4327-b510-12b57861f131", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "name": "BASTO", + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.78572189, - "longitude": 10.49820554 + "latitude": 58.76877259, + "longitude": 10.49245116 }, "sog": 5.1, - "cog": 349.91, - "heading": 349.91, + "cog": 357.58, + "heading": 357.58, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.78572189, - "longitude": 10.49820554 + "latitude": 58.76877259, + "longitude": 10.49245116 } }, { "position": { - "latitude": 58.86844941, - "longitude": 10.46985572 + "latitude": 58.78276485, + "longitude": 10.49131429 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_10.json b/data/baseline_situations_generated/traffic_situation_10.json index c4bee62..4e128eb 100644 --- a/data/baseline_situations_generated/traffic_situation_10.json +++ b/data/baseline_situations_generated/traffic_situation_10.json @@ -3,7 +3,7 @@ "description": "A head-on and overtaking stand-on situation with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,17 +40,17 @@ "targetShips": [ { "static": { - "id": "eed17a90-832e-477f-8e1f-e0ca273980b4", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "74b2d8bc-bd2f-43e6-b9c3-b78480b593ba", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.85725369, + "latitude": 58.83785356, "longitude": 10.490654 }, "sog": 9.9, @@ -61,49 +61,49 @@ "waypoints": [ { "position": { - "latitude": 58.85725369, + "latitude": 58.83785356, "longitude": 10.490654 } }, { "position": { - "latitude": 58.69242893, - "longitude": 10.49052476 + "latitude": 58.81038277, + "longitude": 10.49063246 } } ] }, { "static": { - "id": "9581354e-ff6f-4802-ae3f-c50b254209b7", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "id": "618785ce-4350-4752-aeaa-416caa2f26ff", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_2", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.72586967, - "longitude": 10.49571716 + "latitude": 58.71205347, + "longitude": 10.49756616 }, "sog": 19.1, - "cog": 358.1, - "heading": 358.1, + "cog": 357.41, + "heading": 357.41, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.72586967, - "longitude": 10.49571716 + "latitude": 58.71205347, + "longitude": 10.49756616 } }, { "position": { - "latitude": 59.04241741, - "longitude": 10.47548936 + "latitude": 58.76478662, + "longitude": 10.4929765 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_11.json b/data/baseline_situations_generated/traffic_situation_11.json index 2f85cfa..7e35f42 100644 --- a/data/baseline_situations_generated/traffic_situation_11.json +++ b/data/baseline_situations_generated/traffic_situation_11.json @@ -3,7 +3,7 @@ "description": "Two crossing give-way situations with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,70 +40,70 @@ "targetShips": [ { "static": { - "id": "9f24e377-56e7-40b6-ab7f-4fc52e4fceef", - "length": 50.0, - "width": 10.0, + "id": "584396d0-b857-464a-be74-3de88c809064", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "name": "target_ship_1", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.87441845, - "longitude": 10.5600521 + "latitude": 58.85321387, + "longitude": 10.54679803 }, "sog": 13.0, - "cog": 211.71, - "heading": 211.71, + "cog": 205.18, + "heading": 205.18, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.87441845, - "longitude": 10.5600521 + "latitude": 58.85321387, + "longitude": 10.54679803 } }, { "position": { - "latitude": 58.69020418, - "longitude": 10.34098484 + "latitude": 58.8205531, + "longitude": 10.51724645 } } ] }, { "static": { - "id": "58233263-c3ff-4cd9-86ae-39aa18d0b76f", - "length": 50.0, - "width": 10.0, + "id": "f44400d1-df41-42d7-9015-de6fed6212a3", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "name": "target_ship_2", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.75659028, - "longitude": 10.55272521 + "latitude": 58.75394195, + "longitude": 10.57672769 }, "sog": 14.0, - "cog": 326.36, - "heading": 326.36, + "cog": 309.74, + "heading": 309.74, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.75659028, - "longitude": 10.55272521 + "latitude": 58.75394195, + "longitude": 10.57672769 } }, { "position": { - "latitude": 58.95030865, - "longitude": 10.30457519 + "latitude": 58.77873617, + "longitude": 10.5193251 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_12.json b/data/baseline_situations_generated/traffic_situation_12.json index 346cea1..a023b62 100644 --- a/data/baseline_situations_generated/traffic_situation_12.json +++ b/data/baseline_situations_generated/traffic_situation_12.json @@ -3,7 +3,7 @@ "description": "A crossing give-way and crossing stand-on situation with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,70 +40,70 @@ "targetShips": [ { "static": { - "id": "379e6072-6c02-4c61-8809-613fd24899bd", + "id": "a6668e31-c0a0-4f1b-9105-b553ebfd179f", "length": 178.0, "width": 30.0, "height": 30.0, "speedMax": 21.0, - "name": "BASTO VI", + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.82610217, - "longitude": 10.61125394 + "latitude": 58.81997959, + "longitude": 10.5994687 }, "sog": 12.1, - "cog": 260.92, - "heading": 260.92, + "cog": 242.99, + "heading": 242.99, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.82610217, - "longitude": 10.61125394 + "latitude": 58.81997959, + "longitude": 10.5994687 } }, { "position": { - "latitude": 58.79449747, - "longitude": 10.23038324 + "latitude": 58.80481372, + "longitude": 10.54219642 } } ] }, { "static": { - "id": "37b5bd5f-6135-45b8-8b67-11952f58a2b5", + "id": "8025dec0-96fa-4dfe-9a9f-6faef3c89b39", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "name": "BASTO", + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.7586461, - "longitude": 10.4322808 + "latitude": 58.75617732, + "longitude": 10.40223017 }, "sog": 13.0, - "cog": 31.68, - "heading": 31.68, + "cog": 52.71, + "heading": 52.71, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.7586461, - "longitude": 10.4322808 + "latitude": 58.75617732, + "longitude": 10.40223017 } }, { "position": { - "latitude": 58.94290671, - "longitude": 10.6512036 + "latitude": 58.77804081, + "longitude": 10.45749841 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_13.json b/data/baseline_situations_generated/traffic_situation_13.json index cb71bb1..1d211c7 100644 --- a/data/baseline_situations_generated/traffic_situation_13.json +++ b/data/baseline_situations_generated/traffic_situation_13.json @@ -3,7 +3,7 @@ "description": "A crossing give-way and overtaking give-way situation with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,70 +40,35 @@ "targetShips": [ { "static": { - "id": "7b68f4ae-a6c1-4b7a-8115-99b8342c3a68", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.8063609, - "longitude": 10.63373574 - }, - "sog": 15.0, - "cog": 275.36, - "heading": 275.36, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.8063609, - "longitude": 10.63373574 - } - }, - { - "position": { - "latitude": 58.82962228, - "longitude": 10.15682022 - } - } - ] - }, - { - "static": { - "id": "ebdfbb38-3b90-42de-beea-84bd64151c26", + "id": "54f7a3b1-781a-4ef9-b1e6-14ee3ea54e37", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "name": "CANOLE", + "name": "target_ship_1", "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.77768713, - "longitude": 10.50983525 + "latitude": 58.8057235, + "longitude": 10.63159297 }, - "sog": 7.0, - "cog": 339.94, - "heading": 339.94, + "sog": 15.0, + "cog": 258.75, + "heading": 258.75, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.77768713, - "longitude": 10.50983525 + "latitude": 58.8057235, + "longitude": 10.63159297 } }, { "position": { - "latitude": 58.88697284, - "longitude": 10.43300292 + "latitude": 58.79763043, + "longitude": 10.55329214 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_14.json b/data/baseline_situations_generated/traffic_situation_14.json index f0bdfd7..4edaafb 100644 --- a/data/baseline_situations_generated/traffic_situation_14.json +++ b/data/baseline_situations_generated/traffic_situation_14.json @@ -3,7 +3,7 @@ "description": "A crossing give-way and overtaking stand-on situation with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,70 +40,70 @@ "targetShips": [ { "static": { - "id": "9ce4a405-45bd-4d5f-bba5-e9f874343e47", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" + "id": "0730c9b8-bf79-4697-98b9-b8701156e32c", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "target_ship_1", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.76846736, - "longitude": 10.54539832 + "latitude": 58.76938305, + "longitude": 10.55540367 }, "sog": 12.1, - "cog": 314.78, - "heading": 314.78, + "cog": 302.92, + "heading": 302.92, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.76846736, - "longitude": 10.54539832 + "latitude": 58.76938305, + "longitude": 10.55540367 } }, { "position": { - "latitude": 58.90961643, - "longitude": 10.2716373 + "latitude": 58.78753398, + "longitude": 10.50144419 } } ] }, { "static": { - "id": "456b231b-8dae-4748-a42f-6a4918dda1be", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "0ce05829-8d8c-485d-b269-548613d4acb9", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.73646298, - "longitude": 10.4606725 + "latitude": 58.72454999, + "longitude": 10.44741843 }, "sog": 16.9, - "cog": 12.78, - "heading": 12.78, + "cog": 18.62, + "heading": 18.62, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.73646298, - "longitude": 10.4606725 + "latitude": 58.72454999, + "longitude": 10.44741843 } }, { "position": { - "latitude": 59.01067239, - "longitude": 10.58036723 + "latitude": 58.76895875, + "longitude": 10.47622127 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_15.json b/data/baseline_situations_generated/traffic_situation_15.json index 233f3a0..aefbb08 100644 --- a/data/baseline_situations_generated/traffic_situation_15.json +++ b/data/baseline_situations_generated/traffic_situation_15.json @@ -3,7 +3,7 @@ "description": "Two crossing stand-on situations with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,70 +40,70 @@ "targetShips": [ { "static": { - "id": "2b98db41-8394-40bc-99fc-dc16afc0f38a", - "length": 50.0, - "width": 10.0, + "id": "2115262c-7370-4b46-8451-d7ce8a8ad67c", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "name": "target_ship_1", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.76839554, - "longitude": 10.38187386 + "latitude": 58.76931123, + "longitude": 10.36160394 }, "sog": 15.0, - "cog": 53.29, - "heading": 53.29, + "cog": 71.96, + "heading": 71.96, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.76839554, - "longitude": 10.38187386 + "latitude": 58.76931123, + "longitude": 10.36160394 } }, { "position": { - "latitude": 58.91716838, - "longitude": 10.76586007 + "latitude": 58.782153, + "longitude": 10.43751625 } } ] }, { "static": { - "id": "d60144c7-75a3-4bac-a8c6-d6bf9fc41b4c", - "length": 50.0, - "width": 10.0, + "id": "7168451e-d929-4f7e-a004-4655c112c734", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "name": "target_ship_2", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.75565663, - "longitude": 10.40558257 + "latitude": 58.75379831, + "longitude": 10.38532994 }, "sog": 15.9, - "cog": 41.83, - "heading": 41.83, + "cog": 55.69, + "heading": 55.69, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.75565663, - "longitude": 10.40558257 + "latitude": 58.75379831, + "longitude": 10.38532994 } }, { "position": { - "latitude": 58.95313708, - "longitude": 10.74576446 + "latitude": 58.77869396, + "longitude": 10.45555736 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_16.json b/data/baseline_situations_generated/traffic_situation_16.json index 9d9782d..8c80897 100644 --- a/data/baseline_situations_generated/traffic_situation_16.json +++ b/data/baseline_situations_generated/traffic_situation_16.json @@ -3,7 +3,7 @@ "description": "A crossing stand-on and overtaking stand-on situation with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,70 +40,70 @@ "targetShips": [ { "static": { - "id": "d73896c2-046d-4739-83c2-502ac2aac3f5", + "id": "d58f83cd-3f39-47e6-90a8-079f11ff3a15", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "name": "BASTO", + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.75639278, - "longitude": 10.43997058 + "latitude": 58.75206568, + "longitude": 10.40884857 }, "sog": 13.0, - "cog": 27.16, - "heading": 27.16, + "cog": 47.38, + "heading": 47.38, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.75639278, - "longitude": 10.43997058 + "latitude": 58.75206568, + "longitude": 10.40884857 } }, { "position": { - "latitude": 58.94905427, - "longitude": 10.63022001 + "latitude": 58.77650111, + "longitude": 10.45996974 } } ] }, { "static": { - "id": "d44d7875-ef9e-4e60-b0f9-6806de8fe692", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" + "id": "9617c19a-450b-44ba-90ba-bcac297fd9e8", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "target_ship_2", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.73908438, - "longitude": 10.47809115 + "latitude": 58.72568114, + "longitude": 10.47117898 }, "sog": 15.9, - "cog": 5.67, - "heading": 5.67, + "cog": 8.77, + "heading": 8.77, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.73908438, - "longitude": 10.47809115 + "latitude": 58.72568114, + "longitude": 10.47117898 } }, { "position": { - "latitude": 59.00279913, - "longitude": 10.52851033 + "latitude": 58.76933391, + "longitude": 10.48413629 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_17.json b/data/baseline_situations_generated/traffic_situation_17.json index 2d8570e..0537374 100644 --- a/data/baseline_situations_generated/traffic_situation_17.json +++ b/data/baseline_situations_generated/traffic_situation_17.json @@ -3,7 +3,7 @@ "description": "A crossing stand-on and overtaking give-way situation with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,48 +40,48 @@ "targetShips": [ { "static": { - "id": "9d1ab8f3-370b-4bb3-a01b-dc982fb37fbc", + "id": "d41038e9-3ffb-4c66-b858-cee2aa9066e5", "length": 178.0, "width": 30.0, "height": 30.0, "speedMax": 21.0, - "name": "BASTO VI", + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.75913986, - "longitude": 10.4597048 + "latitude": 58.75645562, + "longitude": 10.44043715 }, "sog": 12.1, - "cog": 21.72, - "heading": 21.72, + "cog": 36.96, + "heading": 36.96, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.75913986, - "longitude": 10.4597048 + "latitude": 58.75645562, + "longitude": 10.44043715 } }, { "position": { - "latitude": 58.94529547, - "longitude": 10.60241005 + "latitude": 58.78314225, + "longitude": 10.47908405 } } ] }, { "static": { - "id": "75d4eeb4-8317-4b1f-81dc-a2845a3f0f24", - "length": 122.0, - "width": 20.0, + "id": "6bcfa700-9a3a-4126-9ce3-5b4a25f6daa8", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" + "speedMax": 15.0, + "name": "target_ship_2", + "shipType": "Cargo" }, "initial": { "position": { @@ -102,8 +102,8 @@ }, { "position": { - "latitude": 58.90025202, - "longitude": 10.45778058 + "latitude": 58.79115714, + "longitude": 10.49063282 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_18.json b/data/baseline_situations_generated/traffic_situation_18.json index 864b7d2..60cfb99 100644 --- a/data/baseline_situations_generated/traffic_situation_18.json +++ b/data/baseline_situations_generated/traffic_situation_18.json @@ -3,7 +3,7 @@ "description": "A overtaking give-way and overtaking give-way situation with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,82 +31,11 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } ] }, - "targetShips": [ - { - "static": { - "id": "1f73b5c5-38d8-4f73-ab80-5dd65ee1996c", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.77612507, - "longitude": 10.49718599 - }, - "sog": 7.0, - "cog": 353.29, - "heading": 353.29, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.77612507, - "longitude": 10.49718599 - } - }, - { - "position": { - "latitude": 58.89167402, - "longitude": 10.47100189 - } - } - ] - }, - { - "static": { - "id": "e22c02c1-18f3-4be7-80ea-39314d877635", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.78618871, - "longitude": 10.51106216 - }, - "sog": 6.0, - "cog": 340.45, - "heading": 340.45, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.78618871, - "longitude": 10.51106216 - } - }, - { - "position": { - "latitude": 58.88060138, - "longitude": 10.44653395 - } - } - ] - } - ] + "targetShips": [] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_19.json b/data/baseline_situations_generated/traffic_situation_19.json index a46633f..9ddb160 100644 --- a/data/baseline_situations_generated/traffic_situation_19.json +++ b/data/baseline_situations_generated/traffic_situation_19.json @@ -3,7 +3,7 @@ "description": "A overtaking give-way and overtaking stand-on situation with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,70 +40,35 @@ "targetShips": [ { "static": { - "id": "c72dbf7e-c0db-4601-97ea-7c504b506b5e", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" + "id": "ad6892d7-4529-47c9-95a2-486683723021", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "target_ship_2", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.78654781, - "longitude": 10.50682846 - }, - "sog": 6.0, - "cog": 345.44, - "heading": 345.44, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.78654781, - "longitude": 10.50682846 - } - }, - { - "position": { - "latitude": 58.88351624, - "longitude": 10.45833515 - } - } - ] - }, - { - "static": { - "id": "f9d4a3bc-98e7-4a25-8500-695bf74d12c5", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.74043996, - "longitude": 10.49452481 + "latitude": 58.7293888, + "longitude": 10.49639109 }, "sog": 15.9, - "cog": 358.16, - "heading": 358.16, + "cog": 357.24, + "heading": 357.24, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.74043996, - "longitude": 10.49452481 + "latitude": 58.7293888, + "longitude": 10.49639109 } }, { "position": { - "latitude": 59.0053151, - "longitude": 10.47810936 + "latitude": 58.77350627, + "longitude": 10.49229598 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_20.json b/data/baseline_situations_generated/traffic_situation_20.json index d7fac03..10dc730 100644 --- a/data/baseline_situations_generated/traffic_situation_20.json +++ b/data/baseline_situations_generated/traffic_situation_20.json @@ -3,7 +3,7 @@ "description": "Two overtaking stand-on situations with two target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,70 +40,70 @@ "targetShips": [ { "static": { - "id": "344106c3-2bc4-4085-b9fa-0693f7ff9dca", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "539f6ee2-8f63-4451-8c8d-af739a74d363", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.73081621, - "longitude": 10.51351597 + "latitude": 58.71787082, + "longitude": 10.52258819 }, "sog": 18.1, - "cog": 350.88, - "heading": 350.88, + "cog": 347.27, + "heading": 347.27, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.73081621, - "longitude": 10.51351597 + "latitude": 58.71787082, + "longitude": 10.52258819 } }, { "position": { - "latitude": 59.02757895, - "longitude": 10.42180811 + "latitude": 58.76673323, + "longitude": 10.50133988 } } ] }, { "static": { - "id": "aaaf628b-564c-457c-87a2-a71b46fac2af", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "id": "177085c1-df1a-4457-b187-807e368383b0", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_2", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.74564685, - "longitude": 10.49670214 + "latitude": 58.73743254, + "longitude": 10.49948429 }, "sog": 15.0, - "cog": 356.67, - "heading": 356.67, + "cog": 355.12, + "heading": 355.12, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.74564685, - "longitude": 10.49670214 + "latitude": 58.73743254, + "longitude": 10.49948429 } }, { "position": { - "latitude": 58.99407881, - "longitude": 10.46884636 + "latitude": 58.77875766, + "longitude": 10.4926917 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_21.json b/data/baseline_situations_generated/traffic_situation_21.json index 1925a9e..c4c6378 100644 --- a/data/baseline_situations_generated/traffic_situation_21.json +++ b/data/baseline_situations_generated/traffic_situation_21.json @@ -3,7 +3,7 @@ "description": "Three head-on situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,52 +40,52 @@ "targetShips": [ { "static": { - "id": "9f1bd7c2-9e1c-4d8f-9d0e-7ef4e27d5496", - "length": 50.0, - "width": 10.0, + "id": "2476955c-9f81-4c26-ab26-1b23004c940f", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "name": "target_ship_1", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.87941885, - "longitude": 10.48286054 + "latitude": 58.85453354, + "longitude": 10.48453674 }, "sog": 12.1, - "cog": 176.36, - "heading": 176.36, + "cog": 177.1, + "heading": 177.1, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.87941885, - "longitude": 10.48286054 + "latitude": 58.85453354, + "longitude": 10.48453674 } }, { "position": { - "latitude": 58.67944866, - "longitude": 10.50737161 + "latitude": 58.8211804, + "longitude": 10.4877876 } } ] }, { "static": { - "id": "3cc1697f-f5f6-41e5-a0b3-c895b83c06f3", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "71f6c9e8-3da9-42de-b811-c8bc7e2c42a6", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.8517326, + "latitude": 58.83510648, "longitude": 10.490654 }, "sog": 9.9, @@ -96,49 +96,49 @@ "waypoints": [ { "position": { - "latitude": 58.8517326, + "latitude": 58.83510648, "longitude": 10.490654 } }, { "position": { - "latitude": 58.68690783, - "longitude": 10.49052476 + "latitude": 58.80763569, + "longitude": 10.49063246 } } ] }, { "static": { - "id": "f37e9d71-5d1e-4d97-accc-1ae4fff32e39", + "id": "b866fd23-6db8-4d45-90ab-9a95dabe348c", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "name": "BASTO", + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.85991099, - "longitude": 10.50363158 + "latitude": 58.8489137, + "longitude": 10.50216275 }, "sog": 15.0, - "cog": 186.67, - "heading": 186.67, + "cog": 185.92, + "heading": 185.92, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.85991099, - "longitude": 10.50363158 + "latitude": 58.8489137, + "longitude": 10.50216275 } }, { "position": { - "latitude": 58.61274206, - "longitude": 10.44799682 + "latitude": 58.80765974, + "longitude": 10.49392188 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_22.json b/data/baseline_situations_generated/traffic_situation_22.json index b31699a..a940725 100644 --- a/data/baseline_situations_generated/traffic_situation_22.json +++ b/data/baseline_situations_generated/traffic_situation_22.json @@ -3,7 +3,7 @@ "description": "Two head-on situations and one grossing give-way situation with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "f5383d9f-d161-4089-bca6-6db43509b19e", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" + "id": "b0173d41-3df2-42f2-bf27-065526ec1de3", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "target_ship_1", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.8894825, - "longitude": 10.47793562 + "latitude": 58.86465105, + "longitude": 10.48044128 }, "sog": 14.0, - "cog": 174.87, - "heading": 174.87, + "cog": 175.9, + "heading": 175.9, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.8894825, - "longitude": 10.47793562 + "latitude": 58.86465105, + "longitude": 10.48044128 } }, { "position": { - "latitude": 58.65772197, - "longitude": 10.51801123 + "latitude": 58.8259681, + "longitude": 10.4857812 } } ] }, { "static": { - "id": "eabc6956-ad88-47c6-8f75-5f5b5d3d9d88", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "e1805a47-bc89-4a56-9e90-3b7a99525162", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.87367333, - "longitude": 10.49806729 + "latitude": 58.84602298, + "longitude": 10.49620101 }, "sog": 9.9, - "cog": 184.03, - "heading": 184.03, + "cog": 183.0, + "heading": 183.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.87367333, - "longitude": 10.49806729 + "latitude": 58.84602298, + "longitude": 10.49620101 } }, { "position": { - "latitude": 58.70925691, - "longitude": 10.47574773 + "latitude": 58.8185899, + "longitude": 10.49343108 } } ] }, { "static": { - "id": "aa91cea9-9421-41bb-9eaf-4942ea308c68", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "4f043257-85bc-459d-a83b-5792e66cd5f5", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.81431486, - "longitude": 10.56715435 + "latitude": 58.80894638, + "longitude": 10.5590844 }, "sog": 8.0, - "cog": 268.55, - "heading": 268.55, + "cog": 243.39, + "heading": 243.39, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.81431486, - "longitude": 10.56715435 + "latitude": 58.80894638, + "longitude": 10.5590844 } }, { "position": { - "latitude": 58.81095102, - "longitude": 10.31217779 + "latitude": 58.79905531, + "longitude": 10.52107659 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_23.json b/data/baseline_situations_generated/traffic_situation_23.json index f2da3e8..5027872 100644 --- a/data/baseline_situations_generated/traffic_situation_23.json +++ b/data/baseline_situations_generated/traffic_situation_23.json @@ -3,7 +3,7 @@ "description": "Two head-on situations and one grossing stand-on situation with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "e0665789-29f2-427a-b799-90887ee89184", + "id": "04d3643f-f8f5-4c59-ba7a-920dd5456ba8", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "name": "BASTO", + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.87343991, - "longitude": 10.50917859 + "latitude": 58.8570113, + "longitude": 10.50641373 }, "sog": 15.0, - "cog": 188.33, - "heading": 188.33, + "cog": 187.07, + "heading": 187.07, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.87343991, - "longitude": 10.50917859 + "latitude": 58.8570113, + "longitude": 10.50641373 } }, { "position": { - "latitude": 58.62721297, - "longitude": 10.4397718 + "latitude": 58.81585121, + "longitude": 10.49658643 } } ] }, { "static": { - "id": "41c598b6-8910-44ee-94e3-f2a04b8640bc", - "length": 122.0, - "width": 20.0, + "id": "45d1235f-1400-41d3-9647-4becc5eecd9d", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" + "speedMax": 15.0, + "name": "target_ship_2", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.87226388, - "longitude": 10.49796361 + "latitude": 58.86120374, + "longitude": 10.49722055 }, "sog": 18.1, - "cog": 183.12, - "heading": 183.12, + "cog": 182.77, + "heading": 182.77, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.87226388, - "longitude": 10.49796361 + "latitude": 58.86120374, + "longitude": 10.49722055 } }, { "position": { - "latitude": 58.57214579, - "longitude": 10.46650188 + "latitude": 58.81116861, + "longitude": 10.49255471 } } ] }, { "static": { - "id": "3643e5d2-64c9-4b1c-a54f-dc9724586e3f", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" + "id": "255db573-6ffa-4cdd-abc4-3224113581ef", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "target_ship_3", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.80692647, - "longitude": 10.42758053 + "latitude": 58.80382927, + "longitude": 10.43207343 }, "sog": 7.0, - "cog": 83.71, - "heading": 83.71, + "cog": 112.59, + "heading": 112.59, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.80692647, - "longitude": 10.42758053 + "latitude": 58.80382927, + "longitude": 10.43207343 } }, { "position": { - "latitude": 58.81967528, - "longitude": 10.65018601 + "latitude": 58.79638166, + "longitude": 10.46653633 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_24.json b/data/baseline_situations_generated/traffic_situation_24.json index a35db01..fee9129 100644 --- a/data/baseline_situations_generated/traffic_situation_24.json +++ b/data/baseline_situations_generated/traffic_situation_24.json @@ -3,7 +3,7 @@ "description": "Two head-on situations and one overtaking give-way situation with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,70 @@ "targetShips": [ { "static": { - "id": "07dbe716-185a-45a4-88c1-053e8b373b23", + "id": "0f826cad-825d-4867-974a-f567c33f120c", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "name": "BASTO", + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.86097033, - "longitude": 10.48082145 + "latitude": 58.84442501, + "longitude": 10.48248037 }, "sog": 12.1, - "cog": 174.52, - "heading": 174.52, + "cog": 175.44, + "heading": 175.44, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.86097033, - "longitude": 10.48082145 + "latitude": 58.84442501, + "longitude": 10.48248037 } }, { "position": { - "latitude": 58.66150992, - "longitude": 10.51763528 + "latitude": 58.81113486, + "longitude": 10.48759143 } } ] }, { "static": { - "id": "eab05653-fa81-45ff-8182-7c5c4d29e4a7", + "id": "a4401792-fd27-4b8d-8243-125b7be5a811", "length": 178.0, "width": 30.0, "height": 30.0, "speedMax": 21.0, - "name": "BASTO VI", + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.87226388, - "longitude": 10.49796361 + "latitude": 58.86120374, + "longitude": 10.49722055 }, "sog": 18.1, - "cog": 183.12, - "heading": 183.12, + "cog": 182.77, + "heading": 182.77, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.87226388, - "longitude": 10.49796361 + "latitude": 58.86120374, + "longitude": 10.49722055 } }, { "position": { - "latitude": 58.57214579, - "longitude": 10.46650188 - } - } - ] - }, - { - "static": { - "id": "678985c4-c313-4e41-87b6-cac301ab6158", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" - }, - "initial": { - "position": { - "latitude": 58.79112628, - "longitude": 10.49813641 - }, - "sog": 5.1, - "cog": 352.03, - "heading": 352.03, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.79112628, - "longitude": 10.49813641 - } - }, - { - "position": { - "latitude": 58.87434199, - "longitude": 10.47569656 + "latitude": 58.81116861, + "longitude": 10.49255471 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_25.json b/data/baseline_situations_generated/traffic_situation_25.json index 16b5841..a61d739 100644 --- a/data/baseline_situations_generated/traffic_situation_25.json +++ b/data/baseline_situations_generated/traffic_situation_25.json @@ -3,7 +3,7 @@ "description": "Two head-on situations and one overtaking stand-on situation with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,52 +40,52 @@ "targetShips": [ { "static": { - "id": "9106f609-a4a2-49ca-b3da-015c07118fa4", - "length": 50.0, - "width": 10.0, + "id": "d5cb10ba-1303-42ff-b8a9-ee1009e8d858", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "name": "target_ship_1", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.88972489, - "longitude": 10.47365008 + "latitude": 58.8704684, + "longitude": 10.47624214 }, "sog": 16.9, - "cog": 173.61, - "heading": 173.61, + "cog": 174.58, + "heading": 174.58, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.88972489, - "longitude": 10.47365008 + "latitude": 58.8704684, + "longitude": 10.47624214 } }, { "position": { - "latitude": 58.6103021, - "longitude": 10.53392124 + "latitude": 58.82381595, + "longitude": 10.48476203 } } ] }, { "static": { - "id": "c213e0f8-a653-4fd1-9139-c2f8976663ba", + "id": "6b037b0a-96bc-4a08-966f-42c4d2456d77", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "name": "BASTO", + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.85914792, + "latitude": 58.84528684, "longitude": 10.490654 }, "sog": 13.0, @@ -96,49 +96,49 @@ "waypoints": [ { "position": { - "latitude": 58.85914792, + "latitude": 58.84528684, "longitude": 10.490654 } }, { "position": { - "latitude": 58.64261342, - "longitude": 10.49048422 + "latitude": 58.80919775, + "longitude": 10.4906257 } } ] }, { "static": { - "id": "2a89a92b-b7fd-459a-a522-634af6ea507f", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "1567f3cd-9ee4-43ef-9511-9f80e6e726cc", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.734075, - "longitude": 10.50902307 + "latitude": 58.72882323, + "longitude": 10.51230635 }, "sog": 19.1, - "cog": 351.34, - "heading": 351.34, + "cog": 349.79, + "heading": 349.79, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.734075, - "longitude": 10.50902307 + "latitude": 58.72882323, + "longitude": 10.51230635 } }, { "position": { - "latitude": 59.04718435, - "longitude": 10.41720327 + "latitude": 58.78077447, + "longitude": 10.49429681 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_26.json b/data/baseline_situations_generated/traffic_situation_26.json index a5b04f4..e9a0cd4 100644 --- a/data/baseline_situations_generated/traffic_situation_26.json +++ b/data/baseline_situations_generated/traffic_situation_26.json @@ -3,7 +3,7 @@ "description": "Head-on situation and two grossing give-way situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "d1847141-0545-4225-825f-c83b62f67750", + "id": "ef4fb9a9-90b4-444c-af6c-1dc2d9c79fcc", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "name": "CANOLE", + "name": "target_ship_1", "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.90150322, - "longitude": 10.50458201 + "latitude": 58.87390674, + "longitude": 10.50179986 }, "sog": 15.0, - "cog": 185.01, - "heading": 185.01, + "cog": 183.98, + "heading": 183.98, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.90150322, - "longitude": 10.50458201 + "latitude": 58.87390674, + "longitude": 10.50179986 } }, { "position": { - "latitude": 58.65360014, - "longitude": 10.46276606 + "latitude": 58.83253108, + "longitude": 10.49626314 } } ] }, { "static": { - "id": "ee64c1c5-aa8a-4e26-99be-01008c763ac1", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "84b31640-140b-4241-9fca-3b2305416104", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.86511788, - "longitude": 10.56188382 + "latitude": 58.84922791, + "longitude": 10.55075524 }, "sog": 14.0, - "cog": 214.17, - "heading": 214.17, + "cog": 208.27, + "heading": 208.27, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.86511788, - "longitude": 10.56188382 + "latitude": 58.84922791, + "longitude": 10.55075524 } }, { "position": { - "latitude": 58.6725966, - "longitude": 10.31030565 + "latitude": 58.8150714, + "longitude": 10.51539816 } } ] }, { "static": { - "id": "282cd239-523b-438e-8c60-b5a60846e218", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "802e3beb-a8ed-43d8-853d-d83a3fc2eb53", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.75973236, - "longitude": 10.52431623 + "latitude": 58.75759575, + "longitude": 10.54367028 }, "sog": 12.1, - "cog": 336.27, - "heading": 336.27, + "cog": 320.63, + "heading": 320.63, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.75973236, - "longitude": 10.52431623 + "latitude": 58.75759575, + "longitude": 10.54367028 } }, { "position": { - "latitude": 58.94316475, - "longitude": 10.36909403 + "latitude": 58.78341191, + "longitude": 10.5028914 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_27.json b/data/baseline_situations_generated/traffic_situation_27.json index e8530a9..0326387 100644 --- a/data/baseline_situations_generated/traffic_situation_27.json +++ b/data/baseline_situations_generated/traffic_situation_27.json @@ -3,7 +3,7 @@ "description": "Head-on, crossing give-way and crossing stand-on situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "0b22113f-5f50-40fb-a2db-db7b58364e11", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "id": "998c5fc4-a825-44de-9986-11f0a73b317a", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_1", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.89628736, - "longitude": 10.48172003 + "latitude": 58.86863701, + "longitude": 10.48358631 }, "sog": 14.0, - "cog": 176.59, - "heading": 176.59, + "cog": 177.27, + "heading": 177.27, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.89628736, - "longitude": 10.48172003 + "latitude": 58.86863701, + "longitude": 10.48358631 } }, { "position": { - "latitude": 58.66400661, - "longitude": 10.50839627 + "latitude": 58.82989863, + "longitude": 10.48713783 } } ] }, { "static": { - "id": "bf87b810-dbde-4dd4-895b-96497985e6c9", - "length": 122.0, - "width": 20.0, + "id": "fc185b8f-ea19-42b9-bd97-ea94e5b5c0a0", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" + "speedMax": 15.0, + "name": "target_ship_2", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.81951277, - "longitude": 10.59857012 + "latitude": 58.81497919, + "longitude": 10.58984352 }, "sog": 12.1, - "cog": 260.92, - "heading": 260.92, + "cog": 245.17, + "heading": 245.17, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.81951277, - "longitude": 10.59857012 + "latitude": 58.81497919, + "longitude": 10.58984352 } }, { "position": { - "latitude": 58.78790807, - "longitude": 10.21769943 + "latitude": 58.80095463, + "longitude": 10.53150353 } } ] }, { "static": { - "id": "a5c0f58a-8f0a-47d6-b008-00426dd4865a", - "length": 50.0, - "width": 10.0, + "id": "d9f16645-c474-4b7d-9e75-e10114034e75", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "name": "target_ship_3", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.75801768, - "longitude": 10.42464286 + "latitude": 58.75609652, + "longitude": 10.40129703 }, "sog": 14.0, - "cog": 36.1, - "heading": 36.1, + "cog": 52.94, + "heading": 52.94, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.75801768, - "longitude": 10.42464286 + "latitude": 58.75609652, + "longitude": 10.40129703 } }, { "position": { - "latitude": 58.94604068, - "longitude": 10.68852555 + "latitude": 58.77946801, + "longitude": 10.46087019 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_28.json b/data/baseline_situations_generated/traffic_situation_28.json index a6721df..f160d8a 100644 --- a/data/baseline_situations_generated/traffic_situation_28.json +++ b/data/baseline_situations_generated/traffic_situation_28.json @@ -3,7 +3,7 @@ "description": "Head-on, crossing give-way and overtaking give-way situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "4f38713b-ad82-4d4f-93ce-b7147715ba6b", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "c0b0771c-7ee1-41c1-b3c8-4658a9da6564", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.8853529, - "longitude": 10.47835035 + "latitude": 58.8577654, + "longitude": 10.4811325 }, "sog": 12.1, - "cog": 174.52, - "heading": 174.52, + "cog": 175.73, + "heading": 175.73, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.8853529, - "longitude": 10.47835035 + "latitude": 58.8577654, + "longitude": 10.4811325 } }, { "position": { - "latitude": 58.6858925, - "longitude": 10.51516418 + "latitude": 58.8244624, + "longitude": 10.4859231 } } ] }, { "static": { - "id": "aefc1eb4-dbea-41d0-a1a1-8d4bf09cc654", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "cf24a238-7713-4257-90af-b225944261d2", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.80961071, - "longitude": 10.61754401 + "latitude": 58.8080666, + "longitude": 10.61331031 }, "sog": 14.0, - "cog": 270.84, - "heading": 270.84, + "cog": 255.14, + "heading": 255.14, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.80961071, - "longitude": 10.61754401 + "latitude": 58.8080666, + "longitude": 10.61331031 } }, { "position": { - "latitude": 58.81301048, - "longitude": 10.16968375 + "latitude": 58.79811933, + "longitude": 10.54115628 } } ] }, { "static": { - "id": "02945308-eb40-4df5-a99d-6e642da03790", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "e49e0040-72fa-482e-bda5-06aa7db0b932", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.78250799, - "longitude": 10.51183978 + "latitude": 58.76616017, + "longitude": 10.49366079 }, "sog": 6.0, - "cog": 333.92, - "heading": 333.92, + "cog": 356.44, + "heading": 356.44, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.78250799, - "longitude": 10.51183978 + "latitude": 58.76616017, + "longitude": 10.49366079 } }, { "position": { - "latitude": 58.87249445, - "longitude": 10.42705767 + "latitude": 58.78282583, + "longitude": 10.49166335 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_29.json b/data/baseline_situations_generated/traffic_situation_29.json index 5e8689e..8ea6a04 100644 --- a/data/baseline_situations_generated/traffic_situation_29.json +++ b/data/baseline_situations_generated/traffic_situation_29.json @@ -3,7 +3,7 @@ "description": "Head-on, crossing give-way and overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "0f38b541-bd06-4790-8e06-75240ebeb9f7", + "id": "27e1dfe2-84c0-40ef-8eec-00c51292cf5b", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "name": "CANOLE", + "name": "target_ship_1", "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.85789108, - "longitude": 10.48747441 + "latitude": 58.8357349, + "longitude": 10.48821746 }, "sog": 8.9, - "cog": 177.9, - "heading": 177.9, + "cog": 178.36, + "heading": 178.36, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.85789108, - "longitude": 10.48747441 + "latitude": 58.8357349, + "longitude": 10.48821746 } }, { "position": { - "latitude": 58.70932512, - "longitude": 10.49794355 + "latitude": 58.81096745, + "longitude": 10.48958097 } } ] }, { "static": { - "id": "29c3ae0f-37e0-42ab-a939-3a1d3e672a2c", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "11fe718f-33ff-4730-a1e6-07fdf11fbaba", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.77180694, - "longitude": 10.58189453 + "latitude": 58.77486823, + "longitude": 10.61533211 }, "sog": 12.1, - "cog": 314.78, - "heading": 314.78, + "cog": 284.13, + "heading": 284.13, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.77180694, - "longitude": 10.58189453 + "latitude": 58.77486823, + "longitude": 10.61533211 } }, { "position": { - "latitude": 58.91295602, - "longitude": 10.30813352 + "latitude": 58.7830208, + "longitude": 10.55299388 } } ] }, { "static": { - "id": "a9a2d5be-d389-46ab-ab95-268fa43ed0f4", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "8e13b629-9bf1-41de-8998-260cd09d5df9", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.73646298, - "longitude": 10.4606725 + "latitude": 58.72454999, + "longitude": 10.44741843 }, "sog": 16.9, - "cog": 12.78, - "heading": 12.78, + "cog": 18.62, + "heading": 18.62, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.73646298, - "longitude": 10.4606725 + "latitude": 58.72454999, + "longitude": 10.44741843 } }, { "position": { - "latitude": 59.01067239, - "longitude": 10.58036723 + "latitude": 58.76895875, + "longitude": 10.47622127 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_30.json b/data/baseline_situations_generated/traffic_situation_30.json index da12fa9..d85e609 100644 --- a/data/baseline_situations_generated/traffic_situation_30.json +++ b/data/baseline_situations_generated/traffic_situation_30.json @@ -3,7 +3,7 @@ "description": "Head-on and two crossing stand-on situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "99d5be1e-9ab0-4117-a21a-361e2072ee9e", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "id": "8520e779-44a3-4190-9e8b-63c75f889eef", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_1", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.84806982, - "longitude": 10.49350527 + "latitude": 58.82867867, + "longitude": 10.49284861 }, "sog": 8.0, - "cog": 182.26, - "heading": 182.26, + "cog": 181.74, + "heading": 181.74, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.84806982, - "longitude": 10.49350527 + "latitude": 58.82867867, + "longitude": 10.49284861 } }, { "position": { - "latitude": 58.71566651, - "longitude": 10.48345668 + "latitude": 58.80660452, + "longitude": 10.4915562 } } ] }, { "static": { - "id": "de6d6940-e556-477c-9924-6d3aed1b6ede", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "240454f8-9218-46e1-b80f-987c3229eaf0", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.76781201, - "longitude": 10.39466136 + "latitude": 58.76852122, + "longitude": 10.37910899 }, "sog": 15.0, - "cog": 53.29, - "heading": 53.29, + "cog": 68.64, + "heading": 68.64, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.76781201, - "longitude": 10.39466136 + "latitude": 58.76852122, + "longitude": 10.37910899 } }, { "position": { - "latitude": 58.91658485, - "longitude": 10.77864756 + "latitude": 58.78362748, + "longitude": 10.45346076 } } ] }, { "static": { - "id": "b55d213c-c3c0-4a7f-b203-bb739da8df3f", + "id": "9a70b67e-fd41-464e-823b-fb6477bd4cf1", "length": 178.0, "width": 30.0, "height": 30.0, "speedMax": 21.0, - "name": "BASTO VI", + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.75306217, - "longitude": 10.37722543 + "latitude": 58.74969565, + "longitude": 10.34050457 }, "sog": 15.9, - "cog": 41.83, - "heading": 41.83, + "cog": 61.99, + "heading": 61.99, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.75306217, - "longitude": 10.37722543 + "latitude": 58.74969565, + "longitude": 10.34050457 } }, { "position": { - "latitude": 58.95054261, - "longitude": 10.71740731 + "latitude": 58.77043567, + "longitude": 10.41556825 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_31.json b/data/baseline_situations_generated/traffic_situation_31.json index eee7866..d9147df 100644 --- a/data/baseline_situations_generated/traffic_situation_31.json +++ b/data/baseline_situations_generated/traffic_situation_31.json @@ -3,7 +3,7 @@ "description": "Head-on, crossing stand-on and overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,17 +40,17 @@ "targetShips": [ { "static": { - "id": "51f15c1e-9f67-4560-a622-5489503b151b", - "length": 122.0, - "width": 20.0, + "id": "ed95fb1e-dae4-4e28-aec8-c93add0a84d9", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" + "speedMax": 15.0, + "name": "target_ship_1", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.85226226, + "latitude": 58.82454908, "longitude": 10.490654 }, "sog": 6.0, @@ -61,84 +61,84 @@ "waypoints": [ { "position": { - "latitude": 58.85226226, + "latitude": 58.82454908, "longitude": 10.490654 } }, { "position": { - "latitude": 58.75207466, - "longitude": 10.49057544 + "latitude": 58.80785114, + "longitude": 10.49064091 } } ] }, { "static": { - "id": "0c4b45d2-bd92-4df6-840d-0982c045a5c9", + "id": "d88a524d-737c-47ad-9689-cc095699577d", "length": 178.0, "width": 30.0, "height": 30.0, "speedMax": 21.0, - "name": "BASTO VI", + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.75918474, - "longitude": 10.44411787 + "latitude": 58.75563868, + "longitude": 10.40539249 }, "sog": 12.1, - "cog": 25.21, - "heading": 25.21, + "cog": 51.28, + "heading": 51.28, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.75918474, - "longitude": 10.44411787 + "latitude": 58.75563868, + "longitude": 10.40539249 } }, { "position": { - "latitude": 58.94047455, - "longitude": 10.60840213 + "latitude": 58.77652842, + "longitude": 10.45554675 } } ] }, { "static": { - "id": "4997af9a-bf89-43fb-a381-65add7881654", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "id": "bc51aa50-f656-4849-92de-911011317e96", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_3", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.73589741, - "longitude": 10.46592574 + "latitude": 58.72339191, + "longitude": 10.45469348 }, "sog": 16.9, - "cog": 10.54, - "heading": 10.54, + "cog": 15.41, + "heading": 15.41, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.73589741, - "longitude": 10.46592574 + "latitude": 58.72339191, + "longitude": 10.45469348 } }, { "position": { - "latitude": 59.01232282, - "longitude": 10.56494966 + "latitude": 58.76856857, + "longitude": 10.4786667 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_32.json b/data/baseline_situations_generated/traffic_situation_32.json index f666680..5939a09 100644 --- a/data/baseline_situations_generated/traffic_situation_32.json +++ b/data/baseline_situations_generated/traffic_situation_32.json @@ -3,7 +3,7 @@ "description": "Head-on, crossing stand-on and overtaking give-way situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,70 @@ "targetShips": [ { "static": { - "id": "34978f0b-8f60-427c-bfe9-f3e321193815", + "id": "1e2e1ff0-b0f3-4d05-bdba-d57d1f368315", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "name": "CANOLE", + "name": "target_ship_1", "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.84683992, - "longitude": 10.48785457 + "latitude": 58.81915367, + "longitude": 10.48878772 }, "sog": 5.1, - "cog": 177.04, - "heading": 177.04, + "cog": 178.02, + "heading": 178.02, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.84683992, - "longitude": 10.48785457 + "latitude": 58.81915367, + "longitude": 10.48878772 } }, { "position": { - "latitude": 58.76292341, - "longitude": 10.49619571 + "latitude": 58.80515733, + "longitude": 10.48972006 } } ] }, { "static": { - "id": "28e649dd-8a91-4f86-a13d-466ca41cadab", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.75548606, - "longitude": 10.44855894 - }, - "sog": 13.0, - "cog": 23.84, - "heading": 23.84, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.75548606, - "longitude": 10.44855894 - } - }, - { - "position": { - "latitude": 58.95355292, - "longitude": 10.61699119 - } - } - ] - }, - { - "static": { - "id": "38ba4a35-1a51-49ad-9ad4-0d91d0b85ac0", + "id": "2d63203e-8e3c-45de-adb1-bdaae9a15b76", "length": 178.0, "width": 30.0, "height": 30.0, "speedMax": 21.0, - "name": "BASTO VI", + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.77370117, - "longitude": 10.50447832 + "latitude": 58.75045872, + "longitude": 10.42194711 }, - "sog": 8.0, - "cog": 348.99, - "heading": 348.99, + "sog": 13.0, + "cog": 41.25, + "heading": 41.25, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.77370117, - "longitude": 10.50447832 + "latitude": 58.75045872, + "longitude": 10.42194711 } }, { "position": { - "latitude": 58.90376782, - "longitude": 10.45576097 + "latitude": 58.77759071, + "longitude": 10.46775274 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_33.json b/data/baseline_situations_generated/traffic_situation_33.json index 9eb5d62..4f8baae 100644 --- a/data/baseline_situations_generated/traffic_situation_33.json +++ b/data/baseline_situations_generated/traffic_situation_33.json @@ -3,7 +3,7 @@ "description": "Head-on and two overtaking give-way situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,35 @@ "targetShips": [ { "static": { - "id": "9c166d4e-73b4-4724-88b0-ddf05cf80270", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.8624875, - "longitude": 10.50064207 - }, - "sog": 11.1, - "cog": 185.7, - "heading": 185.7, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.8624875, - "longitude": 10.50064207 - } - }, - { - "position": { - "latitude": 58.67918102, - "longitude": 10.46545086 - } - } - ] - }, - { - "static": { - "id": "e11a90df-be13-4feb-8534-16ff7c6628b3", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.79300255, - "longitude": 10.51135592 - }, - "sog": 5.1, - "cog": 337.41, - "heading": 337.41, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.79300255, - "longitude": 10.51135592 - } - }, - { - "position": { - "latitude": 58.87058671, - "longitude": 10.44923693 - } - } - ] - }, - { - "static": { - "id": "fb98e77c-4c86-451e-a60f-f95668fd8b6a", + "id": "81ced22a-66b2-4ce9-9a8b-1789c344db58", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "name": "CANOLE", + "name": "target_ship_1", "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.77920431, - "longitude": 10.50478937 + "latitude": 58.84318613, + "longitude": 10.49868939 }, - "sog": 7.0, - "cog": 347.84, - "heading": 347.84, + "sog": 11.1, + "cog": 184.61, + "heading": 184.61, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.77920431, - "longitude": 10.50478937 + "latitude": 58.84318613, + "longitude": 10.49868939 } }, { "position": { - "latitude": 58.8929419, - "longitude": 10.45762539 + "latitude": 58.81258267, + "longitude": 10.49394251 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_34.json b/data/baseline_situations_generated/traffic_situation_34.json index 14ba83c..bd30cc3 100644 --- a/data/baseline_situations_generated/traffic_situation_34.json +++ b/data/baseline_situations_generated/traffic_situation_34.json @@ -3,7 +3,7 @@ "description": "Head-on, overtaking give-way and overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "be3d4f63-f597-4f76-8ed4-df5c9b3fdc96", + "id": "5ea95fa3-78dc-4564-b2b9-68faf45e3239", "length": 178.0, "width": 30.0, "height": 30.0, "speedMax": 21.0, - "name": "BASTO VI", + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.87164444, - "longitude": 10.47973278 + "latitude": 58.85233408, + "longitude": 10.48168547 }, "sog": 13.0, - "cog": 174.69, - "heading": 174.69, + "cog": 175.67, + "heading": 175.67, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.87164444, - "longitude": 10.47973278 + "latitude": 58.85233408, + "longitude": 10.48168547 } }, { "position": { - "latitude": 58.65603748, - "longitude": 10.51827059 + "latitude": 58.81634806, + "longitude": 10.48693168 } } ] }, { "static": { - "id": "1dd5327a-ad73-4f7c-a5ff-109dacc218d7", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" + "id": "fce4c5d5-6917-4bc1-80ae-6ca68899b04c", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "target_ship_2", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.78192446, - "longitude": 10.50359702 + "latitude": 58.76444549, + "longitude": 10.49134522 }, "sog": 6.0, - "cog": 345.44, - "heading": 345.44, + "cog": 359.24, + "heading": 359.24, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.78192446, - "longitude": 10.50359702 + "latitude": 58.76444549, + "longitude": 10.49134522 } }, { "position": { - "latitude": 58.87889289, - "longitude": 10.45510372 + "latitude": 58.78114197, + "longitude": 10.49092143 } } ] }, { "static": { - "id": "008ff8ed-9ff3-4154-ad42-6685794a7e63", - "length": 50.0, - "width": 10.0, + "id": "38e96e64-0cd3-411b-a88a-cfcbdce86336", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "name": "target_ship_3", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.74043996, - "longitude": 10.49452481 + "latitude": 58.7293888, + "longitude": 10.49639109 }, "sog": 15.9, - "cog": 358.16, - "heading": 358.16, + "cog": 357.24, + "heading": 357.24, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.74043996, - "longitude": 10.49452481 + "latitude": 58.7293888, + "longitude": 10.49639109 } }, { "position": { - "latitude": 59.0053151, - "longitude": 10.47810936 + "latitude": 58.77350627, + "longitude": 10.49229598 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_35.json b/data/baseline_situations_generated/traffic_situation_35.json index 99234b4..879cf26 100644 --- a/data/baseline_situations_generated/traffic_situation_35.json +++ b/data/baseline_situations_generated/traffic_situation_35.json @@ -3,7 +3,7 @@ "description": "Head-on and two overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "a7bb3b3e-fd44-4d8e-acde-f2974daa835f", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "1077425c-1cc8-4b98-9524-56c14fe438fd", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.85266625, - "longitude": 10.4966503 + "latitude": 58.84160611, + "longitude": 10.49590724 }, "sog": 13.0, - "cog": 183.52, - "heading": 183.52, + "cog": 183.12, + "heading": 183.12, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.85266625, - "longitude": 10.4966503 + "latitude": 58.84160611, + "longitude": 10.49590724 } }, { "position": { - "latitude": 58.63653987, - "longitude": 10.4710716 + "latitude": 58.80557042, + "longitude": 10.49212958 } } ] }, { "static": { - "id": "63404feb-d272-4803-8773-44ca7494f693", - "length": 122.0, - "width": 20.0, + "id": "2c9124e8-7f4e-4252-b6da-75add867bf49", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" + "speedMax": 15.0, + "name": "target_ship_2", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.7252233, - "longitude": 10.5249556 + "latitude": 58.71040164, + "longitude": 10.53826151 }, "sog": 19.1, - "cog": 347.84, - "heading": 347.84, + "cog": 342.97, + "heading": 342.97, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.7252233, - "longitude": 10.5249556 + "latitude": 58.71040164, + "longitude": 10.53826151 } }, { "position": { - "latitude": 59.0348423, - "longitude": 10.39656477 + "latitude": 58.76087471, + "longitude": 10.50850741 } } ] }, { "static": { - "id": "8a70995e-9c62-42c1-b925-2ac50eeea119", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" + "id": "c87e4c51-62d1-49d5-acbd-4e38288c502c", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "target_ship_3", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.7387971, - "longitude": 10.49901772 + "latitude": 58.71695513, + "longitude": 10.50643101 }, "sog": 15.0, - "cog": 356.67, - "heading": 356.67, + "cog": 353.69, + "heading": 353.69, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.7387971, - "longitude": 10.49901772 + "latitude": 58.71695513, + "longitude": 10.50643101 } }, { "position": { - "latitude": 58.98722907, - "longitude": 10.47116193 + "latitude": 58.75817912, + "longitude": 10.4976521 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_36.json b/data/baseline_situations_generated/traffic_situation_36.json index f907288..08d4bf2 100644 --- a/data/baseline_situations_generated/traffic_situation_36.json +++ b/data/baseline_situations_generated/traffic_situation_36.json @@ -3,7 +3,7 @@ "description": "Three crossing give-way situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "a8c83b89-5e89-4397-bd4f-2d88a2a8c1e1", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" + "id": "eadae5c5-0658-44a0-bf78-6ff4ad48dd3a", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "target_ship_1", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.85488366, - "longitude": 10.53781222 + "latitude": 58.84495467, + "longitude": 10.53269722 }, "sog": 15.0, - "cog": 204.95, - "heading": 204.95, + "cog": 202.08, + "heading": 202.08, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.85488366, - "longitude": 10.53781222 + "latitude": 58.84495467, + "longitude": 10.53269722 } }, { "position": { - "latitude": 58.62924898, - "longitude": 10.33577431 + "latitude": 58.80652158, + "longitude": 10.50268415 } } ] }, { "static": { - "id": "3e49fa78-25ac-4c46-b3e6-729896ec8cee", + "id": "0d33a880-a4ed-4542-ac7b-c1820d0354af", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "name": "CANOLE", + "name": "target_ship_2", "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.84431728, - "longitude": 10.59965879 + "latitude": 58.83445113, + "longitude": 10.58635288 }, "sog": 14.0, - "cog": 239.21, - "heading": 239.21, + "cog": 228.95, + "heading": 228.95, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.84431728, - "longitude": 10.59965879 + "latitude": 58.83445113, + "longitude": 10.58635288 } }, { "position": { - "latitude": 58.72520254, - "longitude": 10.21488418 + "latitude": 58.80898413, + "longitude": 10.53005219 } } ] }, { "static": { - "id": "7f659f7c-fb51-453d-a4e6-52472c88d98c", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "b3afe993-0cb1-4d15-90f5-e57f6d0b3723", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.76001964, - "longitude": 10.52172417 + "latitude": 58.75851144, + "longitude": 10.53539297 }, "sog": 12.1, - "cog": 336.27, - "heading": 336.27, + "cog": 324.52, + "heading": 324.52, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.76001964, - "longitude": 10.52172417 + "latitude": 58.75851144, + "longitude": 10.53539297 } }, { "position": { - "latitude": 58.94345203, - "longitude": 10.36650197 + "latitude": 58.78570742, + "longitude": 10.49808486 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_37.json b/data/baseline_situations_generated/traffic_situation_37.json index 220142d..7923189 100644 --- a/data/baseline_situations_generated/traffic_situation_37.json +++ b/data/baseline_situations_generated/traffic_situation_37.json @@ -3,7 +3,7 @@ "description": "Two crossing give-waysituations and one crossing give-way situation with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "bbf5bc7d-6eb9-416a-b608-edc5da98cbf1", + "id": "920192ea-f1fe-4be2-af92-e9ccacd60797", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "name": "CANOLE", + "name": "target_ship_1", "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.76859304, - "longitude": 10.60385793 + "latitude": 58.76932919, + "longitude": 10.62003238 }, "sog": 15.9, - "cog": 303.67, - "heading": 303.67, + "cog": 287.97, + "heading": 287.97, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.76859304, - "longitude": 10.60385793 + "latitude": 58.76932919, + "longitude": 10.62003238 } }, { "position": { - "latitude": 58.91550911, - "longitude": 10.17930372 + "latitude": 58.78295504, + "longitude": 10.53915956 } } ] }, { "static": { - "id": "3f6e058d-3534-4c7f-881e-2359760bf947", + "id": "4c8d2478-9b8c-4aa6-b67d-138b774698ce", "length": 178.0, "width": 30.0, "height": 30.0, "speedMax": 21.0, - "name": "BASTO VI", + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.82280747, - "longitude": 10.60491203 + "latitude": 58.81748388, + "longitude": 10.59466475 }, "sog": 12.1, - "cog": 260.92, - "heading": 260.92, + "cog": 244.02, + "heading": 244.02, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.82280747, - "longitude": 10.60491203 + "latitude": 58.81748388, + "longitude": 10.59466475 } }, { "position": { - "latitude": 58.79120277, - "longitude": 10.22404133 + "latitude": 58.802856, + "longitude": 10.53687631 } } ] }, { "static": { - "id": "4db91974-0fc6-4a96-8def-ac8ce5ed60e2", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "8e02d550-8acc-4622-acc8-ef330ee9593e", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.75533344, - "longitude": 10.43238448 + "latitude": 58.75193999, + "longitude": 10.40794999 }, "sog": 14.0, - "cog": 31.34, - "heading": 31.34, + "cog": 47.61, + "heading": 47.61, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.75533344, - "longitude": 10.43238448 + "latitude": 58.75193999, + "longitude": 10.40794999 } }, { "position": { - "latitude": 58.9540746, - "longitude": 10.6653537 + "latitude": 58.7780846, + "longitude": 10.46308791 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_38.json b/data/baseline_situations_generated/traffic_situation_38.json index acb2e35..17848a8 100644 --- a/data/baseline_situations_generated/traffic_situation_38.json +++ b/data/baseline_situations_generated/traffic_situation_38.json @@ -3,7 +3,7 @@ "description": "Two crossing give-waysituations and one overtaking give-way situation with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "7b0cb04f-9141-4d0d-875e-485af3197df4", - "length": 50.0, - "width": 10.0, + "id": "0f1edcd0-c5a7-40b5-ac23-18036cd001d8", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "name": "target_ship_1", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.88292003, - "longitude": 10.52708109 + "latitude": 58.85631106, + "longitude": 10.5189593 }, "sog": 12.1, - "cog": 196.47, - "heading": 196.47, + "cog": 192.74, + "heading": 192.74, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.88292003, - "longitude": 10.52708109 + "latitude": 58.85631106, + "longitude": 10.5189593 } }, { "position": { - "latitude": 58.6907638, - "longitude": 10.41774831 + "latitude": 58.82373776, + "longitude": 10.50477984 } } ] }, { "static": { - "id": "d2689851-2bde-4c4c-a1e5-ff6d40e740cf", - "length": 50.0, - "width": 10.0, + "id": "a16a6a0e-7afc-4d98-ba84-00778780a143", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "name": "target_ship_2", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.82723332, - "longitude": 10.61343127 + "latitude": 58.82181995, + "longitude": 10.60301119 }, "sog": 14.0, - "cog": 255.37, - "heading": 255.37, + "cog": 242.3, + "heading": 242.3, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.82723332, - "longitude": 10.61343127 + "latitude": 58.82181995, + "longitude": 10.60301119 } }, { "position": { - "latitude": 58.76844979, - "longitude": 10.18005105 + "latitude": 58.80379462, + "longitude": 10.53691303 } } ] }, { "static": { - "id": "9aadb47b-2144-46ec-9983-cb17fd1d58c0", + "id": "cf1ee3ce-adb2-4626-8a9c-998626f22f44", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "name": "CANOLE", + "name": "target_ship_3", "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.79704237, - "longitude": 10.51418991 + "latitude": 58.77098103, + "longitude": 10.49592452 }, "sog": 4.1, - "cog": 323.09, - "heading": 323.09, + "cog": 352.25, + "heading": 352.25, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.79704237, - "longitude": 10.51418991 + "latitude": 58.77098103, + "longitude": 10.49592452 } }, { "position": { - "latitude": 58.85130972, - "longitude": 10.43573451 + "latitude": 58.78218933, + "longitude": 10.49299005 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_39.json b/data/baseline_situations_generated/traffic_situation_39.json index 2642f20..d1d314a 100644 --- a/data/baseline_situations_generated/traffic_situation_39.json +++ b/data/baseline_situations_generated/traffic_situation_39.json @@ -3,7 +3,7 @@ "description": "Two crossing give-waysituations and one overtaking stand-on situation with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "ed7e4cfb-51f9-410a-bb20-50ff8dd8c076", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" + "id": "a80e778a-6544-4676-89d6-f5aed89cd25d", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "target_ship_1", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.90021047, - "longitude": 10.53706916 + "latitude": 58.87899691, + "longitude": 10.52986324 }, "sog": 18.1, - "cog": 195.49, - "heading": 195.49, + "cog": 193.03, + "heading": 193.03, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.90021047, - "longitude": 10.53706916 + "latitude": 58.87899691, + "longitude": 10.52986324 } }, { "position": { - "latitude": 58.61056945, - "longitude": 10.38252513 + "latitude": 58.83019281, + "longitude": 10.50812407 } } ] }, { "static": { - "id": "6c6fde64-02c9-4d5d-9d81-5f2a1d79d2e9", - "length": 50.0, - "width": 10.0, + "id": "1345fe0c-5885-4cb9-ae57-5c349fe9be11", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "name": "target_ship_2", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.77180694, - "longitude": 10.58189453 + "latitude": 58.77486823, + "longitude": 10.61533211 }, "sog": 12.1, - "cog": 314.78, - "heading": 314.78, + "cog": 284.13, + "heading": 284.13, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.77180694, - "longitude": 10.58189453 + "latitude": 58.77486823, + "longitude": 10.61533211 } }, { "position": { - "latitude": 58.91295602, - "longitude": 10.30813352 + "latitude": 58.7830208, + "longitude": 10.55299388 } } ] }, { "static": { - "id": "b2e7c856-97eb-42d7-b30c-63b3518aa66a", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "id": "454cb381-b56f-40cc-aa9c-78f9b3574edf", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_3", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.73299771, - "longitude": 10.48032032 + "latitude": 58.71663194, + "longitude": 10.47475603 }, "sog": 16.9, - "cog": 4.13, - "heading": 4.13, + "cog": 6.3, + "heading": 6.3, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.73299771, - "longitude": 10.48032032 + "latitude": 58.71663194, + "longitude": 10.47475603 } }, { "position": { - "latitude": 59.01344091, - "longitude": 10.51925466 + "latitude": 58.76321066, + "longitude": 10.48465844 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_40.json b/data/baseline_situations_generated/traffic_situation_40.json index eb25fc3..13d92e7 100644 --- a/data/baseline_situations_generated/traffic_situation_40.json +++ b/data/baseline_situations_generated/traffic_situation_40.json @@ -3,7 +3,7 @@ "description": "One crossing give way and two crossing stand-on situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "00e5f7ff-a959-411b-be5b-613b2769d771", + "id": "21f9af18-98f6-482f-870b-d99f4f144427", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "name": "CANOLE", + "name": "target_ship_1", "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.84868926, - "longitude": 10.5195814 + "latitude": 58.82287031, + "longitude": 10.51082023 }, "sog": 6.0, - "cog": 206.72, - "heading": 206.72, + "cog": 198.3, + "heading": 198.3, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.84868926, - "longitude": 10.5195814 + "latitude": 58.82287031, + "longitude": 10.51082023 } }, { "position": { - "latitude": 58.75920273, - "longitude": 10.43286087 + "latitude": 58.80701693, + "longitude": 10.50072766 } } ] }, { "static": { - "id": "0630c606-72cc-4e9d-8faf-d0d72d0d4222", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "id": "7ad158eb-ceab-4d30-aaa9-17084ecbbff4", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_2", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.77853101, - "longitude": 10.38228859 + "latitude": 58.7798417, + "longitude": 10.37290533 }, "sog": 15.0, - "cog": 64.8, - "heading": 64.8, + "cog": 79.53, + "heading": 79.53, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.77853101, - "longitude": 10.38228859 + "latitude": 58.7798417, + "longitude": 10.37290533 } }, { "position": { - "latitude": 58.8844815, - "longitude": 10.81571776 + "latitude": 58.78738112, + "longitude": 10.45141067 } } ] }, { "static": { - "id": "d4bc321a-8009-49f9-9a75-aeb8c873c81b", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "df6b438d-f1c6-46aa-86ca-811ad4a42720", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.74668822, - "longitude": 10.3076718 + "latitude": 58.74116713, + "longitude": 10.24739775 }, "sog": 16.9, - "cog": 44.4, - "heading": 44.4, + "cog": 68.41, + "heading": 68.41, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.74668822, - "longitude": 10.3076718 + "latitude": 58.74116713, + "longitude": 10.24739775 } }, { "position": { - "latitude": 58.94756318, - "longitude": 10.68637371 + "latitude": 58.75840968, + "longitude": 10.33127351 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_41.json b/data/baseline_situations_generated/traffic_situation_41.json index fde21e5..18caeb1 100644 --- a/data/baseline_situations_generated/traffic_situation_41.json +++ b/data/baseline_situations_generated/traffic_situation_41.json @@ -3,7 +3,7 @@ "description": "Crossing give way, crossing stand-on and overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "163d9564-6acb-4aa5-bd00-9ff2b4991bef", + "id": "90ad61e9-0bde-404c-8de7-717fbebdec37", "length": 178.0, "width": 30.0, "height": 30.0, "speedMax": 21.0, - "name": "BASTO VI", + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.7903632, - "longitude": 10.68398716 + "latitude": 58.79163799, + "longitude": 10.69314577 }, "sog": 18.1, - "cog": 287.28, - "heading": 287.28, + "cog": 269.75, + "heading": 269.75, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.7903632, - "longitude": 10.68398716 + "latitude": 58.79163799, + "longitude": 10.69314577 } }, { "position": { - "latitude": 58.87964806, - "longitude": 10.13155538 + "latitude": 58.79141813, + "longitude": 10.59672205 } } ] }, { "static": { - "id": "fc71199f-e1ac-417d-8032-83c82ba602fd", + "id": "c356120c-0dd7-400a-88f8-a657e8dda6c5", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "name": "BASTO", + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.84431728, - "longitude": 10.38164921 + "latitude": 58.83445113, + "longitude": 10.39495512 }, "sog": 14.0, - "cog": 120.78, - "heading": 120.78, + "cog": 131.04, + "heading": 131.04, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.84431728, - "longitude": 10.38164921 + "latitude": 58.83445113, + "longitude": 10.39495512 } }, { "position": { - "latitude": 58.72523959, - "longitude": 10.7664663 + "latitude": 58.80898955, + "longitude": 10.4512649 } } ] }, { "static": { - "id": "f22a543e-a509-4b7e-89e9-cb80cf85da8a", + "id": "e873f7d1-1ec4-47b3-b5a3-626c428b46e7", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "name": "CANOLE", + "name": "target_ship_3", "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.73589741, - "longitude": 10.46592574 + "latitude": 58.72339191, + "longitude": 10.45469348 }, "sog": 16.9, - "cog": 10.54, - "heading": 10.54, + "cog": 15.41, + "heading": 15.41, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.73589741, - "longitude": 10.46592574 + "latitude": 58.72339191, + "longitude": 10.45469348 } }, { "position": { - "latitude": 59.01232282, - "longitude": 10.56494966 + "latitude": 58.76856857, + "longitude": 10.4786667 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_42.json b/data/baseline_situations_generated/traffic_situation_42.json index 5b13b12..7c2fb18 100644 --- a/data/baseline_situations_generated/traffic_situation_42.json +++ b/data/baseline_situations_generated/traffic_situation_42.json @@ -3,7 +3,7 @@ "description": "Crossing give way, crossing stand-on and overtaking give-way situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,82 +40,82 @@ "targetShips": [ { "static": { - "id": "d1fc45ea-8cff-4057-aa26-4a901489b8b2", + "id": "4fe4ef8c-3048-440c-bde9-e2ae099fc8d9", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "name": "BASTO", + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.80768955, - "longitude": 10.57581183 + "latitude": 58.80563373, + "longitude": 10.57185462 }, "sog": 8.9, - "cog": 277.25, - "heading": 277.25, + "cog": 251.07, + "heading": 251.07, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.80768955, - "longitude": 10.57581183 + "latitude": 58.80563373, + "longitude": 10.57185462 } }, { "position": { - "latitude": 58.82646199, - "longitude": 10.29193893 + "latitude": 58.79759561, + "longitude": 10.52674017 } } ] }, { "static": { - "id": "d2f12fed-2860-48aa-9d7b-7b1e5980b865", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "3b208654-1cb8-4f44-b8ef-573049a1c296", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.8216045, - "longitude": 10.35724928 + "latitude": 58.818229, + "longitude": 10.3649909 }, "sog": 15.9, - "cog": 101.3, - "heading": 101.3, + "cog": 112.53, + "heading": 112.53, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.8216045, - "longitude": 10.35724928 + "latitude": 58.818229, + "longitude": 10.3649909 } }, { "position": { - "latitude": 58.76968116, - "longitude": 10.85747985 + "latitude": 58.80130577, + "longitude": 10.44352233 } } ] }, { "static": { - "id": "8b7f4427-5c22-4462-b6d6-e6787f1550c2", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "29d13c09-719c-463f-81d1-306de57352af", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { @@ -137,8 +137,8 @@ }, { "position": { - "latitude": 58.88226367, - "longitude": 10.42681957 + "latitude": 58.79115902, + "longitude": 10.49067118 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_43.json b/data/baseline_situations_generated/traffic_situation_43.json index 0947cb8..af321b4 100644 --- a/data/baseline_situations_generated/traffic_situation_43.json +++ b/data/baseline_situations_generated/traffic_situation_43.json @@ -3,7 +3,7 @@ "description": "Crossing give way, overtaking stand-on and overtaking give-way situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,35 @@ "targetShips": [ { "static": { - "id": "ccb76df2-f8e2-4373-9646-f47230d159b8", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.85544026, - "longitude": 10.57321977 - }, - "sog": 12.1, - "cog": 225.52, - "heading": 225.52, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.85544026, - "longitude": 10.57321977 - } - }, - { - "position": { - "latitude": 58.7150358, - "longitude": 10.29804369 - } - } - ] - }, - { - "static": { - "id": "bb6f2333-4b68-453d-9eb7-d5aabed2eb06", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.79191629, - "longitude": 10.50534234 - }, - "sog": 5.1, - "cog": 344.18, - "heading": 344.18, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.79191629, - "longitude": 10.50534234 - } - }, - { - "position": { - "latitude": 58.87276015, - "longitude": 10.46123662 - } - } - ] - }, - { - "static": { - "id": "e82a0f45-206b-49f6-b88a-f9831cedbc00", + "id": "e5780700-ac63-4233-a076-22872a892cfd", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "name": "BASTO", + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.78532689, - "longitude": 10.47102346 + "latitude": 58.83964904, + "longitude": 10.55904984 }, - "sog": 7.0, - "cog": 12.15, - "heading": 12.15, + "sog": 12.1, + "cog": 216.23, + "heading": 216.23, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.78532689, - "longitude": 10.47102346 + "latitude": 58.83964904, + "longitude": 10.55904984 } }, { "position": { - "latitude": 58.89906902, - "longitude": 10.51814687 + "latitude": 58.8127117, + "longitude": 10.52105285 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_44.json b/data/baseline_situations_generated/traffic_situation_44.json index 977ea4b..6feac13 100644 --- a/data/baseline_situations_generated/traffic_situation_44.json +++ b/data/baseline_situations_generated/traffic_situation_44.json @@ -3,7 +3,7 @@ "description": "Crossing give way, overtaking give-way and overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,70 @@ "targetShips": [ { "static": { - "id": "b64157d3-9ffb-4763-b1e1-80384bc3c60f", + "id": "4aaa9de2-6ec0-4541-8fa9-612a4db5c754", "length": 178.0, "width": 30.0, "height": 30.0, "speedMax": 21.0, - "name": "BASTO VI", + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.81401861, - "longitude": 10.69941856 + "latitude": 58.81472782, + "longitude": 10.70233895 }, "sog": 14.0, - "cog": 285.33, - "heading": 285.33, + "cog": 257.89, + "heading": 257.89, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.81401861, - "longitude": 10.69941856 + "latitude": 58.81472782, + "longitude": 10.70233895 } }, { "position": { - "latitude": 58.87554942, - "longitude": 10.26745362 + "latitude": 58.80659059, + "longitude": 10.62934931 } } ] }, { "static": { - "id": "068fda9e-a203-440f-a2a2-530cce0f996c", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "ea1fe2b6-9c64-4dbb-8d79-16b56ebc51b4", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.79300255, - "longitude": 10.51135592 - }, - "sog": 5.1, - "cog": 337.41, - "heading": 337.41, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.79300255, - "longitude": 10.51135592 - } - }, - { - "position": { - "latitude": 58.87058671, - "longitude": 10.44923693 - } - } - ] - }, - { - "static": { - "id": "3b4f19ae-3d26-44c8-a3ee-1a296f2f18e1", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" - }, - "initial": { - "position": { - "latitude": 58.74043996, - "longitude": 10.49452481 + "latitude": 58.7293888, + "longitude": 10.49639109 }, "sog": 15.9, - "cog": 358.16, - "heading": 358.16, + "cog": 357.24, + "heading": 357.24, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.74043996, - "longitude": 10.49452481 + "latitude": 58.7293888, + "longitude": 10.49639109 } }, { "position": { - "latitude": 59.0053151, - "longitude": 10.47810936 + "latitude": 58.77350627, + "longitude": 10.49229598 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_45.json b/data/baseline_situations_generated/traffic_situation_45.json index ea8dc19..0d7fe81 100644 --- a/data/baseline_situations_generated/traffic_situation_45.json +++ b/data/baseline_situations_generated/traffic_situation_45.json @@ -3,7 +3,7 @@ "description": "Crossing give way and two overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "fa4bdb5a-ae09-440b-8596-9f130cd7abcc", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "id": "25b22987-1a9c-4a75-a0d5-af47fb364d35", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_1", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.85032315, - "longitude": 10.56864046 + "latitude": 58.83655184, + "longitude": 10.55626769 }, "sog": 12.1, - "cog": 225.52, - "heading": 225.52, + "cog": 216.92, + "heading": 216.92, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.85032315, - "longitude": 10.56864046 + "latitude": 58.83655184, + "longitude": 10.55626769 } }, { "position": { - "latitude": 58.70991869, - "longitude": 10.29346438 + "latitude": 58.80985331, + "longitude": 10.51765124 } } ] }, { "static": { - "id": "efd94a9a-2f98-4429-9b0c-914d850af8f8", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "074bd7ee-78e6-4b82-a608-50d977d98103", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.73137281, - "longitude": 10.51944315 + "latitude": 58.71893913, + "longitude": 10.53060629 }, "sog": 18.1, - "cog": 348.53, - "heading": 348.53, + "cog": 343.95, + "heading": 343.95, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.73137281, - "longitude": 10.51944315 + "latitude": 58.71893913, + "longitude": 10.53060629 } }, { "position": { - "latitude": 59.02593332, - "longitude": 10.40439835 + "latitude": 58.76707949, + "longitude": 10.50394162 } } ] }, { "static": { - "id": "6ce10979-ca36-4b97-a7cf-768adcfda652", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "70961523-ef61-481d-92be-c92d838ce207", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.73605002, - "longitude": 10.48135714 + "latitude": 58.70876775, + "longitude": 10.47209485 }, "sog": 15.0, - "cog": 3.32, - "heading": 3.32, + "cog": 6.65, + "heading": 6.65, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.73605002, - "longitude": 10.48135714 + "latitude": 58.70876775, + "longitude": 10.47209485 } }, { "position": { - "latitude": 58.98448466, - "longitude": 10.50912431 + "latitude": 58.74996453, + "longitude": 10.48133501 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_46.json b/data/baseline_situations_generated/traffic_situation_46.json index 90a4c72..1e72d42 100644 --- a/data/baseline_situations_generated/traffic_situation_46.json +++ b/data/baseline_situations_generated/traffic_situation_46.json @@ -3,7 +3,7 @@ "description": "Two crossing stand-on and one crossing stand-on situation with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "930d6d65-3054-4606-a286-b7057e441cc0", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "id": "3bb6aa8d-dc26-4d2d-8c61-827f5ff5710e", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_1", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.84868926, - "longitude": 10.4617266 + "latitude": 58.82287031, + "longitude": 10.47048777 }, "sog": 6.0, - "cog": 153.27, - "heading": 153.27, + "cog": 161.75, + "heading": 161.75, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.84868926, - "longitude": 10.4617266 + "latitude": 58.82287031, + "longitude": 10.47048777 } }, { "position": { - "latitude": 58.75921108, - "longitude": 10.54847905 + "latitude": 58.80701266, + "longitude": 10.48055548 } } ] }, { "static": { - "id": "e7f0f9f2-6edf-46c3-85a1-413903ebde19", - "length": 122.0, - "width": 20.0, + "id": "570237ed-04ce-4df7-b172-233c2857a272", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" + "speedMax": 15.0, + "name": "target_ship_2", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.77853101, - "longitude": 10.38228859 + "latitude": 58.7798417, + "longitude": 10.37290533 }, "sog": 15.0, - "cog": 64.8, - "heading": 64.8, + "cog": 79.53, + "heading": 79.53, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.77853101, - "longitude": 10.38228859 + "latitude": 58.7798417, + "longitude": 10.37290533 } }, { "position": { - "latitude": 58.8844815, - "longitude": 10.81571776 + "latitude": 58.78738112, + "longitude": 10.45141067 } } ] }, { "static": { - "id": "9c633590-5f59-421b-b8cd-17878b15b4c9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "9f1111dd-e8ca-4754-ac17-cabdddf5286f", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.87659098, - "longitude": 10.3649045 + "latitude": 58.86039577, + "longitude": 10.38291068 }, "sog": 16.9, - "cog": 132.81, - "heading": 132.81, + "cog": 141.06, + "heading": 141.06, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.87659098, - "longitude": 10.3649045 + "latitude": 58.86039577, + "longitude": 10.38291068 } }, { "position": { - "latitude": 58.6855095, - "longitude": 10.76194086 + "latitude": 58.8239452, + "longitude": 10.43960157 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_47.json b/data/baseline_situations_generated/traffic_situation_47.json index a10a271..87b7c37 100644 --- a/data/baseline_situations_generated/traffic_situation_47.json +++ b/data/baseline_situations_generated/traffic_situation_47.json @@ -3,7 +3,7 @@ "description": "Two crossing stand-on situations and one overtaking stand-on situation with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "7db9a42e-23ab-4bc0-ae06-78a831759869", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "cdfa9a22-bd10-438e-9d67-a90abb9dda39", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.89068547, - "longitude": 10.4015044 + "latitude": 58.8721741, + "longitude": 10.41448198 }, "sog": 18.1, - "cog": 149.08, - "heading": 149.08, + "cog": 153.95, + "heading": 153.95, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.89068547, - "longitude": 10.4015044 + "latitude": 58.8721741, + "longitude": 10.41448198 } }, { "position": { - "latitude": 58.6328272, - "longitude": 10.69875455 + "latitude": 58.82716783, + "longitude": 10.4568217 } } ] }, { "static": { - "id": "1aee7305-3ba6-4381-ad4f-78b054ad9a58", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" + "id": "31e9db13-0494-4437-8fca-eff4ed5ba1a4", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "target_ship_2", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.81514976, - "longitude": 10.37205859 + "latitude": 58.81237574, + "longitude": 10.37841778 }, "sog": 14.0, - "cog": 96.83, - "heading": 96.83, + "cog": 110.01, + "heading": 110.01, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.81514976, - "longitude": 10.37205859 + "latitude": 58.81237574, + "longitude": 10.37841778 } }, { "position": { - "latitude": 58.78747744, - "longitude": 10.81678814 + "latitude": 58.79910639, + "longitude": 10.44856358 } } ] }, { "static": { - "id": "4f3c11c7-51df-4301-9203-0173e4130a76", + "id": "ffd3df9f-82a1-444a-a784-48895f9093f6", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "name": "BASTO", + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.70918969, - "longitude": 10.46265975 + "latitude": 58.67733793, + "longitude": 10.44624336 }, "sog": 19.1, - "cog": 7.22, - "heading": 7.22, + "cog": 11.46, + "heading": 11.46, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.70918969, - "longitude": 10.46265975 + "latitude": 58.67733793, + "longitude": 10.44624336 } }, { "position": { - "latitude": 59.02340099, - "longitude": 10.53927288 + "latitude": 58.72907272, + "longitude": 10.46642991 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_48.json b/data/baseline_situations_generated/traffic_situation_48.json index 7b25e6f..24286d5 100644 --- a/data/baseline_situations_generated/traffic_situation_48.json +++ b/data/baseline_situations_generated/traffic_situation_48.json @@ -3,7 +3,7 @@ "description": "Two crossing stand-on situations and one overtaking give-way situation with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,70 @@ "targetShips": [ { "static": { - "id": "21ee3dee-d3a6-448a-be2e-9d5db2d8510f", + "id": "502a1289-c97f-443e-99cb-4c40b4513f85", "length": 178.0, "width": 30.0, "height": 30.0, "speedMax": 21.0, - "name": "BASTO VI", + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.81260916, - "longitude": 10.39602651 + "latitude": 58.80948503, + "longitude": 10.40204009 }, "sog": 8.9, - "cog": 82.74, - "heading": 82.74, + "cog": 111.73, + "heading": 111.73, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.81260916, - "longitude": 10.39602651 + "latitude": 58.80948503, + "longitude": 10.40204009 } }, { "position": { - "latitude": 58.83140892, - "longitude": 10.67989271 + "latitude": 58.80031284, + "longitude": 10.44634581 } } ] }, { "static": { - "id": "2e8f90b0-613c-41af-bcb3-c7a3d03f7374", - "length": 122.0, - "width": 20.0, + "id": "3331dd8b-ee9c-4b22-a41e-3eee6feeb9ec", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" + "speedMax": 15.0, + "name": "target_ship_2", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.80419735, - "longitude": 10.35479546 + "latitude": 58.80361382, + "longitude": 10.35674815 }, "sog": 15.9, - "cog": 87.09, - "heading": 87.09, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.80419735, - "longitude": 10.35479546 - } - }, - { - "position": { - "latitude": 58.81765321, - "longitude": 10.86425501 - } - } - ] - }, - { - "static": { - "id": "aabbd629-41f1-49e9-b149-3b018321149c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.78053296, - "longitude": 10.5136715 - }, - "sog": 7.0, - "cog": 339.94, - "heading": 339.94, + "cog": 100.15, + "heading": 100.15, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.78053296, - "longitude": 10.5136715 + "latitude": 58.80361382, + "longitude": 10.35674815 } }, { "position": { - "latitude": 58.88981867, - "longitude": 10.43683917 + "latitude": 58.79582785, + "longitude": 10.44043637 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_49.json b/data/baseline_situations_generated/traffic_situation_49.json index b242134..618a9a8 100644 --- a/data/baseline_situations_generated/traffic_situation_49.json +++ b/data/baseline_situations_generated/traffic_situation_49.json @@ -3,7 +3,7 @@ "description": "One crossing stand-on situation and two overtaking give-way situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,35 @@ "targetShips": [ { "static": { - "id": "91f10e98-dd40-480b-ad9c-3a890e59a937", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "cd3fcce3-90d1-42d4-a80b-c73345fabadd", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.86473185, - "longitude": 10.3997418 + "latitude": 58.84858154, + "longitude": 10.41424005 }, "sog": 14.0, - "cog": 137.45, - "heading": 137.45, + "cog": 145.36, + "heading": 145.36, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.86473185, - "longitude": 10.3997418 + "latitude": 58.84858154, + "longitude": 10.41424005 } }, { "position": { - "latitude": 58.69330216, - "longitude": 10.70261734 - } - } - ] - }, - { - "static": { - "id": "70ddeedc-4802-44c3-b310-4cfdf35cf4ac", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.78601814, - "longitude": 10.50230099 - }, - "sog": 6.0, - "cog": 349.56, - "heading": 349.56, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.78601814, - "longitude": 10.50230099 - } - }, - { - "position": { - "latitude": 58.88454766, - "longitude": 10.46736072 - } - } - ] - }, - { - "static": { - "id": "40b4777a-9ba8-4a4a-a2f9-28f68cef7e90", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.78532689, - "longitude": 10.47102346 - }, - "sog": 7.0, - "cog": 12.15, - "heading": 12.15, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.78532689, - "longitude": 10.47102346 - } - }, - { - "position": { - "latitude": 58.89906902, - "longitude": 10.51814687 + "latitude": 58.81667403, + "longitude": 10.45667389 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_50.json b/data/baseline_situations_generated/traffic_situation_50.json index 2a89bcf..7eba51c 100644 --- a/data/baseline_situations_generated/traffic_situation_50.json +++ b/data/baseline_situations_generated/traffic_situation_50.json @@ -3,7 +3,7 @@ "description": "Crossing stand-on, overtaking give-way situation and overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,70 @@ "targetShips": [ { "static": { - "id": "32f5ddb7-a825-4fe7-8c83-b20991b093a4", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" - }, - "initial": { - "position": { - "latitude": 58.79309232, - "longitude": 10.36827418 - }, - "sog": 14.0, - "cog": 74.66, - "heading": 74.66, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.79309232, - "longitude": 10.36827418 - } - }, - { - "position": { - "latitude": 58.85466472, - "longitude": 10.80021717 - } - } - ] - }, - { - "static": { - "id": "3c2edcef-a2aa-44a8-9d98-cac29d7529a4", + "id": "c683531e-652a-4af2-a0c7-5f6471adf0ab", "length": 178.0, "width": 30.0, "height": 30.0, "speedMax": 21.0, - "name": "BASTO VI", + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.8069534, - "longitude": 10.51310124 + "latitude": 58.79416063, + "longitude": 10.36388496 }, - "sog": 4.1, - "cog": 335.64, - "heading": 335.64, + "sog": 14.0, + "cog": 92.59, + "heading": 92.59, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.8069534, - "longitude": 10.51310124 + "latitude": 58.79416063, + "longitude": 10.36388496 } }, { "position": { - "latitude": 58.86877953, - "longitude": 10.45921366 + "latitude": 58.79240813, + "longitude": 10.43846004 } } ] }, { "static": { - "id": "7283426d-90ba-4111-90c2-c79c7e22a63c", + "id": "365e58d2-499f-4071-970c-ea5d21f3ac3b", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "name": "CANOLE", + "name": "target_ship_3", "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.73057382, - "longitude": 10.49618373 + "latitude": 58.70297734, + "longitude": 10.50083216 }, "sog": 15.9, - "cog": 358.16, - "heading": 358.16, + "cog": 356.55, + "heading": 356.55, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.73057382, - "longitude": 10.49618373 + "latitude": 58.70297734, + "longitude": 10.50083216 } }, { "position": { - "latitude": 58.99544895, - "longitude": 10.47976827 + "latitude": 58.7470661, + "longitude": 10.49571832 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_51.json b/data/baseline_situations_generated/traffic_situation_51.json index 2bea939..815c5a9 100644 --- a/data/baseline_situations_generated/traffic_situation_51.json +++ b/data/baseline_situations_generated/traffic_situation_51.json @@ -3,7 +3,7 @@ "description": "One crossing stand-on situation and two overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "24597554-9bf6-49e1-96d2-5fc858cee3b1", - "length": 122.0, - "width": 20.0, + "id": "db9e7d6c-5fbf-44d9-8fa7-c84757bb3e60", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" + "speedMax": 15.0, + "name": "target_ship_1", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.84936257, - "longitude": 10.41353156 + "latitude": 58.83744958, + "longitude": 10.42422813 }, "sog": 13.0, - "cog": 136.08, - "heading": 136.08, + "cog": 143.3, + "heading": 143.3, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.84936257, - "longitude": 10.41353156 + "latitude": 58.83744958, + "longitude": 10.42422813 } }, { "position": { - "latitude": 58.69339742, - "longitude": 10.7026618 + "latitude": 58.80851546, + "longitude": 10.46574665 } } ] }, { "static": { - "id": "95afff28-7d33-4d0d-96ba-32bc3361c616", + "id": "586a4d94-8d3c-44cd-b073-0311b9c55fa0", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "name": "BASTO", + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.73992825, - "longitude": 10.51177065 + "latitude": 58.73740561, + "longitude": 10.51403439 }, "sog": 18.1, - "cog": 348.53, - "heading": 348.53, + "cog": 347.27, + "heading": 347.27, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.73992825, - "longitude": 10.51177065 + "latitude": 58.73740561, + "longitude": 10.51403439 } }, { "position": { - "latitude": 59.03448877, - "longitude": 10.39672586 + "latitude": 58.78626802, + "longitude": 10.49278608 } } ] }, { "static": { - "id": "9a5dec5d-d25d-466e-aa6f-b68a53674a5d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "CANOLE", - "shipType": "Cargo" + "id": "fae8ac8b-ee70-42d4-9227-930e0a061fe9", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_3", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.73130099, - "longitude": 10.46813763 + "latitude": 58.70538328, + "longitude": 10.44997593 }, "sog": 15.9, - "cog": 7.62, - "heading": 7.62, + "cog": 13.87, + "heading": 13.87, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.73130099, - "longitude": 10.46813763 + "latitude": 58.70538328, + "longitude": 10.44997593 } }, { "position": { - "latitude": 58.99397292, - "longitude": 10.53578342 + "latitude": 58.74826496, + "longitude": 10.47035043 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_52.json b/data/baseline_situations_generated/traffic_situation_52.json index 1b529de..94ffda9 100644 --- a/data/baseline_situations_generated/traffic_situation_52.json +++ b/data/baseline_situations_generated/traffic_situation_52.json @@ -3,7 +3,7 @@ "description": "Three overtaking give-way situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,117 +31,11 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } ] }, - "targetShips": [ - { - "static": { - "id": "463df3d3-3d42-488d-bb2c-ba43b8e932df", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.77865669, - "longitude": 10.4828087 - }, - "sog": 7.0, - "cog": 6.7, - "heading": 6.7, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.77865669, - "longitude": 10.4828087 - } - }, - { - "position": { - "latitude": 58.89420816, - "longitude": 10.50895158 - } - } - ] - }, - { - "static": { - "id": "29b32ce6-5df0-45b5-9343-22b52580322c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.78601814, - "longitude": 10.50230099 - }, - "sog": 6.0, - "cog": 349.56, - "heading": 349.56, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.78601814, - "longitude": 10.50230099 - } - }, - { - "position": { - "latitude": 58.88454766, - "longitude": 10.46736072 - } - } - ] - }, - { - "static": { - "id": "9b67a2ee-9388-4aff-ae0a-bbfb05ddfb84", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.79978047, - "longitude": 10.45804588 - }, - "sog": 5.1, - "cog": 31.74, - "heading": 31.74, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.79978047, - "longitude": 10.45804588 - } - }, - { - "position": { - "latitude": 58.87124042, - "longitude": 10.54313859 - } - } - ] - } - ] + "targetShips": [] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_53.json b/data/baseline_situations_generated/traffic_situation_53.json index 3d97d16..179506e 100644 --- a/data/baseline_situations_generated/traffic_situation_53.json +++ b/data/baseline_situations_generated/traffic_situation_53.json @@ -3,7 +3,7 @@ "description": "Two overtaking give-way situations and one overtaking stand-on situation with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,35 @@ "targetShips": [ { "static": { - "id": "fbcc16a5-b3ff-4443-8944-91cd6c309ec7", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "2db3c199-dc28-4f00-b1ce-7ecaed62f27e", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.77758838, - "longitude": 10.490654 - }, - "sog": 7.0, - "cog": 0.0, - "heading": 0.0, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.77758838, - "longitude": 10.490654 - } - }, - { - "position": { - "latitude": 58.89393528, - "longitude": 10.490654 - } - } - ] - }, - { - "static": { - "id": "d561e694-505e-48e2-a692-07355480361d", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.8138211, - "longitude": 10.50774432 - }, - "sog": 4.1, - "cog": 344.81, - "heading": 344.81, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.8138211, - "longitude": 10.50774432 - } - }, - { - "position": { - "latitude": 58.8793177, - "longitude": 10.47350517 - } - } - ] - }, - { - "static": { - "id": "e61db5c7-2c92-4589-b99f-6991ce023a0c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.72519637, - "longitude": 10.48420841 + "latitude": 58.69760886, + "longitude": 10.47955998 }, "sog": 16.9, - "cog": 2.06, - "heading": 2.06, + "cog": 3.55, + "heading": 3.55, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.72519637, - "longitude": 10.48420841 + "latitude": 58.69760886, + "longitude": 10.47955998 } }, { "position": { - "latitude": 59.00618586, - "longitude": 10.5036882 + "latitude": 58.74438077, + "longitude": 10.48514903 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_54.json b/data/baseline_situations_generated/traffic_situation_54.json index 3196b50..17f26e2 100644 --- a/data/baseline_situations_generated/traffic_situation_54.json +++ b/data/baseline_situations_generated/traffic_situation_54.json @@ -3,7 +3,7 @@ "description": "One overtaking give-way situation and two overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,70 @@ "targetShips": [ { "static": { - "id": "1972279c-684d-4574-96cf-5639ce848471", + "id": "a6261754-ef85-4613-9662-76319cc0e66c", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "name": "BASTO", + "name": "target_ship_2", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.7815115, - "longitude": 10.47057417 - }, - "sog": 7.0, - "cog": 15.58, - "heading": 15.58, - "navStatus": "Under way using engine" - }, - "waypoints": [ - { - "position": { - "latitude": 58.7815115, - "longitude": 10.47057417 - } - }, - { - "position": { - "latitude": 58.89358096, - "longitude": 10.53074131 - } - } - ] - }, - { - "static": { - "id": "0189bfc3-4425-4b75-9fe8-3c4cabbfcb35", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", - "shipType": "Passenger" - }, - "initial": { - "position": { - "latitude": 58.72923619, - "longitude": 10.52136128 + "latitude": 58.71434271, + "longitude": 10.53471903 }, "sog": 18.1, - "cog": 348.53, - "heading": 348.53, + "cog": 343.43, + "heading": 343.43, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.72923619, - "longitude": 10.52136128 + "latitude": 58.71434271, + "longitude": 10.53471903 } }, { "position": { - "latitude": 59.0237967, - "longitude": 10.40631648 + "latitude": 58.76235644, + "longitude": 10.50722147 } } ] }, { "static": { - "id": "3557634e-677c-4c2f-9b71-caeed15f4456", + "id": "7c640290-36c5-4af7-9df1-0dada3165355", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "name": "BASTO", + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.72428965, - "longitude": 10.46321272 + "latitude": 58.70365064, + "longitude": 10.4487663 }, "sog": 18.1, - "cog": 9.11, - "heading": 9.11, + "cog": 13.98, + "heading": 13.98, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.72428965, - "longitude": 10.46321272 + "latitude": 58.70365064, + "longitude": 10.4487663 } }, { "position": { - "latitude": 59.02106121, - "longitude": 10.55481473 + "latitude": 58.75226064, + "longitude": 10.47206115 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_55.json b/data/baseline_situations_generated/traffic_situation_55.json index de3844c..1cf8c59 100644 --- a/data/baseline_situations_generated/traffic_situation_55.json +++ b/data/baseline_situations_generated/traffic_situation_55.json @@ -3,7 +3,7 @@ "description": "Three overtaking stand-on situation with three target ships.", "ownShip": { "static": { - "id": "da41746c-26eb-449d-b89d-c11633d33163", + "id": "27b8e920-d131-49d1-be47-284c99a128d9", "length": 122.0, "width": 20.0, "height": 8.0, @@ -31,7 +31,7 @@ }, { "position": { - "latitude": 58.92969579, + "latitude": 58.7911568, "longitude": 10.490654 } } @@ -40,105 +40,105 @@ "targetShips": [ { "static": { - "id": "a733ca2b-bfd0-4a30-b5c5-bd510dbc01fe", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "BASTO", + "id": "5f8224e3-e17f-4512-84d3-507031fa4827", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "target_ship_1", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.72361635, - "longitude": 10.50416728 + "latitude": 58.70727751, + "longitude": 10.50971429 }, "sog": 19.1, - "cog": 355.23, - "heading": 355.23, + "cog": 353.29, + "heading": 353.29, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.72361635, - "longitude": 10.50416728 + "latitude": 58.70727751, + "longitude": 10.50971429 } }, { "position": { - "latitude": 59.03924327, - "longitude": 10.4535116 + "latitude": 58.75970249, + "longitude": 10.49783446 } } ] }, { "static": { - "id": "45445883-1db1-4565-8aa1-400801e1e41d", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", - "shipType": "Passenger" + "id": "ea1f5e8c-7471-4d99-a22e-99507c7565ef", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "target_ship_2", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 58.72709957, - "longitude": 10.5232794 + "latitude": 58.70976424, + "longitude": 10.53884905 }, "sog": 18.1, - "cog": 348.53, - "heading": 348.53, + "cog": 342.92, + "heading": 342.92, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.72709957, - "longitude": 10.5232794 + "latitude": 58.70976424, + "longitude": 10.53884905 } }, { "position": { - "latitude": 59.02166008, - "longitude": 10.4082346 + "latitude": 58.75764747, + "longitude": 10.51052083 } } ] }, { "static": { - "id": "011afb7e-d3a9-438b-94b7-8d7db865d574", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "BASTO VI", + "id": "9f9f3674-bd0f-4213-963d-5d944f35eec2", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "target_ship_3", "shipType": "Passenger" }, "initial": { "position": { - "latitude": 58.72613001, - "longitude": 10.46450875 + "latitude": 58.7002931, + "longitude": 10.44641617 }, "sog": 16.9, - "cog": 8.31, - "heading": 8.31, + "cog": 14.21, + "heading": 14.21, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 58.72613001, - "longitude": 10.46450875 + "latitude": 58.7002931, + "longitude": 10.44641617 } }, { "position": { - "latitude": 59.00435105, - "longitude": 10.54271127 + "latitude": 58.74572132, + "longitude": 10.46855808 } } ] diff --git a/data/target_ships/target_ship_1.json b/data/target_ships/target_ship_1.json index 8bc48ef..e4dc5bb 100644 --- a/data/target_ships/target_ship_1.json +++ b/data/target_ships/target_ship_1.json @@ -3,6 +3,5 @@ "width": 20, "height": 8, "speedMax": 17, - "name": "BASTO", "shipType": "Passenger" } diff --git a/data/target_ships/target_ship_2.json b/data/target_ships/target_ship_2.json index a282bc7..d4ea8b3 100644 --- a/data/target_ships/target_ship_2.json +++ b/data/target_ships/target_ship_2.json @@ -3,6 +3,5 @@ "width": 10, "height": 8, "speedMax": 15, - "name": "CANOLE", "shipType": "Cargo" } diff --git a/data/target_ships/target_ship_3.json b/data/target_ships/target_ship_3.json index efcbea4..41d8619 100644 --- a/data/target_ships/target_ship_3.json +++ b/data/target_ships/target_ship_3.json @@ -3,6 +3,5 @@ "width": 30, "height": 30, "speedMax": 21, - "name": "BASTO VI", "shipType": "Passenger" } diff --git a/src/trafficgen/check_land_crossing.py b/src/trafficgen/check_land_crossing.py index 98eb03e..133db1c 100644 --- a/src/trafficgen/check_land_crossing.py +++ b/src/trafficgen/check_land_crossing.py @@ -40,6 +40,6 @@ def path_crosses_land( lat = rad_2_deg(position_2.latitude) lon = rad_2_deg(position_2.longitude) - if globe.is_land(lat, lon): # type: ignore (The global_land_mask package is unfortunately not typed.) + if globe.is_land(lat, lon): # type: ignore (The package is unfortunately not typed.) return True return False diff --git a/src/trafficgen/encounter.py b/src/trafficgen/encounter.py index 6510174..e1da0bd 100644 --- a/src/trafficgen/encounter.py +++ b/src/trafficgen/encounter.py @@ -40,6 +40,7 @@ def generate_encounter( desired_encounter_type: EncounterType, own_ship: OwnShip, target_ships_static: List[ShipStatic], + encounter_number: int, beta_default: Optional[Union[List[float], float]], relative_sog_default: Optional[float], vector_time_default: Optional[float], @@ -53,6 +54,7 @@ def generate_encounter( * own_ship: Dict, information about own ship that will encounter a target ship * target_ships_static: List of target ships including static information that may be used in an encounter + * encounter_number: Integer, used to naming the target ships. target_ship_1,2 etc. * beta_default: User defined beta. If not set, this is None. * relative_sog_default: User defined relative sog between own ship and target ship. If not set, this is None. @@ -190,6 +192,7 @@ def generate_encounter( if encounter_found: target_ship_static.id = uuid4() + target_ship_static.name = f"target_ship_{encounter_number}" target_ship_initial: Initial = Initial( position=target_ship_initial_position, sog=target_ship_sog, diff --git a/src/trafficgen/read_files.py b/src/trafficgen/read_files.py index 2f1e213..29a90cb 100644 --- a/src/trafficgen/read_files.py +++ b/src/trafficgen/read_files.py @@ -153,7 +153,9 @@ def read_target_ship_static_files(target_ship_folder: Path) -> List[ShipStatic]: * target_ships_static: List of different target ships with static information """ target_ships_static: List[ShipStatic] = [] + i = 0 for file_name in sorted([file for file in os.listdir(target_ship_folder) if file.endswith(".json")]): + i = i + 1 file_path = os.path.join(target_ship_folder, file_name) with open(file_path, encoding="utf-8") as f: data = json.load(f) diff --git a/src/trafficgen/ship_traffic_generator.py b/src/trafficgen/ship_traffic_generator.py index 42cdc56..e4bcaf4 100644 --- a/src/trafficgen/ship_traffic_generator.py +++ b/src/trafficgen/ship_traffic_generator.py @@ -66,7 +66,7 @@ def generate_traffic_situations( ) for _ in range(num_situations): target_ships: List[TargetShip] = [] - for encounter in desired_traffic_situation.encounters: + for i, encounter in enumerate(desired_traffic_situation.encounters): desired_encounter_type = EncounterType(encounter.desired_encounter_type) beta: Union[List[float], float, None] = encounter.beta relative_speed: Union[float, None] = encounter.relative_speed @@ -76,6 +76,7 @@ def generate_traffic_situations( desired_encounter_type, own_ship.model_copy(deep=True), target_ships_static, + i + 1, beta, relative_speed, vector_time, @@ -83,6 +84,7 @@ def generate_traffic_situations( ) if encounter_found: target_ships.append(target_ship.model_copy(deep=True)) + traffic_situation: TrafficSituation = TrafficSituation( title=desired_traffic_situation.title, description=desired_traffic_situation.description,