From 598daf4605d97466d07c74b1bc76d165be145288 Mon Sep 17 00:00:00 2001 From: ArenBabikian Date: Thu, 25 Apr 2019 02:50:40 -0400 Subject: VAMPIRE: fixed MANY bugs in containment and scope. #40 is good for now --- .../ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend | 10 +++++----- .../ecse/dslreasoner/vampire/icse/FileSystemTest.xtend | 15 +++++++++------ .../ecse/dslreasoner/vampire/icse/YakinduTest.xtend | 11 ++++++----- 3 files changed, 20 insertions(+), 16 deletions(-) (limited to 'Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire') 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 - 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 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 -// 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 -// 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 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 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 -- cgit v1.2.3-54-g00ecf