Skip to content

Commit

Permalink
#34 Removed name on target ship. When an encounter is found, the adde…
Browse files Browse the repository at this point in the history 
…d target ship get the name target_ship_{x}, where x is the encounter number.
  • Loading branch information
@tomarnepedersen
tomarnepedersen committed Apr 23, 2024
1 parent 9c3dfde commit 3fdc890
Show file tree
Hide file tree
Showing 62 changed files with 1,637 additions and 2,370 deletions.
34 changes: 17 additions & 17 deletions data/baseline_situations_generated/traffic_situation_01.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -31,7 +31,7 @@
},
{
"position": {
"latitude": 58.92969579,
"latitude": 58.7911568,
"longitude": 10.490654
}
}
Expand All @@ -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
}
}
]
Expand Down
32 changes: 16 additions & 16 deletions data/baseline_situations_generated/traffic_situation_02.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -31,7 +31,7 @@
},
{
"position": {
"latitude": 58.92969579,
"latitude": 58.7911568,
"longitude": 10.490654
}
}
Expand All @@ -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
}
}
]
Expand Down
34 changes: 17 additions & 17 deletions data/baseline_situations_generated/traffic_situation_03.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -31,7 +31,7 @@
},
{
"position": {
"latitude": 58.92969579,
"latitude": 58.7911568,
"longitude": 10.490654
}
}
Expand All @@ -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
}
}
]
Expand Down
32 changes: 16 additions & 16 deletions data/baseline_situations_generated/traffic_situation_04.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -31,7 +31,7 @@
},
{
"position": {
"latitude": 58.92969579,
"latitude": 58.7911568,
"longitude": 10.490654
}
}
Expand All @@ -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
}
}
]
Expand Down
32 changes: 16 additions & 16 deletions data/baseline_situations_generated/traffic_situation_05.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -31,7 +31,7 @@
},
{
"position": {
"latitude": 58.92969579,
"latitude": 58.7911568,
"longitude": 10.490654
}
}
Expand All @@ -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
}
}
]
Expand Down
Loading

0 comments on commit 3fdc890

Please sign in to comment.