VAMPIRE: fixed MANY bugs in containment and scope. #40 is good for now

6 files changed, 14 insertions, 4 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
index 796bed43..9ef2b1a0 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
index 830ec7f9..468a5b6f 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
index 395fc452..bed2786b 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
index 855909aa..ddbe05d7 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
@@ -66,15 +66,12 @@ public class FAMTest {
       VampireSolver _vampireSolver = new VampireSolver();

       reasoner = _vampireSolver;

       final HashMap<Class, Integer> classMapMin = new HashMap<Class, Integer>();

-      classMapMin.put(FunctionalArchitectureModel.class, Integer.valueOf(1));

-      classMapMin.put(Function.class, Integer.valueOf(1));

-      classMapMin.put(functionalarchitecture.FunctionalInterface.class, Integer.valueOf(2));

       classMapMin.put(FunctionalOutput.class, Integer.valueOf(3));

       final Map<Type, Integer> typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.getTrace());

       final HashMap<Class, Integer> classMapMax = new HashMap<Class, Integer>();

       classMapMax.put(FunctionalArchitectureModel.class, Integer.valueOf(3));

       classMapMax.put(Function.class, Integer.valueOf(5));

-      classMapMax.put(functionalarchitecture.FunctionalInterface.class, Integer.valueOf(2));

+      classMapMax.put(functionalarchitecture.FunctionalInterface.class, Integer.valueOf(3));

       classMapMax.put(FunctionalOutput.class, Integer.valueOf(4));

       final Map<Type, Integer> typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.getTrace());

       VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java
index 21d2a307..4a971fd6 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java
@@ -1,5 +1,7 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse;

 

+import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.Dir;

+import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.File;

 import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage;

 import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;

 import ca.mcgill.ecse.dslreasoner.vampire.queries.FileSystemPatterns;

@@ -65,8 +67,12 @@ public class FileSystemTest {
       VampireSolver _vampireSolver = new VampireSolver();

       reasoner = _vampireSolver;

       final HashMap<Class, Integer> classMapMin = new HashMap<Class, Integer>();

+      classMapMin.put(Dir.class, Integer.valueOf(10));

+      classMapMin.put(File.class, Integer.valueOf(5));

       final Map<Type, Integer> typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.getTrace());

       final HashMap<Class, Integer> classMapMax = new HashMap<Class, Integer>();

+      classMapMax.put(File.class, Integer.valueOf(15));

+      classMapMax.put(Dir.class, Integer.valueOf(15));

       final Map<Type, Integer> typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.getTrace());

       VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

       final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
index ceae8ed2..f0d7d924 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
@@ -1,6 +1,9 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse;

 

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.CompositeElement;

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition;

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

 import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;

@@ -65,9 +68,13 @@ public class YakinduTest {
       reasoner = _vampireSolver;

       final HashMap<Class, Integer> classMapMin = new HashMap<Class, Integer>();

       classMapMin.put(Region.class, Integer.valueOf(1));

+      classMapMin.put(Transition.class, Integer.valueOf(2));

+      classMapMin.put(CompositeElement.class, Integer.valueOf(3));

       final Map<Type, Integer> typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.getTrace());

       final HashMap<Class, Integer> classMapMax = new HashMap<Class, Integer>();

       classMapMax.put(Region.class, Integer.valueOf(5));

+      classMapMax.put(Transition.class, Integer.valueOf(2));

+      classMapMax.put(Synchronization.class, Integer.valueOf(4));

       final Map<Type, Integer> typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.getTrace());

       VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

       final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {