Simple working version. Still diversity issue

2 files changed, 23 insertions, 4 deletions

diff --git a/Domains/crossingScenario/inputs/cSinit4x4.xmi b/Domains/crossingScenario/inputs/cSinit4x4.xmi
index 24c29774..d0dc5705 100644
--- a/Domains/crossingScenario/inputs/cSinit4x4.xmi
+++ b/Domains/crossingScenario/inputs/cSinit4x4.xmi
@@ -10,6 +10,8 @@
     maxTime="60.0"

     maxXSpeed="100.0"

     maxYSpeed="100.0">

+  <actors xsi:type="crossingScenario:Pedestrian"/>

+  <actors xsi:type="crossingScenario:Vehicle"/>

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

   <lanes xsi:type="crossingScenario:Lane_Horizontal"

       referenceCoord="5.0"/>

@@ -25,8 +27,12 @@
   <lanes xsi:type="crossingScenario:Lane_Vertical"

       referenceCoord="15.0"/>

   <relations

-      xsi:type="crossingScenario:VisionBlocked"/>

-  <relations

       xsi:type="crossingScenario:CollisionExists"

+      target="//@actors.0"

+      source="//@actors.1"

       collisionTime="-1.0"/>

+  <relations

+      xsi:type="crossingScenario:VisionBlocked"

+      target="//@actors.0"

+      source="//@actors.1"/>

 </crossingScenario:CrossingScenario>

diff --git a/Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig b/Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig
index 1d47952d..7d329d18 100644
--- a/Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig
+++ b/Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig
@@ -8,7 +8,7 @@ generate {
         partial-model = { "inputs/cSinit4x4.xmi"}

         solver = ViatraSolver

         scope = {

-                #node += 2..*

+                #node += 0..*

                 ,#<Lane> += 0

                 //,#<Actor> = 25..*

                 ,#<Relation> += 0

@@ -23,7 +23,20 @@ generate {
                 log-level = none,

                 "numeric-solver" = "dreal-local",

                 "dreal-local-path" = "/home/models/dreal4/bazel-bin/dreal/dreal",

-                "ignored-attributes" = "CollisionExists.collisionTime=*",

+                "ignored-attributes" = "

+                        Pedestrian.xPos=*, 

+                        Pedestrian.yPos=*, 

+                        Pedestrian.length=*,

+                        Pedestrian.width=*, 

+                        Pedestrian.xSpeed=*, 

+                        Pedestrian.ySpeed=*, 

+                        Vehicle.xPos=*, 

+                        Vehicle.yPos=*, 

+                        Vehicle.length=*,

+                        Vehicle.width=*, 

+                        Vehicle.xSpeed=*, 

+                        Vehicle.ySpeed=*, 

+                        CollisionExists.collisionTime=*",

                 "scopePropagator" = "polyhedral"}

         

         runs = 1