9 files changed, 25 insertions, 13 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 bbea9822..ccf36550 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
@@ -17,6 +17,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 functionalarchitecture.FunctionalArchitectureModel

 

 class FAMTest {

         def static void main(String[] args) {

@@ -46,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")

 

@@ -62,6 +63,7 @@ class FAMTest {
                 // /////////////////////////////////////////////////////

                 // Minimum Scope

                 val classMapMin = new HashMap<Class, Integer>

+                classMapMin.put(FunctionalArchitectureModel, 1)

                 classMapMin.put(Function, 1)

                 classMapMin.put(FunctionalInterface, 2)

                 classMapMin.put(FunctionalOutput, 3)

@@ -70,6 +72,7 @@ class FAMTest {
                 

                 // Maximum Scope

                 val classMapMax = new HashMap<Class, Integer>

+                classMapMax.put(FunctionalArchitectureModel, 3)

                 classMapMax.put(Function, 5)

                 classMapMax.put(FunctionalInterface, 2)

                 classMapMax.put(FunctionalOutput, 4)

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 d4cbb299..61a20a34 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
@@ -43,7 +43,7 @@ class FileSystemTest {
 

                 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, "FileSystem.logicproblem")

 

@@ -76,8 +76,8 @@ class FileSystemTest {
                         // add configuration things, in config file first

                         it.documentationLevel = DocumentationLevel::FULL

 

-                        it.typeScopes.minNewElements = 40

-                        it.typeScopes.maxNewElements = 59

+                        it.typeScopes.minNewElements = 10

+                        it.typeScopes.maxNewElements = 25

                         if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin

                         if(typeMapMin.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax

                         it.contCycleLevel = 5

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 f0d88b49..3342c18a 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,6 +14,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.yakindu.Region

 

 class YakinduTest {

         def static void main(String[] args) {

@@ -42,7 +43,7 @@ class YakinduTest {
 

                 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, "Yakindu.logicproblem")

 

@@ -58,14 +59,14 @@ class YakinduTest {
                 // /////////////////////////////////////////////////////

                 // Minimum Scope

                 val classMapMin = new HashMap<Class, Integer>

-//              classMapMin.put(Function, 1)

+                classMapMin.put(Region, 1)

 //              classMapMin.put(FunctionalInterface, 2)

 //              classMapMin.put(FunctionalOutput, 3)

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

 

                 // Maximum Scope

                 val classMapMax = new HashMap<Class, Integer>

-//              classMapMax.put(Function, 5)

+                classMapMax.put(Region, 5)

 //              classMapMax.put(FunctionalInterface, 2)

 //              classMapMax.put(FunctionalOutput, 4)

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

@@ -75,8 +76,8 @@ class YakinduTest {
                         // add configuration things, in config file first

                         it.documentationLevel = DocumentationLevel::FULL

 

-                        it.typeScopes.minNewElements = 53

-                        it.typeScopes.maxNewElements = 53

+                        it.typeScopes.minNewElements = 20

+                        it.typeScopes.maxNewElements = 30

                         if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin

                         if(typeMapMin.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax

                         it.contCycleLevel = 5

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 9ac7c906..796bed43 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 60e770c6..830ec7f9 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 5b017f34..395fc452 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 1fcaf9bd..855909aa 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
@@ -4,6 +4,7 @@ import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;
 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;

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

 import functionalarchitecture.Function;

+import functionalarchitecture.FunctionalArchitectureModel;

 import functionalarchitecture.FunctionalOutput;

 import functionalarchitecture.FunctionalarchitecturePackage;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;

@@ -65,11 +66,13 @@ 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(FunctionalOutput.class, Integer.valueOf(4));

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 f7f8a5ee..21d2a307 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
@@ -57,6 +57,7 @@ public class FileSystemTest {
       Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();

       final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);

       LogicProblem problem = modelGenerationProblem.getOutput();

+      problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).getOutput();

       workspace.writeModel(problem, "FileSystem.logicproblem");

       InputOutput.<String>println("Problem created");

       long startTime = System.currentTimeMillis();

@@ -70,8 +71,8 @@ public class FileSystemTest {
       VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

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

         it.documentationLevel = DocumentationLevel.FULL;

-        it.typeScopes.minNewElements = 40;

-        it.typeScopes.maxNewElements = 59;

+        it.typeScopes.minNewElements = 10;

+        it.typeScopes.maxNewElements = 25;

         int _size = typeMapMin.size();

         boolean _notEquals = (_size != 0);

         if (_notEquals) {

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 3a322ee0..ceae8ed2 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,5 +1,6 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse;

 

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

 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;

@@ -55,6 +56,7 @@ public class YakinduTest {
       Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();

       final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);

       LogicProblem problem = modelGenerationProblem.getOutput();

+      problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).getOutput();

       workspace.writeModel(problem, "Yakindu.logicproblem");

       InputOutput.<String>println("Problem created");

       long startTime = System.currentTimeMillis();

@@ -62,14 +64,16 @@ public class YakinduTest {
       VampireSolver _vampireSolver = new VampireSolver();

       reasoner = _vampireSolver;

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

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

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

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

       VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

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

         it.documentationLevel = DocumentationLevel.FULL;

-        it.typeScopes.minNewElements = 53;

-        it.typeScopes.maxNewElements = 53;

+        it.typeScopes.minNewElements = 20;

+        it.typeScopes.maxNewElements = 30;

         int _size = typeMapMin.size();

         boolean _notEquals = (_size != 0);

         if (_notEquals) {