Skip to content

Commit 85109e7

Browse files
authored
Updated metric examples and updated to 0.9.13
1 parent 729bd29 commit 85109e7

File tree

9 files changed

+42
-28
lines changed

9 files changed

+42
-28
lines changed

CARLA_VER

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
HOST = https://carla-releases.s3.eu-west-3.amazonaws.com/Linux
2-
RELEASE=CARLA_0.9.12
2+
RELEASE=CARLA_0.9.13

Docs/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## Table of Contents
22
* [Latest Changes](#latest-changes)
3+
* [CARLA ScenarioRunner 0.9.13](#carla-scenariorunner-0913)
34
* [CARLA ScenarioRunner 0.9.12](#carla-scenariorunner-0912)
45
* [CARLA ScenarioRunner 0.9.11](#carla-scenariorunner-0911)
56
* [CARLA ScenarioRunner 0.9.10](#carla-scenariorunner-0910)
@@ -12,13 +13,16 @@
1213
* [CARLA ScenarioRunner 0.9.2](#carla-scenariorunner-092)
1314

1415
## Latest changes
16+
17+
18+
## CARLA ScenarioRunner 0.9.13
1519
### :rocket: New Features
1620
* OpenSCENARIO support:
1721
- Added support for `ParameterAction`
1822
- Extended `ParameterCondition` support to use as an event trigger condition
1923

2024
### :bug: Bug Fixes
21-
* Fixed metrics parsing
25+
* Fixed metrics parsing and remade the example recordings
2226
* Fixed a bug with repetitions / scenario groups causing the simulation to crash after the second one.
2327
* Fixed use of OSC Parameters as entry names for catalogs
2428

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ branch contains the latest fixes and features, and may be required to use the la
2121

2222
It is important to also consider the release version that has to match the CARLA version.
2323

24+
* [Version 0.9.13](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.13) and the 0.9.13 Branch: Compatible with [CARLA 0.9.13](https://github.com/carla-simulator/carla/releases/tag/0.9.13)
2425
* [Version 0.9.12](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.12) and the 0.9.12 Branch: Compatible with [CARLA 0.9.12](https://github.com/carla-simulator/carla/releases/tag/0.9.12)
2526
* [Version 0.9.11](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.11) and the 0.9.11 Branch: Compatible with [CARLA 0.9.11](https://github.com/carla-simulator/carla/releases/tag/0.9.11)
2627
* [Version 0.9.10](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.10) and the 0.9.10 Branch: Compatible with [CARLA 0.9.10](https://github.com/carla-simulator/carla/releases/tag/0.9.10)

scenario_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
from srunner.tools.route_parser import RouteParser
4242

4343
# Version of scenario_runner
44-
VERSION = '0.9.12'
44+
VERSION = '0.9.13'
4545

4646

4747
class ScenarioRunner(object):
13.1 MB
Binary file not shown.

srunner/metrics/data/CriteriaFilter_criteria.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"actual_value": 100,
1111
"optional": false,
1212
"_wsize": 2,
13-
"_current_index": 759,
13+
"_current_index": 754,
1414
"_route_length": 762,
1515
"_accum_meters": [
1616
0.0,
@@ -787,14 +787,14 @@
787787
"test_status": "FAILURE",
788788
"expected_value_success": 0,
789789
"expected_value_acceptable": null,
790-
"actual_value": 5,
790+
"actual_value": 11,
791791
"optional": false,
792792
"_collision_sensor": null,
793793
"other_actor": null,
794794
"other_actor_type": null,
795795
"registered_collisions": [],
796-
"last_id": null,
797-
"collision_time": 70.1000010445714,
796+
"last_id": 437,
797+
"collision_time": 97.15000144764781,
798798
"terminate_on_failure": false
799799
},
800800
"InRouteTest": {
@@ -811,7 +811,7 @@
811811
"_offroad_max": 30,
812812
"_offroad_min": 15.0,
813813
"_route_length": 762,
814-
"_current_index": 760,
814+
"_current_index": 754,
815815
"_out_route_distance": 0,
816816
"_in_safe_route": true,
817817
"_accum_meters": [
@@ -1588,15 +1588,15 @@
15881588
"test_status": "FAILURE",
15891589
"expected_value_success": 0,
15901590
"expected_value_acceptable": null,
1591-
"actual_value": 35.22,
1591+
"actual_value": 20.91,
15921592
"optional": false,
1593-
"_current_index": 760,
1593+
"_current_index": 754,
15941594
"_route_length": 762,
1595-
"_outside_lane_active": true,
1596-
"_wrong_lane_active": true,
1595+
"_outside_lane_active": false,
1596+
"_wrong_lane_active": false,
15971597
"_last_road_id": 15,
1598-
"_last_lane_id": -1,
1599-
"_total_distance": 759.2815870046616,
1598+
"_last_lane_id": 1,
1599+
"_total_distance": 753.2815870046616,
16001600
"_wrong_distance": 0,
16011601
"terminate_on_failure": false
16021602
},
@@ -1608,9 +1608,9 @@
16081608
"test_status": "FAILURE",
16091609
"expected_value_success": 0,
16101610
"expected_value_acceptable": null,
1611-
"actual_value": 3,
1611+
"actual_value": 1,
16121612
"optional": false,
1613-
"_last_red_light_id": 288,
1613+
"_last_red_light_id": 211,
16141614
"debug": false,
16151615
"terminate_on_failure": false
16161616
},
@@ -1644,7 +1644,7 @@
16441644
"list_traffic_events": [],
16451645
"_speed_threshold": 0.1,
16461646
"_below_threshold_max_time": 90.0,
1647-
"_time_last_valid_state": 70.80000105500221,
1647+
"_time_last_valid_state": 101.05000150576234,
16481648
"terminate_on_failure": false
16491649
}
16501650
}
2.39 MB
Binary file not shown.
1.36 MB
Binary file not shown.

srunner/metrics/tools/metrics_parser.py

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -128,18 +128,27 @@ def parse_scene_lights(info):
128128
return scene_light
129129

130130
def parse_bounding_box(info):
131-
"""Parses a list into a carla.BoundingBox"""
132-
location = carla.Location(
133-
x=float(info[3][1:-1])/100,
134-
y=float(info[4][:-1])/100,
135-
z=float(info[5][:-1])/100,
136-
)
131+
"""
132+
Parses a list into a carla.BoundingBox.
133+
Some actors like sensors might have 'nan' location and 'inf' extent, so filter those.
134+
"""
135+
if 'nan' in info[3]:
136+
location = carla.Location()
137+
else:
138+
location = carla.Location(
139+
float(info[3][1:-1])/100,
140+
float(info[4][:-1])/100,
141+
float(info[5][:-1])/100,
142+
)
137143

138-
extent = carla.Vector3D(
139-
x=float(info[7][1:-1])/100,
140-
y=float(info[8][:-1])/100,
141-
z=float(info[9][:-1])/100,
142-
)
144+
if 'inf' in info[7]:
145+
extent = carla.Vector3D()
146+
else:
147+
extent = carla.Vector3D(
148+
float(info[7][1:-1])/100,
149+
float(info[8][:-1])/100,
150+
float(info[9][:-1])/100,
151+
)
143152

144153
bbox = carla.BoundingBox(location, extent)
145154

0 commit comments

Comments
 (0)