Minor adjsutments to CrossScen ad FamTree local case studies

2 files changed, 7 insertions, 5 deletions

diff --git a/Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig b/Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig
index 8ce9f6ee..db00ed7b 100644
--- a/Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig
+++ b/Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig
@@ -21,7 +21,8 @@ generate {
                 runtime = 10000,

                 log-level = none,

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

-                "dreal-local-path" = "../../Solvers/dreal4/bazel-bin/dreal/dreal",

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

+                "strategy" = "crossingScenario",

                 "ignored-attributes" = "

                         Pedestrian.xPos=*, 

                         Pedestrian.yPos=*, 

@@ -35,11 +36,12 @@ generate {
                         Vehicle.width=*, 

                         Vehicle.xSpeed=*, 

                         Vehicle.ySpeed=*, 

-                        CollisionExists.collisionTime=*",

-                "scopePropagator" = "polyhedral"}

+                        CollisionExists.collisionTime=*"

+                        //,"scopePropagator" = "polyhedral"

+                        }

         

         runs = 1

-        number = 3

+        number = 1

         debug =                 "outputs/debug"

         log =                   "outputs/debug/log.txt"

         output =                "outputs/models"        

diff --git a/Domains/crossingScenario/inputs/csGenScale.vsconfig b/Domains/crossingScenario/inputs/csGenScale.vsconfig
index d770986b..9ff2a10c 100644
--- a/Domains/crossingScenario/inputs/csGenScale.vsconfig
+++ b/Domains/crossingScenario/inputs/csGenScale.vsconfig
@@ -7,7 +7,7 @@ generate {
         partial-model = { "inputs/csInitScale.xmi"}

         solver = ViatraSolver

         scope = {

-                #node += 15..*

+                #node += 3..*

                 ,#<Lane> += 0

                 ,#<Relation> += 0

                 //,#<CollisionExists> = 1