diff options
author | Aren Babikian <aren.babikian@mail.mcgill.ca> | 2021-01-27 16:34:56 +0100 |
---|---|---|
committer | Aren Babikian <aren.babikian@mail.mcgill.ca> | 2021-01-27 16:34:56 +0100 |
commit | 6cca80c2f350550ac62828eb0ff5f9327ad44474 (patch) | |
tree | 82ad110c97bc438c4ccbea8602047f027bf2fbd4 /Domains/crossingScenario/queries | |
parent | Improve crossingScenario queries + small ease-of-use adjustments (diff) | |
download | VIATRA-Generator-6cca80c2f350550ac62828eb0ff5f9327ad44474.tar.gz VIATRA-Generator-6cca80c2f350550ac62828eb0ff5f9327ad44474.tar.zst VIATRA-Generator-6cca80c2f350550ac62828eb0ff5f9327ad44474.zip |
make generated plane smaller, easier to understand
Diffstat (limited to 'Domains/crossingScenario/queries')
-rw-r--r-- | Domains/crossingScenario/queries/crossingScenarioQueries.vql | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Domains/crossingScenario/queries/crossingScenarioQueries.vql b/Domains/crossingScenario/queries/crossingScenarioQueries.vql index 8eabfd05..32348399 100644 --- a/Domains/crossingScenario/queries/crossingScenarioQueries.vql +++ b/Domains/crossingScenario/queries/crossingScenarioQueries.vql | |||
@@ -22,8 +22,8 @@ pattern define_placedOn_actorOnVerticalLane(a : Actor, vl:Lane_Vertical) { | |||
22 | // Lane.numWidth(vl, w); | 22 | // Lane.numWidth(vl, w); |
23 | // check(x >= (r + w)); | 23 | // check(x >= (r + w)); |
24 | 24 | ||
25 | //<<<<NEW>>>>: lanes all have width=5 | 25 | //<<<<NEW>>>>: lanes all have width=3 |
26 | check(x >= (r + 5.0)); | 26 | check(x >= (r + 3.0)); |
27 | } | 27 | } |
28 | 28 | ||
29 | @Constraint(severity = "error", key = {a}, message = "this defines the placedOn relation for vertical lanes") | 29 | @Constraint(severity = "error", key = {a}, message = "this defines the placedOn relation for vertical lanes") |
@@ -40,8 +40,8 @@ pattern define_placedOn_actorOnHorizLane(a : Actor, hl:Lane_Horizontal) { | |||
40 | // Lane.numWidth(hl, w); | 40 | // Lane.numWidth(hl, w); |
41 | // check(y >= (r + w)); | 41 | // check(y >= (r + w)); |
42 | 42 | ||
43 | //<<NEW>> | 43 | //<<NEW>>: lanes all have width=3 |
44 | check(y >= (r + 5.0)); | 44 | check(y >= (r + 3.0)); |
45 | 45 | ||
46 | } | 46 | } |
47 | 47 | ||
@@ -197,7 +197,7 @@ pattern define_actor_vehicleWidth(v:Vehicle) { | |||
197 | Vehicle.placedOn(v, lane); | 197 | Vehicle.placedOn(v, lane); |
198 | Lane_Vertical(lane); | 198 | Lane_Vertical(lane); |
199 | Vehicle.width(v, w); | 199 | Vehicle.width(v, w); |
200 | check(w != 1.0); | 200 | check(w != 2.0); |
201 | } or { | 201 | } or { |
202 | Vehicle.placedOn(v, lane); | 202 | Vehicle.placedOn(v, lane); |
203 | Lane_Horizontal(lane); | 203 | Lane_Horizontal(lane); |
@@ -216,7 +216,7 @@ pattern define_actor_vehicleLength(v:Vehicle) { | |||
216 | Vehicle.placedOn(v, lane); | 216 | Vehicle.placedOn(v, lane); |
217 | Lane_Horizontal(lane); | 217 | Lane_Horizontal(lane); |
218 | Vehicle.length(v, l); | 218 | Vehicle.length(v, l); |
219 | check(l != 1.0); | 219 | check(l != 2.0); |
220 | } | 220 | } |
221 | 221 | ||
222 | ///////---------------- | 222 | ///////---------------- |