Working on #25. Small adjustments. Generated new traffic situation fi…

…les.
dnv-opensource · Apr 3, 2024 · a6234ad · a6234ad
1 parent 0416bd6
commit a6234ad
Show file tree

Hide file tree

Showing 60 changed files with 756 additions and 715 deletions.
diff --git 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": "ce433df5-bea2-4f5e-8679-92b43e3140be",
+            "id": "e5974507-ae0d-4d25-8402-aa0127d2d64b",
             "length": 122.0,
             "width": 20.0,
             "height": 8.0,
@@ -40,13 +40,13 @@
     "targetShips": [
         {
             "static": {
-                "id": "dfd6b5f6-7b3c-402f-affd-e089840bc6e8",
-                "length": 50.0,
-                "width": 10.0,
-                "height": 8.0,
-                "speedMax": 15.0,
-                "name": "CANOLE",
-                "shipType": "Cargo"
+                "id": "06e7aab7-cfd9-4339-a58a-c357ad2e3d16",
+                "length": 178.0,
+                "width": 30.0,
+                "height": 30.0,
+                "speedMax": 21.0,
+                "name": "BASTO VI",
+                "shipType": "Passenger"
             },
             "initial": {
                 "position": {

diff --git 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": "ce433df5-bea2-4f5e-8679-92b43e3140be",
+            "id": "e5974507-ae0d-4d25-8402-aa0127d2d64b",
             "length": 122.0,
             "width": 20.0,
             "height": 8.0,
@@ -40,7 +40,7 @@
     "targetShips": [
         {
             "static": {
-                "id": "f93d0740-146c-4515-869e-7921ad857771",
+                "id": "12bf0a94-5074-4288-8e4f-9e3320084f1e",
                 "length": 50.0,
                 "width": 10.0,
                 "height": 8.0,

diff --git 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": "ce433df5-bea2-4f5e-8679-92b43e3140be",
+            "id": "e5974507-ae0d-4d25-8402-aa0127d2d64b",
             "length": 122.0,
             "width": 20.0,
             "height": 8.0,
@@ -40,13 +40,13 @@
     "targetShips": [
         {
             "static": {
-                "id": "dac921cc-344e-4e19-a98a-b8b3d78c29ae",
-                "length": 50.0,
-                "width": 10.0,
-                "height": 8.0,
-                "speedMax": 15.0,
-                "name": "CANOLE",
-                "shipType": "Cargo"
+                "id": "786d6e98-bc03-488b-8ca0-395e68fbe794",
+                "length": 178.0,
+                "width": 30.0,
+                "height": 30.0,
+                "speedMax": 21.0,
+                "name": "BASTO VI",
+                "shipType": "Passenger"
             },
             "initial": {
                 "position": {

diff --git 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": "ce433df5-bea2-4f5e-8679-92b43e3140be",
+            "id": "e5974507-ae0d-4d25-8402-aa0127d2d64b",
             "length": 122.0,
             "width": 20.0,
             "height": 8.0,
@@ -40,7 +40,7 @@
     "targetShips": [
         {
             "static": {
-                "id": "8fdc3b9d-cf9f-412f-8c05-0b290e2eb1cd",
+                "id": "a69e9746-e28b-4c25-bb09-29b59a2d7c66",
                 "length": 50.0,
                 "width": 10.0,
                 "height": 8.0,

diff --git 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": "ce433df5-bea2-4f5e-8679-92b43e3140be",
+            "id": "e5974507-ae0d-4d25-8402-aa0127d2d64b",
             "length": 122.0,
             "width": 20.0,
             "height": 8.0,
@@ -40,13 +40,13 @@
     "targetShips": [
         {
             "static": {
-                "id": "05e8e127-1457-4e38-a4eb-91ae3cb42434",
-                "length": 50.0,
-                "width": 10.0,
-                "height": 8.0,
-                "speedMax": 15.0,
-                "name": "CANOLE",
-                "shipType": "Cargo"
+                "id": "a45477bc-8dec-4fee-94f4-f47fadd07113",
+                "length": 178.0,
+                "width": 30.0,
+                "height": 30.0,
+                "speedMax": 21.0,
+                "name": "BASTO VI",
+                "shipType": "Passenger"
             },
             "initial": {
                 "position": {

diff --git 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": "ce433df5-bea2-4f5e-8679-92b43e3140be",
+            "id": "e5974507-ae0d-4d25-8402-aa0127d2d64b",
             "length": 122.0,
             "width": 20.0,
             "height": 8.0,
@@ -40,13 +40,13 @@
     "targetShips": [
         {
             "static": {
-                "id": "8252388c-6a5c-422c-8ff7-f03202555195",
-                "length": 122.0,
-                "width": 20.0,
+                "id": "2a768c67-57f9-40db-bc8b-0a15facfae1f",
+                "length": 50.0,
+                "width": 10.0,
                 "height": 8.0,
-                "speedMax": 17.0,
-                "name": "BASTO",
-                "shipType": "Passenger"
+                "speedMax": 15.0,
+                "name": "CANOLE",
+                "shipType": "Cargo"
             },
             "initial": {
                 "position": {
@@ -75,7 +75,7 @@
         },
         {
             "static": {
-                "id": "158f8e0f-067c-4832-906b-ec5574022da9",
+                "id": "5de15f5d-bee2-4c27-ba9b-6e21cab97026",
                 "length": 178.0,
                 "width": 30.0,
                 "height": 30.0,

diff --git 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": "ce433df5-bea2-4f5e-8679-92b43e3140be",
+            "id": "e5974507-ae0d-4d25-8402-aa0127d2d64b",
             "length": 122.0,
             "width": 20.0,
             "height": 8.0,
@@ -40,12 +40,12 @@
     "targetShips": [
         {
             "static": {
-                "id": "7e28fa7c-3944-4b3f-8e51-f24452cdff77",
-                "length": 178.0,
-                "width": 30.0,
-                "height": 30.0,
-                "speedMax": 21.0,
-                "name": "BASTO VI",
+                "id": "dc33ba72-077c-4168-9de5-e80a582a4da3",
+                "length": 122.0,
+                "width": 20.0,
+                "height": 8.0,
+                "speedMax": 17.0,
+                "name": "BASTO",
                 "shipType": "Passenger"
             },
             "initial": {
@@ -75,13 +75,13 @@
         },
         {
             "static": {
-                "id": "2cc0c318-a03b-4f5f-a526-5d832012135d",
-                "length": 122.0,
-                "width": 20.0,
+                "id": "5a8d709e-1384-4ed1-b1b5-05799e518ff5",
+                "length": 50.0,
+                "width": 10.0,
                 "height": 8.0,
-                "speedMax": 17.0,
-                "name": "BASTO",
-                "shipType": "Passenger"
+                "speedMax": 15.0,
+                "name": "CANOLE",
+                "shipType": "Cargo"
             },
             "initial": {
                 "position": {

diff --git 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": "ce433df5-bea2-4f5e-8679-92b43e3140be",
+            "id": "e5974507-ae0d-4d25-8402-aa0127d2d64b",
             "length": 122.0,
             "width": 20.0,
             "height": 8.0,
@@ -40,7 +40,7 @@
     "targetShips": [
         {
             "static": {
-                "id": "320bda36-a3a6-426e-a38d-aa8607595dc0",
+                "id": "523bc633-924b-400c-be0b-6a8ca909bc19",
                 "length": 50.0,
                 "width": 10.0,
                 "height": 8.0,
@@ -75,7 +75,7 @@
         },
         {
             "static": {
-                "id": "60e9e953-a03a-40f4-bd99-f39c88b13e37",
+                "id": "7165468f-e1a0-492d-8f7d-ebd74674e9db",
                 "length": 122.0,
                 "width": 20.0,
                 "height": 8.0,

diff --git 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": "ce433df5-bea2-4f5e-8679-92b43e3140be",
+            "id": "e5974507-ae0d-4d25-8402-aa0127d2d64b",
             "length": 122.0,
             "width": 20.0,
             "height": 8.0,
@@ -40,13 +40,13 @@
     "targetShips": [
         {
             "static": {
-                "id": "2f478fe4-0d80-475a-893b-4af9029cc16a",
-                "length": 178.0,
-                "width": 30.0,
-                "height": 30.0,
-                "speedMax": 21.0,
-                "name": "BASTO VI",
-                "shipType": "Passenger"
+                "id": "8f10873e-bc8c-4705-8a1b-9672b423a646",
+                "length": 50.0,
+                "width": 10.0,
+                "height": 8.0,
+                "speedMax": 15.0,
+                "name": "CANOLE",
+                "shipType": "Cargo"
             },
             "initial": {
                 "position": {
@@ -75,7 +75,7 @@
         },
         {
             "static": {
-                "id": "d818ad2e-af8c-4ca9-bd73-fb727a4f45ae",
+                "id": "29e03a5f-4e22-4d0d-b0a9-28d16caec54b",
                 "length": 122.0,
                 "width": 20.0,
                 "height": 8.0,

diff --git 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": "ce433df5-bea2-4f5e-8679-92b43e3140be",
+            "id": "e5974507-ae0d-4d25-8402-aa0127d2d64b",
             "length": 122.0,
             "width": 20.0,
             "height": 8.0,
@@ -40,7 +40,7 @@
     "targetShips": [
         {
             "static": {
-                "id": "35f2184b-04bd-494b-a9ef-3d5709bf681e",
+                "id": "5d50c9d4-8488-4fcc-895f-fe732be3578a",
                 "length": 50.0,
                 "width": 10.0,
                 "height": 8.0,
@@ -75,12 +75,12 @@
         },
         {
             "static": {
-                "id": "06e96af4-67f1-413b-923b-c49cc1ce6ad4",
-                "length": 178.0,
-                "width": 30.0,
-                "height": 30.0,
-                "speedMax": 21.0,
-                "name": "BASTO VI",
+                "id": "ff44462c-63d9-4cfd-b1a5-8f91bebece23",
+                "length": 122.0,
+                "width": 20.0,
+                "height": 8.0,
+                "speedMax": 17.0,
+                "name": "BASTO",
                 "shipType": "Passenger"
             },
             "initial": {

diff --git 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": "ce433df5-bea2-4f5e-8679-92b43e3140be",
+            "id": "e5974507-ae0d-4d25-8402-aa0127d2d64b",
             "length": 122.0,
             "width": 20.0,
             "height": 8.0,
@@ -40,13 +40,13 @@
     "targetShips": [
         {
             "static": {
-                "id": "9d63f390-e416-4dd2-bfaa-4420e86bd311",
-                "length": 50.0,
-                "width": 10.0,
-                "height": 8.0,
-                "speedMax": 15.0,
-                "name": "CANOLE",
-                "shipType": "Cargo"
+                "id": "6f91c35d-02b0-4033-b263-d1ff95bcf6ff",
+                "length": 178.0,
+                "width": 30.0,
+                "height": 30.0,
+                "speedMax": 21.0,
+                "name": "BASTO VI",
+                "shipType": "Passenger"
             },
             "initial": {
                 "position": {
@@ -75,7 +75,7 @@
         },
         {
             "static": {
-                "id": "0991fdaa-4607-4814-970b-d078a1a92804",
+                "id": "1622879e-6df6-4cf0-ba76-2d42862bab86",
                 "length": 50.0,
                 "width": 10.0,
                 "height": 8.0,

diff --git 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": "ce433df5-bea2-4f5e-8679-92b43e3140be",
+            "id": "e5974507-ae0d-4d25-8402-aa0127d2d64b",
             "length": 122.0,
             "width": 20.0,
             "height": 8.0,
@@ -40,7 +40,7 @@
     "targetShips": [
         {
             "static": {
-                "id": "0367c82d-83b1-4577-9105-85011bb19fee",
+                "id": "24f83ee0-db4a-4dd6-be3c-0ceb1e405bbf",
                 "length": 50.0,
                 "width": 10.0,
                 "height": 8.0,
@@ -75,12 +75,12 @@
         },
         {
             "static": {
-                "id": "df8cdef7-1708-4cba-962c-9b25ee7678f2",
-                "length": 122.0,
-                "width": 20.0,
-                "height": 8.0,
-                "speedMax": 17.0,
-                "name": "BASTO",
+                "id": "66154854-2f4e-4430-9a34-a6b220818a54",
+                "length": 178.0,
+                "width": 30.0,
+                "height": 30.0,
+                "speedMax": 21.0,
+                "name": "BASTO VI",
                 "shipType": "Passenger"
             },
             "initial": {