diff options
Diffstat (limited to 'Domains/crossingScenario/queries')
-rw-r--r-- | Domains/crossingScenario/queries/crossingScenarioQueries.vql | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Domains/crossingScenario/queries/crossingScenarioQueries.vql b/Domains/crossingScenario/queries/crossingScenarioQueries.vql index 0a28d774..5f35cd2b 100644 --- a/Domains/crossingScenario/queries/crossingScenarioQueries.vql +++ b/Domains/crossingScenario/queries/crossingScenarioQueries.vql | |||
@@ -94,6 +94,7 @@ pattern define_actor_minYp(cs:CrossingScenario, a:Actor) { | |||
94 | ////////////ADDED | 94 | ////////////ADDED |
95 | //to reduce overlap | 95 | //to reduce overlap |
96 | //NEEDED | 96 | //NEEDED |
97 | /* | ||
97 | @Constraint(severity="error", key={a}, message="5 Actor") | 98 | @Constraint(severity="error", key={a}, message="5 Actor") |
98 | pattern define_actor_wrtLane(a:Actor) { | 99 | pattern define_actor_wrtLane(a:Actor) { |
99 | Actor.placedOn(a, lane); | 100 | Actor.placedOn(a, lane); |
@@ -106,6 +107,7 @@ pattern define_actor_wrtLane(a:Actor) { | |||
106 | Actor.xPos(a, xP); | 107 | Actor.xPos(a, xP); |
107 | check(xP > 0.0-1.0); | 108 | check(xP > 0.0-1.0); |
108 | } | 109 | } |
110 | */ | ||
109 | ////////////ADDED | 111 | ////////////ADDED |
110 | 112 | ||
111 | //Minimum Distances | 113 | //Minimum Distances |
@@ -437,6 +439,7 @@ pattern visionBlocked_qualAbstr(a1:Actor, a2:Actor) { | |||
437 | Actor.placedOn(a2, l); | 439 | Actor.placedOn(a2, l); |
438 | } | 440 | } |
439 | */ | 441 | */ |
442 | /* | ||
440 | @Constraint(severity="error", key={a1, a2}, message="on lanes with different orientation") | 443 | @Constraint(severity="error", key={a1, a2}, message="on lanes with different orientation") |
441 | pattern visionBlocked_qualAbstr2(a1:Actor, a2:Actor) { | 444 | pattern visionBlocked_qualAbstr2(a1:Actor, a2:Actor) { |
442 | VisionBlocked.source(ce, a1); | 445 | VisionBlocked.source(ce, a1); |
@@ -453,6 +456,7 @@ pattern visionBlocked_qualAbstr2(a1:Actor, a2:Actor) { | |||
453 | Actor.placedOn(a2, hl2); | 456 | Actor.placedOn(a2, hl2); |
454 | Lane_Horizontal(hl2); | 457 | Lane_Horizontal(hl2); |
455 | } | 458 | } |
459 | */ | ||
456 | 460 | ||
457 | ////////////ADDED | 461 | ////////////ADDED |
458 | //to make decision for ITE | 462 | //to make decision for ITE |