diff --git a/examples/carla/Carla_Challenge/carlaChallenge10.scenic b/examples/carla/Carla_Challenge/carlaChallenge10.scenic index 8a63f5d27..11eb4905b 100644 --- a/examples/carla/Carla_Challenge/carlaChallenge10.scenic +++ b/examples/carla/Carla_Challenge/carlaChallenge10.scenic @@ -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 diff --git a/examples/carla/Carla_Challenge/carlaChallenge4.scenic b/examples/carla/Carla_Challenge/carlaChallenge4.scenic index 69cde2479..61adc7aab 100644 --- a/examples/carla/Carla_Challenge/carlaChallenge4.scenic +++ b/examples/carla/Carla_Challenge/carlaChallenge4.scenic @@ -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 diff --git a/examples/carla/Carla_Challenge/carlaChallenge6.scenic b/examples/carla/Carla_Challenge/carlaChallenge6.scenic index 17affb94e..e3c958eae 100644 --- a/examples/carla/Carla_Challenge/carlaChallenge6.scenic +++ b/examples/carla/Carla_Challenge/carlaChallenge6.scenic @@ -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) \ No newline at end of file diff --git a/examples/carla/Carla_Challenge/carlaChallenge7.scenic b/examples/carla/Carla_Challenge/carlaChallenge7.scenic index 6a959af28..4f361b1c3 100644 --- a/examples/carla/Carla_Challenge/carlaChallenge7.scenic +++ b/examples/carla/Carla_Challenge/carlaChallenge7.scenic @@ -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 diff --git a/examples/carla/Carla_Challenge/carlaChallenge8.scenic b/examples/carla/Carla_Challenge/carlaChallenge8.scenic index 608c45084..3fc69cd62 100644 --- a/examples/carla/Carla_Challenge/carlaChallenge8.scenic +++ b/examples/carla/Carla_Challenge/carlaChallenge8.scenic @@ -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 diff --git a/examples/carla/Carla_Challenge/carlaChallenge9.scenic b/examples/carla/Carla_Challenge/carlaChallenge9.scenic index dbb7e2745..4694c5a92 100644 --- a/examples/carla/Carla_Challenge/carlaChallenge9.scenic +++ b/examples/carla/Carla_Challenge/carlaChallenge9.scenic @@ -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 diff --git a/examples/carla/manual_control/carlaChallenge4.scenic b/examples/carla/manual_control/carlaChallenge4.scenic index 5635ca9ac..42df93ce1 100644 --- a/examples/carla/manual_control/carlaChallenge4.scenic +++ b/examples/carla/manual_control/carlaChallenge4.scenic @@ -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 diff --git a/examples/carla/manual_control/carlaChallenge7.scenic b/examples/carla/manual_control/carlaChallenge7.scenic index c23ddbe12..2c9ca139e 100644 --- a/examples/carla/manual_control/carlaChallenge7.scenic +++ b/examples/carla/manual_control/carlaChallenge7.scenic @@ -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