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

9 files changed, 34 insertions, 20 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
index ccf36550..3c24abf9 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
@@ -47,7 +47,7 @@ class FAMTest {
 

                 val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration())

                 var problem = modelGenerationProblem.output

-//              problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output

+                problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output

 //              problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output

                 workspace.writeModel(problem, "Fam.logicproblem")

 

@@ -63,9 +63,9 @@ class FAMTest {
                 // /////////////////////////////////////////////////////

                 // Minimum Scope

                 val classMapMin = new HashMap<Class, Integer>

-                classMapMin.put(FunctionalArchitectureModel, 1)

-                classMapMin.put(Function, 1)

-                classMapMin.put(FunctionalInterface, 2)

+//              classMapMin.put(FunctionalArchitectureModel, 1)

+//              classMapMin.put(Function, 1)

+//              classMapMin.put(FunctionalInterface, 2)

                 classMapMin.put(FunctionalOutput, 3)

                 

                 val typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.trace)

@@ -74,7 +74,7 @@ class FAMTest {
                 val classMapMax = new HashMap<Class, Integer>

                 classMapMax.put(FunctionalArchitectureModel, 3)

                 classMapMax.put(Function, 5)

-                classMapMax.put(FunctionalInterface, 2)

+                classMapMax.put(FunctionalInterface, 3)

                 classMapMax.put(FunctionalOutput, 4)

                 

                 val typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.trace)

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend
index 61a20a34..ba7ff028 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend
@@ -15,6 +15,7 @@ import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
 import java.util.HashMap

 import org.eclipse.emf.ecore.resource.Resource

 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl

+import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.*

 

 class FileSystemTest {

         def static void main(String[] args) {

@@ -59,16 +60,18 @@ class FileSystemTest {
                 // /////////////////////////////////////////////////////

                 // Minimum Scope

                 val classMapMin = new HashMap<Class, Integer>

-//              classMapMin.put(Function, 1)

-//              classMapMin.put(FunctionalInterface, 2)

-//              classMapMin.put(FunctionalOutput, 3)

+//              Currently does not work

+//              classMapMin.put(FSObject, 20)

+                classMapMin.put(Dir, 10)

+                classMapMin.put(File, 5)

                 val typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.trace)

 

                 // Maximum Scope

                 val classMapMax = new HashMap<Class, Integer>

-//              classMapMax.put(Function, 5)

-//              classMapMax.put(FunctionalInterface, 2)

-//              classMapMax.put(FunctionalOutput, 4)

+                classMapMax.put(File, 15)

+                classMapMax.put(Dir, 15)

+//              Currently does not work

+//              classMapMax.put(FSObject, 20)

                 val typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.trace)

 

                 // Define Config File           

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
index 3342c18a..76ac727a 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
@@ -14,7 +14,8 @@ import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
 import java.util.HashMap

 import org.eclipse.emf.ecore.resource.Resource

 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl

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

+

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.*

 

 class YakinduTest {

         def static void main(String[] args) {

@@ -60,15 +61,15 @@ class YakinduTest {
                 // Minimum Scope

                 val classMapMin = new HashMap<Class, Integer>

                 classMapMin.put(Region, 1)

-//              classMapMin.put(FunctionalInterface, 2)

-//              classMapMin.put(FunctionalOutput, 3)

+                classMapMin.put(Transition, 2)

+                classMapMin.put(CompositeElement, 3)

                 val typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.trace)

 

                 // Maximum Scope

                 val classMapMax = new HashMap<Class, Integer>

                 classMapMax.put(Region, 5)

-//              classMapMax.put(FunctionalInterface, 2)

-//              classMapMax.put(FunctionalOutput, 4)

+                classMapMax.put(Transition, 2)

+                classMapMax.put(Synchronization, 4)

                 val typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.trace)

 

                 // Define Config File           

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) -> {