From 278ad1aa5f8cff85604f98c2a2e7269753cdbd47 Mon Sep 17 00:00:00 2001
From: Aren Babikian <aren.babikian@mail.mcgill.ca>
Date: Thu, 21 Jan 2021 06:47:08 +0100
Subject: Major MM update + Refactor VQL + post-meeting approach change

---
 .../inputs/crossingScenarioGen.vsconfig             | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig')

diff --git a/Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig b/Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig
index a5c862e4..1db557a9 100644
--- a/Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig
+++ b/Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig
@@ -4,25 +4,26 @@ import viatra	"queries/crossingScenarioQueries.vql"
 generate {
 	metamodel = { package crossingScenario }
 	constraints = { package queries}
-	partial-model = { "inputs/crossingScenarioInit.xmi"}
+	//partial-model = { "inputs/crossingScenarioInit.xmi"}
+	partial-model = { "inputs/cSinit4x4.xmi"}
 	solver = ViatraSolver
 	scope = {
-		#node = 2..*
-		//,
-		//#<Lane> = 25..*
+		#node += 2..*
+		,#<Lane> += 0
 		//,#<Actor> = 25..*
-		//,#<CollisionExists> = 1..10
-		//,#<SeparationDistance> = 1..10
-		//,#<VisionBlocked> = 1..10		
-		//,#<Relation> = 1..10
-		}
+		,#<Relation> += 0
+		//,#<CollisionExists> = 1
+		//,#<SeparationDistance> = 0
+		//,#<VisionBlocked> += 0	
+		//,#<CollisionDoesNotExist> += 0	
+	}
 	
 	config = {
 		runtime = 10000,
 		log-level = none,
 		"numeric-solver" = "dreal-local",
 		"dreal-local-path" = "/home/models/dreal4/bazel-bin/dreal/dreal",
-		"scopePropagator" = "typeHierarchy"}
+		"scopePropagator" = "polyhedral"}
 	
 	runs = 1
 	number = 10
-- 
cgit v1.2.3-70-g09d2