make generated plane smaller, easier to understand

3 files changed, 16 insertions, 15 deletions

diff --git a/Domains/crossingScenario/inputs/cSinit4x4.xmi b/Domains/crossingScenario/inputs/cSinit4x4.xmi
index d0dc5705..08cde1e8 100644
--- a/Domains/crossingScenario/inputs/cSinit4x4.xmi
+++ b/Domains/crossingScenario/inputs/cSinit4x4.xmi
@@ -5,8 +5,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

     xmlns:crossingScenario="http://www.example.com/crossingScenario"

     xsi:schemaLocation="http://www.example.com/crossingScenario ../model/crossingScenario.ecore"

-    xSize="100.0"

-    ySize="100.0"

+    xSize="30.0"

+    ySize="30.0"

     maxTime="60.0"

     maxXSpeed="100.0"

     maxYSpeed="100.0">

@@ -14,18 +14,18 @@
   <actors xsi:type="crossingScenario:Vehicle"/>

   <lanes xsi:type="crossingScenario:Lane_Horizontal"/>

   <lanes xsi:type="crossingScenario:Lane_Horizontal"

-      referenceCoord="5.0"/>

+      referenceCoord="3.0"/>

   <lanes xsi:type="crossingScenario:Lane_Horizontal"

-      referenceCoord="10.0"/>

+      referenceCoord="6.0"/>

   <lanes xsi:type="crossingScenario:Lane_Horizontal"

-      referenceCoord="15.0"/>

+      referenceCoord="9.0"/>

   <lanes xsi:type="crossingScenario:Lane_Vertical"/>

   <lanes xsi:type="crossingScenario:Lane_Vertical"

-      referenceCoord="5.0"/>

+      referenceCoord="3.0"/>

   <lanes xsi:type="crossingScenario:Lane_Vertical"

-      referenceCoord="10.0"/>

+      referenceCoord="6.0"/>

   <lanes xsi:type="crossingScenario:Lane_Vertical"

-      referenceCoord="15.0"/>

+      referenceCoord="9.0"/>

   <relations

       xsi:type="crossingScenario:CollisionExists"

       target="//@actors.0"

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) {
 //    Lane.numWidth(vl, w);

 //    check(x >= (r + w));

     

-    //<<<<NEW>>>>: lanes all have width=5

-    check(x >= (r + 5.0));

+    //<<<<NEW>>>>: lanes all have width=3

+    check(x >= (r + 3.0));

 }

 

 @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) {
 //    Lane.numWidth(hl, w);

 //    check(y >= (r + w));

     

-    //<<NEW>>

-    check(y >= (r + 5.0));

+    //<<NEW>>: lanes all have width=3

+    check(y >= (r + 3.0));

     

 }

 

@@ -197,7 +197,7 @@ pattern define_actor_vehicleWidth(v:Vehicle) {
         Vehicle.placedOn(v, lane);

         Lane_Vertical(lane);

     Vehicle.width(v, w);

-    check(w != 1.0);

+    check(w != 2.0);

 } or {

         Vehicle.placedOn(v, lane);

         Lane_Horizontal(lane);

@@ -216,7 +216,7 @@ pattern define_actor_vehicleLength(v:Vehicle) {
         Vehicle.placedOn(v, lane);

         Lane_Horizontal(lane);

     Vehicle.length(v, l);

-    check(l != 1.0);

+    check(l != 2.0);

 }

 

 ///////----------------

diff --git a/Domains/crossingScenario/src/crossingScenario/run/DrawScenario.java b/Domains/crossingScenario/src/crossingScenario/run/DrawScenario.java
index daf294f4..cce2b3f2 100644
--- a/Domains/crossingScenario/src/crossingScenario/run/DrawScenario.java
+++ b/Domains/crossingScenario/src/crossingScenario/run/DrawScenario.java
@@ -28,6 +28,7 @@ import crossingScenario.Relation;
 import crossingScenario.VisionBlocked;
 
 public class DrawScenario {
+        final static int WIDTH = 3;
         public static final int SIZE = 1000;
         
         public static void main(String[] args) throws IOException {
@@ -77,7 +78,7 @@ public class DrawScenario {
                 g.drawLine(-xSize/2, 0, xSize/2, 0);
                 g.drawLine(0, -ySize/2, 0, ySize/2);
                 for (Lane l : cs.getLanes()) {
-                        int ref = (int) ((l.getReferenceCoord() +5)* multiplier);
+                        int ref = (int) ((l.getReferenceCoord() +WIDTH)* multiplier);
                         if (l instanceof Lane_Horizontal) {
                                 g.drawLine(-xSize/2, ref, xSize/2, ref);
                         }