Skip to content

Commit 6b72ef9

Browse files
lola831lola831
committed
Auto-generate sumo_map, update driving examples, and remove MetaDrive examples
1 parent 6bdabe6 commit 6b72ef9

20 files changed

Lines changed: 62 additions & 150 deletions

‎examples/driving/Carla_Challenge/carlaChallenge2.scenic‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Leading vehicle decelerates suddently due to an obstacle and
44
ego-vehicle must react, performing an emergency brake or an avoidance maneuver.
55
Note: The scenario may fail if the leadCar or the ego get past the intersection while following the roadDirection
66
7+
To run this file using the MetaDrive simulator:
8+
scenic examples/driving/Carla_Challenge/carlaChallenge3.scenic --2d --model scenic.simulators.metadrive.model --simulate
9+
710
To run this file using the Carla simulator:
811
scenic examples/driving/Carla_Challenge/carlaChallenge2.scenic --2d --model scenic.simulators.carla.model --simulate
912
"""

‎examples/driving/Carla_Challenge/carlaChallenge3.scenic‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
""" Scenario Description
22
Based on 2019 Carla Challenge Traffic Scenario 03.
3-
Leading vehicle decelerates suddenly due to an obstacle and
3+
Leading vehicle decelerates suddenly due to an obstacle and
44
ego-vehicle must react, performing an emergency brake or an avoidance maneuver.
55
6+
To run this file using the MetaDrive simulator:
7+
scenic examples/driving/Carla_Challenge/carlaChallenge3.scenic --2d --model scenic.simulators.metadrive.model --simulate
8+
69
To run this file using the Carla simulator:
710
scenic examples/driving/Carla_Challenge/carlaChallenge3.scenic --2d --model scenic.simulators.carla.model --simulate
811
"""

‎examples/driving/OAS_Scenarios/oas_scenario_03.scenic‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Voyage OAS Scenario Unique ID: 2-2-XX-CF-STR-CAR
33
The ego vehicle follows the lead car
44
5+
To run this file using the MetaDrive simulator:
6+
scenic examples/driving/Carla_Challenge/carlaChallenge3.scenic --2d --model scenic.simulators.metadrive.model --simulate
7+
58
To run this file using the Carla simulator:
69
scenic examples/driving/OAS_Scenarios/oas_scenario_03.scenic --2d --model scenic.simulators.carla.model --simulate
710
"""

‎examples/driving/OAS_Scenarios/oas_scenario_04.scenic‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Voyage OAS Scenario Unique ID: 2-2-XX-CF-STR-CAR:01
33
The ego vehicle follows the lead car which suddenly stops
44
5+
To run this file using the MetaDrive simulator:
6+
scenic examples/driving/Carla_Challenge/carlaChallenge3.scenic --2d --model scenic.simulators.metadrive.model --simulate
7+
58
To run this file using the Carla simulator:
69
scenic examples/driving/OAS_Scenarios/oas_scenario_04.scenic --2d --model scenic.simulators.carla.model --simulate
710
"""
@@ -43,4 +46,4 @@ other = new Car on select_lane.centerline,
4346
with behavior LeadCarBehavior()
4447

4548
ego = new Car following roadDirection from other for INITIAL_DISTANCE_APART,
46-
with behavior FollowLeadCarBehavior()
49+
with behavior FollowLeadCarBehavior()

‎examples/driving/OAS_Scenarios/oas_scenario_28.scenic‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
""" Scenario Description
22
Voyage OAS Scenario Unique ID: 3-2-ESW-I-STR-CAR:S>W:02
3-
At three-way intersection. The ego vehicle goes straight.
4-
The other car, on the other leg of the intersection, takes a left turn first
3+
At three-way intersection. The ego vehicle goes straight.
4+
The other car, on the other leg of the intersection, takes a left turn first
55
because it is closer to the intersection.
66
7+
To run this file using the MetaDrive simulator:
8+
scenic examples/driving/Carla_Challenge/carlaChallenge3.scenic --2d --model scenic.simulators.metadrive.model --simulate
9+
710
To run this file using the Carla simulator:
811
scenic examples/driving/OAS_Scenarios/oas_scenario_28.scenic --2d --model scenic.simulators.carla.model --simulate
912
"""

‎examples/driving/OAS_Scenarios/oas_scenario_29.scenic‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
""" Scenario Description
22
Voyage OAS Scenario Unique ID: 3-2-NSW-I-L-CAR:S>W:02
3-
At 3 way intersection. The ego car turns left.
4-
The other car, on a different leg of the intersection,
3+
At 3 way intersection. The ego car turns left.
4+
The other car, on a different leg of the intersection,
55
has the right of the way and makes a left turn first because it is closer to the intersection.
66
7+
To run this file using the MetaDrive simulator:
8+
scenic examples/driving/Carla_Challenge/carlaChallenge3.scenic --2d --model scenic.simulators.metadrive.model --simulate
9+
710
To run this file using the Carla simulator:
811
scenic examples/driving/OAS_Scenarios/oas_scenario_29.scenic --2d --model scenic.simulators.carla.model --simulate
912
"""

‎examples/driving/OAS_Scenarios/oas_scenario_30.scenic‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
""" Scenario Description
22
Voyage OAS Scenario Unique ID: 3-2-NWS-I-L-CAR:S>W:01
3-
At 3 way intersection. The ego car turns left.
3+
At 3 way intersection. The ego car turns left.
44
The other car approaches from a different leg of the intersection to make a left turn, but
55
ego has the right of the way because it is closer to the intersection.
66
7+
To run this file using the MetaDrive simulator:
8+
scenic examples/driving/Carla_Challenge/carlaChallenge3.scenic --2d --model scenic.simulators.metadrive.model --simulate
9+
710
To run this file using the Carla simulator:
811
scenic examples/driving/OAS_Scenarios/oas_scenario_30.scenic --2d --model scenic.simulators.carla.model --simulate
912
"""
@@ -58,4 +61,3 @@ ego = new Car following roadDirection from egoStart for EGO_OFFSET,
5861
other = new Car following roadDirection from actorStart for OTHERCAR_OFFSET,
5962
with behavior SafeBehavior(target_speed=SPEED, trajectory=actor_centerlines, \
6063
thresholdDistance = SAFE_DIST)
61-

‎examples/driving/OAS_Scenarios/oas_scenario_32.scenic‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ Voyage OAS Scenario Unique ID: 3-2-W-I-L-CAR:N>S
33
At 3-way intersection, ego turns left and the other car on a different leg of the
44
intersection goes straight. There is no requirement on which vehicle has the right of the way.
55
6+
To run this file using the MetaDrive simulator:
7+
scenic examples/driving/Carla_Challenge/carlaChallenge3.scenic --2d --model scenic.simulators.metadrive.model --simulate
8+
69
To run this file using the Carla simulator:
710
scenic examples/driving/OAS_Scenarios/oas_scenario_32.scenic --2d --model scenic.simulators.carla.model --simulate
811
"""
@@ -53,4 +56,3 @@ ego = new Car on ego_L_startLane.centerline,
5356

5457
other = new Car on startLane.centerline,
5558
with behavior FollowTrafficBehavior(target_speed=10, trajectory=centerlines)
56-

‎examples/driving/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ For example:
66

77
```
88
scenic --2d badlyParkedCarPullingIn.scenic
9-
scenic --2d -S --model scenic.simulators.newtonian.driving_model badlyParkedCarPullingIn.scenic
9+
scenic --2d -S --model scenic.simulators.metadrive.model badlyParkedCarPullingIn.scenic
1010
```

‎examples/driving/badlyParkedCarPullingIn.scenic‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
'''
2+
To run this file using the MetaDrive simulator:
3+
scenic examples/driving/Carla_Challenge/carlaChallenge3.scenic --2d --model scenic.simulators.metadrive.model --simulate
4+
25
To run this file using the Carla simulator:
36
scenic examples/driving/badlyParkedCarPullingIn.scenic --2d --model scenic.simulators.carla.model --simulate
47
'''

0 commit comments

Comments
 (0)