Skip to content

Commit

Permalink
removed Range used in a non-standard way
Browse files Browse the repository at this point in the history
  • Loading branch information
joel-mb committed Dec 21, 2020
1 parent 2b99edb commit e3f319b
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions examples/carla/Carla_Challenge/carlaChallenge10.scenic
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ ego = Car at ego_spawn_pt,
adversary = Car at adv_spawn_pt,
with behavior AdversaryBehavior(adv_trajectory)

require (distance to intersec) in Range(20, 25)
require (distance from adversary to intersec) in Range(15, 20)
require 20 <= (distance to intersec) <= 25
require 15 <= (distance from adversary to intersec) <= 20
terminate when (distance to ego_spawn_pt) > 70
4 changes: 2 additions & 2 deletions examples/carla/Carla_Challenge/carlaChallenge4.scenic
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ bicycle = Bicycle at spotBicycle offset by 3.5@0,
with behavior BicycleBehavior(BICYCLE_MIN_SPEED, THRESHOLD),
with regionContainedIn None

require (distance to intersec) in Range(10, 15)
require (distance from bicycle to intersec) in Range(10, 15)
require 10 <= (distance to intersec) <= 15
require 10 <= (distance from bicycle to intersec) <= 15
terminate when (distance to spot) > 50
2 changes: 1 addition & 1 deletion examples/carla/Carla_Challenge/carlaChallenge6.scenic
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ blockingCar = Car following roadDirection for BLOCKING_CAR_DIST,

## EXPLICIT HARD CONSTRAINTS
require blockingCar can see oncomingCar
require (distance from blockingCar to oncomingCar) in Range(5, 15)
require 5 <= (distance from blockingCar to oncomingCar) <= 15
require (distance from blockingCar to intersection) > 50
require (ego.laneSection.isForward != oncomingCar.laneSection.isForward)
4 changes: 2 additions & 2 deletions examples/carla/Carla_Challenge/carlaChallenge7.scenic
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@ ego = Car at ego_spawn_pt,
adversary = Car at adv_spawn_pt,
with behavior AdversaryBehavior(adv_trajectory)

require (distance to intersec) in Range(15, 20)
require (distance from adversary to intersec) in Range(10, 15)
require 15 <= (distance to intersec) <= 20
require 10 <= (distance from adversary to intersec) <= 15
terminate when (distance to ego_spawn_pt) > 70
4 changes: 2 additions & 2 deletions examples/carla/Carla_Challenge/carlaChallenge8.scenic
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@ adversary = Car at adv_spawn_pt,
with behavior AdversaryBehavior(adv_trajectory)

require (ego_start_section.laneToLeft == adv_end_section) # make sure the ego and adversary are spawned in opposite lanes
require (distance to intersec) in Range(25, 30)
require (distance from adversary to intersec) in Range(15, 20)
require 25 <= (distance to intersec) <= 30
require 15 <= (distance from adversary to intersec) <= 20
terminate when (distance to ego_spawn_pt) > 70
4 changes: 2 additions & 2 deletions examples/carla/Carla_Challenge/carlaChallenge9.scenic
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ adversary = Car at adv_spawn_pt,
with behavior AdversaryBehavior(adv_trajectory)

require (ego_maneuver.endLane == adv_maneuver.endLane)
require (distance to intersec) in Range(30, 35)
require (distance from adversary to intersec) in Range(10, 15)
require 30 <= (distance to intersec) <= 35
require 10 <= (distance from adversary to intersec) <= 15
terminate when (distance to ego_spawn_pt) > 70
4 changes: 2 additions & 2 deletions examples/carla/manual_control/carlaChallenge4.scenic
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ bicycle = Bicycle at spotBicycle offset by 3.5@0,
with behavior BicycleBehavior(BICYCLE_MIN_SPEED, THRESHOLD),
with regionContainedIn None

require (distance to intersec) in Range(10,25)
require (distance from bicycle to intersec) in Range(5, 10)
require 10 <= (distance to intersec) <= 25
require 5 <= (distance from bicycle to intersec) <= 10
terminate when (distance to spot) > 50
4 changes: 2 additions & 2 deletions examples/carla/manual_control/carlaChallenge7.scenic
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@ ego = Car at ego_spawn_pt,
adversary = Car at adv_spawn_pt,
with behavior AdversaryBehavior(adv_trajectory)

require (distance to intersec) in Range(15, 20)
require (distance from adversary to intersec) in Range(10, 15)
require 15 <= (distance to intersec) <= 20
require 10 <= (distance from adversary to intersec) <= 15
terminate when (distance to ego_spawn_pt) > 70

0 comments on commit e3f319b

Please sign in to comment.