Skip to content

Commit 2da99f8

Browse files
tomarnepedersentomarnepedersen
committed
#68 Fixing comment from reviewer. Updated generated files.
1 parent eae08a1 commit 2da99f8

60 files changed

Lines changed: 1124 additions & 1123 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
88
## [0.8.2] - 2025-09-22
99
* [bug] fixed bug that all target ships had id = 10.
1010
* [bug] fixed duplicate -v parameter warning.
11+
* If own ship ID is not given in own_ship.json file, then ID is set to 1. Target ship IDs will follow from own ship ID.
1112

1213
## [0.8.1] - 2025-05-12
1314
* Changed first assert in test_basic_cli() from 0 to 2.

‎data/baseline_situations_generated/traffic_situation_01.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.8.1",
2+
"version": "0.8.2",
33
"title": "HO",
44
"description": "A head on situation with one target ship.",
55
"ownShip": {
@@ -70,18 +70,18 @@
7070
}
7171
],
7272
"static": {
73-
"id": 11,
73+
"id": 2,
7474
"name": "target_ship_1",
7575
"dimensions": {
76-
"length": 50.0,
77-
"width": 10.0,
78-
"height": 8.0,
79-
"a": 25.0,
80-
"b": 25.0,
81-
"c": 5.0,
82-
"d": 5.0
76+
"length": 178.0,
77+
"width": 30.0,
78+
"height": 30.0,
79+
"a": 89.0,
80+
"b": 89.0,
81+
"c": 15.0,
82+
"d": 15.0
8383
},
84-
"shipType": "Cargo"
84+
"shipType": "Passenger"
8585
}
8686
}
8787
]

‎data/baseline_situations_generated/traffic_situation_02.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.8.1",
2+
"version": "0.8.2",
33
"title": "CR-GW",
44
"description": "A crossing situation with one target ship. Own ship is give-way.",
55
"ownShip": {
@@ -70,7 +70,7 @@
7070
}
7171
],
7272
"static": {
73-
"id": 11,
73+
"id": 2,
7474
"name": "target_ship_1",
7575
"dimensions": {
7676
"length": 122.0,

‎data/baseline_situations_generated/traffic_situation_03.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.8.1",
2+
"version": "0.8.2",
33
"title": "CR-SO",
44
"description": "A crossing situation with one target ship. Own ship is stand-on.",
55
"ownShip": {
@@ -70,7 +70,7 @@
7070
}
7171
],
7272
"static": {
73-
"id": 11,
73+
"id": 2,
7474
"name": "target_ship_1",
7575
"dimensions": {
7676
"length": 50.0,

‎data/baseline_situations_generated/traffic_situation_04.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.8.1",
2+
"version": "0.8.2",
33
"title": "OT-GW",
44
"description": "A overting situation with one target ship. Own ship is give-way.",
55
"ownShip": {
@@ -70,7 +70,7 @@
7070
}
7171
],
7272
"static": {
73-
"id": 11,
73+
"id": 2,
7474
"name": "target_ship_1",
7575
"dimensions": {
7676
"length": 122.0,

‎data/baseline_situations_generated/traffic_situation_05.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.8.1",
2+
"version": "0.8.2",
33
"title": "OT-SO",
44
"description": "A overtaking situation with one target ship. Own ship is stand-on.",
55
"ownShip": {
@@ -70,16 +70,16 @@
7070
}
7171
],
7272
"static": {
73-
"id": 11,
73+
"id": 2,
7474
"name": "target_ship_1",
7575
"dimensions": {
76-
"length": 178.0,
77-
"width": 30.0,
78-
"height": 30.0,
79-
"a": 89.0,
80-
"b": 89.0,
81-
"c": 15.0,
82-
"d": 15.0
76+
"length": 122.0,
77+
"width": 20.0,
78+
"height": 8.0,
79+
"a": 61.0,
80+
"b": 61.0,
81+
"c": 10.0,
82+
"d": 10.0
8383
},
8484
"shipType": "Passenger"
8585
}

‎data/baseline_situations_generated/traffic_situation_06.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.8.1",
2+
"version": "0.8.2",
33
"title": "HO, HO",
44
"description": "Head-on situations with two target ships.",
55
"ownShip": {
@@ -70,18 +70,18 @@
7070
}
7171
],
7272
"static": {
73-
"id": 11,
73+
"id": 2,
7474
"name": "target_ship_1",
7575
"dimensions": {
76-
"length": 50.0,
77-
"width": 10.0,
78-
"height": 8.0,
79-
"a": 25.0,
80-
"b": 25.0,
81-
"c": 5.0,
82-
"d": 5.0
76+
"length": 178.0,
77+
"width": 30.0,
78+
"height": 30.0,
79+
"a": 89.0,
80+
"b": 89.0,
81+
"c": 15.0,
82+
"d": 15.0
8383
},
84-
"shipType": "Cargo"
84+
"shipType": "Passenger"
8585
}
8686
},
8787
{
@@ -110,16 +110,16 @@
110110
}
111111
],
112112
"static": {
113-
"id": 12,
113+
"id": 3,
114114
"name": "target_ship_2",
115115
"dimensions": {
116-
"length": 178.0,
117-
"width": 30.0,
118-
"height": 30.0,
119-
"a": 89.0,
120-
"b": 89.0,
121-
"c": 15.0,
122-
"d": 15.0
116+
"length": 122.0,
117+
"width": 20.0,
118+
"height": 8.0,
119+
"a": 61.0,
120+
"b": 61.0,
121+
"c": 10.0,
122+
"d": 10.0
123123
},
124124
"shipType": "Passenger"
125125
}

‎data/baseline_situations_generated/traffic_situation_07.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.8.1",
2+
"version": "0.8.2",
33
"title": "HO, CR-GW",
44
"description": "A head-on and crossing give-way situation with two target ships.",
55
"ownShip": {
@@ -70,18 +70,18 @@
7070
}
7171
],
7272
"static": {
73-
"id": 11,
73+
"id": 2,
7474
"name": "target_ship_1",
7575
"dimensions": {
76-
"length": 122.0,
77-
"width": 20.0,
76+
"length": 50.0,
77+
"width": 10.0,
7878
"height": 8.0,
79-
"a": 61.0,
80-
"b": 61.0,
81-
"c": 10.0,
82-
"d": 10.0
79+
"a": 25.0,
80+
"b": 25.0,
81+
"c": 5.0,
82+
"d": 5.0
8383
},
84-
"shipType": "Passenger"
84+
"shipType": "Cargo"
8585
}
8686
},
8787
{
@@ -110,18 +110,18 @@
110110
}
111111
],
112112
"static": {
113-
"id": 12,
113+
"id": 3,
114114
"name": "target_ship_2",
115115
"dimensions": {
116-
"length": 50.0,
117-
"width": 10.0,
118-
"height": 8.0,
119-
"a": 25.0,
120-
"b": 25.0,
121-
"c": 5.0,
122-
"d": 5.0
116+
"length": 178.0,
117+
"width": 30.0,
118+
"height": 30.0,
119+
"a": 89.0,
120+
"b": 89.0,
121+
"c": 15.0,
122+
"d": 15.0
123123
},
124-
"shipType": "Cargo"
124+
"shipType": "Passenger"
125125
}
126126
}
127127
]

‎data/baseline_situations_generated/traffic_situation_08.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.8.1",
2+
"version": "0.8.2",
33
"title": "HO, CR-SO",
44
"description": "A head-on and crossing stand-on situation with two target ships.",
55
"ownShip": {
@@ -47,41 +47,41 @@
4747
{
4848
"initial": {
4949
"position": {
50-
"lon": 10.50456473,
51-
"lat": 58.86680563
50+
"lon": 10.50565339,
51+
"lat": 58.87486732
5252
},
53-
"sog": 15.0,
54-
"cog": 186.67,
55-
"heading": 186.67,
53+
"sog": 16.9,
54+
"cog": 186.38,
55+
"heading": 186.38,
5656
"navStatus": "Under way using engine"
5757
},
5858
"waypoints": [
5959
{
6060
"position": {
61-
"lon": 10.50456473,
62-
"lat": 58.86680563
61+
"lon": 10.50565339,
62+
"lat": 58.87486732
6363
}
6464
},
6565
{
6666
"position": {
67-
"lon": 10.47674734,
68-
"lat": 58.74322116
67+
"lon": 10.47556765,
68+
"lat": 58.73515302
6969
}
7070
}
7171
],
7272
"static": {
73-
"id": 11,
73+
"id": 2,
7474
"name": "target_ship_1",
7575
"dimensions": {
76-
"length": 50.0,
77-
"width": 10.0,
78-
"height": 8.0,
79-
"a": 25.0,
80-
"b": 25.0,
81-
"c": 5.0,
82-
"d": 5.0
76+
"length": 178.0,
77+
"width": 30.0,
78+
"height": 30.0,
79+
"a": 89.0,
80+
"b": 89.0,
81+
"c": 15.0,
82+
"d": 15.0
8383
},
84-
"shipType": "Cargo"
84+
"shipType": "Passenger"
8585
}
8686
},
8787
{
@@ -110,7 +110,7 @@
110110
}
111111
],
112112
"static": {
113-
"id": 12,
113+
"id": 3,
114114
"name": "target_ship_2",
115115
"dimensions": {
116116
"length": 50.0,

‎data/baseline_situations_generated/traffic_situation_09.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.8.1",
2+
"version": "0.8.2",
33
"title": "HO, OT-GW",
44
"description": "A head-on and overtaking give-way situation with two target ships.",
55
"ownShip": {
@@ -70,18 +70,18 @@
7070
}
7171
],
7272
"static": {
73-
"id": 11,
73+
"id": 2,
7474
"name": "target_ship_1",
7575
"dimensions": {
76-
"length": 50.0,
77-
"width": 10.0,
76+
"length": 122.0,
77+
"width": 20.0,
7878
"height": 8.0,
79-
"a": 25.0,
80-
"b": 25.0,
81-
"c": 5.0,
82-
"d": 5.0
79+
"a": 61.0,
80+
"b": 61.0,
81+
"c": 10.0,
82+
"d": 10.0
8383
},
84-
"shipType": "Cargo"
84+
"shipType": "Passenger"
8585
}
8686
},
8787
{
@@ -110,18 +110,18 @@
110110
}
111111
],
112112
"static": {
113-
"id": 12,
113+
"id": 3,
114114
"name": "target_ship_2",
115115
"dimensions": {
116-
"length": 122.0,
117-
"width": 20.0,
116+
"length": 50.0,
117+
"width": 10.0,
118118
"height": 8.0,
119-
"a": 61.0,
120-
"b": 61.0,
121-
"c": 10.0,
122-
"d": 10.0
119+
"a": 25.0,
120+
"b": 25.0,
121+
"c": 5.0,
122+
"d": 5.0
123123
},
124-
"shipType": "Passenger"
124+
"shipType": "Cargo"
125125
}
126126
}
127127
]

0 commit comments

Comments
 (0)