diff options
author | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-04-25 02:50:40 -0400 |
---|---|---|
committer | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2020-06-07 19:37:07 -0400 |
commit | 598daf4605d97466d07c74b1bc76d165be145288 (patch) | |
tree | 3756188257ae023e0cdf22b840ea4ce5dfa95505 /Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse | |
parent | VAMPIRE : initial model handling almost done. only typeScope remains #40 (diff) | |
download | VIATRA-Generator-598daf4605d97466d07c74b1bc76d165be145288.tar.gz VIATRA-Generator-598daf4605d97466d07c74b1bc76d165be145288.tar.zst VIATRA-Generator-598daf4605d97466d07c74b1bc76d165be145288.zip |
VAMPIRE: fixed MANY bugs in containment and scope. #40 is good for now
Diffstat (limited to 'Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse')
3 files changed, 20 insertions, 16 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 { | |||
47 | 47 | ||
48 | val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration()) | 48 | val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration()) |
49 | var problem = modelGenerationProblem.output | 49 | var problem = modelGenerationProblem.output |
50 | // problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output | 50 | problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output |
51 | // problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output | 51 | // problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output |
52 | workspace.writeModel(problem, "Fam.logicproblem") | 52 | workspace.writeModel(problem, "Fam.logicproblem") |
53 | 53 | ||
@@ -63,9 +63,9 @@ class FAMTest { | |||
63 | // ///////////////////////////////////////////////////// | 63 | // ///////////////////////////////////////////////////// |
64 | // Minimum Scope | 64 | // Minimum Scope |
65 | val classMapMin = new HashMap<Class, Integer> | 65 | val classMapMin = new HashMap<Class, Integer> |
66 | classMapMin.put(FunctionalArchitectureModel, 1) | 66 | // classMapMin.put(FunctionalArchitectureModel, 1) |
67 | classMapMin.put(Function, 1) | 67 | // classMapMin.put(Function, 1) |
68 | classMapMin.put(FunctionalInterface, 2) | 68 | // classMapMin.put(FunctionalInterface, 2) |
69 | classMapMin.put(FunctionalOutput, 3) | 69 | classMapMin.put(FunctionalOutput, 3) |
70 | 70 | ||
71 | val typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.trace) | 71 | val typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.trace) |
@@ -74,7 +74,7 @@ class FAMTest { | |||
74 | val classMapMax = new HashMap<Class, Integer> | 74 | val classMapMax = new HashMap<Class, Integer> |
75 | classMapMax.put(FunctionalArchitectureModel, 3) | 75 | classMapMax.put(FunctionalArchitectureModel, 3) |
76 | classMapMax.put(Function, 5) | 76 | classMapMax.put(Function, 5) |
77 | classMapMax.put(FunctionalInterface, 2) | 77 | classMapMax.put(FunctionalInterface, 3) |
78 | classMapMax.put(FunctionalOutput, 4) | 78 | classMapMax.put(FunctionalOutput, 4) |
79 | 79 | ||
80 | val typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.trace) | 80 | 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 | |||
15 | import java.util.HashMap | 15 | import java.util.HashMap |
16 | import org.eclipse.emf.ecore.resource.Resource | 16 | import org.eclipse.emf.ecore.resource.Resource |
17 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl | 17 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl |
18 | import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.* | ||
18 | 19 | ||
19 | class FileSystemTest { | 20 | class FileSystemTest { |
20 | def static void main(String[] args) { | 21 | def static void main(String[] args) { |
@@ -59,16 +60,18 @@ class FileSystemTest { | |||
59 | // ///////////////////////////////////////////////////// | 60 | // ///////////////////////////////////////////////////// |
60 | // Minimum Scope | 61 | // Minimum Scope |
61 | val classMapMin = new HashMap<Class, Integer> | 62 | val classMapMin = new HashMap<Class, Integer> |
62 | // classMapMin.put(Function, 1) | 63 | // Currently does not work |
63 | // classMapMin.put(FunctionalInterface, 2) | 64 | // classMapMin.put(FSObject, 20) |
64 | // classMapMin.put(FunctionalOutput, 3) | 65 | classMapMin.put(Dir, 10) |
66 | classMapMin.put(File, 5) | ||
65 | val typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.trace) | 67 | val typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.trace) |
66 | 68 | ||
67 | // Maximum Scope | 69 | // Maximum Scope |
68 | val classMapMax = new HashMap<Class, Integer> | 70 | val classMapMax = new HashMap<Class, Integer> |
69 | // classMapMax.put(Function, 5) | 71 | classMapMax.put(File, 15) |
70 | // classMapMax.put(FunctionalInterface, 2) | 72 | classMapMax.put(Dir, 15) |
71 | // classMapMax.put(FunctionalOutput, 4) | 73 | // Currently does not work |
74 | // classMapMax.put(FSObject, 20) | ||
72 | val typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.trace) | 75 | val typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.trace) |
73 | 76 | ||
74 | // Define Config File | 77 | // 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 | |||
14 | import java.util.HashMap | 14 | import java.util.HashMap |
15 | import org.eclipse.emf.ecore.resource.Resource | 15 | import org.eclipse.emf.ecore.resource.Resource |
16 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl | 16 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl |
17 | import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region | 17 | |
18 | import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.* | ||
18 | 19 | ||
19 | class YakinduTest { | 20 | class YakinduTest { |
20 | def static void main(String[] args) { | 21 | def static void main(String[] args) { |
@@ -60,15 +61,15 @@ class YakinduTest { | |||
60 | // Minimum Scope | 61 | // Minimum Scope |
61 | val classMapMin = new HashMap<Class, Integer> | 62 | val classMapMin = new HashMap<Class, Integer> |
62 | classMapMin.put(Region, 1) | 63 | classMapMin.put(Region, 1) |
63 | // classMapMin.put(FunctionalInterface, 2) | 64 | classMapMin.put(Transition, 2) |
64 | // classMapMin.put(FunctionalOutput, 3) | 65 | classMapMin.put(CompositeElement, 3) |
65 | val typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.trace) | 66 | val typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.trace) |
66 | 67 | ||
67 | // Maximum Scope | 68 | // Maximum Scope |
68 | val classMapMax = new HashMap<Class, Integer> | 69 | val classMapMax = new HashMap<Class, Integer> |
69 | classMapMax.put(Region, 5) | 70 | classMapMax.put(Region, 5) |
70 | // classMapMax.put(FunctionalInterface, 2) | 71 | classMapMax.put(Transition, 2) |
71 | // classMapMax.put(FunctionalOutput, 4) | 72 | classMapMax.put(Synchronization, 4) |
72 | val typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.trace) | 73 | val typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.trace) |
73 | 74 | ||
74 | // Define Config File | 75 | // Define Config File |