VAMPIRE: close #22, improve test structure for #39, .vql file trouble

4 files changed, 30 insertions, 73 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend
index 18b3badd..35b76350 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend
@@ -1,11 +1,10 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse

 

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

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

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

-import functionalarchitecture.FunctionalarchitecturePackage

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

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration

-import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult

@@ -13,91 +12,48 @@ import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore
 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace

-import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace

-import java.util.List

-import org.eclipse.emf.ecore.EAttribute

-import org.eclipse.emf.ecore.EClass

-import org.eclipse.emf.ecore.EEnum

-import org.eclipse.emf.ecore.EEnumLiteral

-import org.eclipse.emf.ecore.EObject

-import org.eclipse.emf.ecore.EReference

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

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

 

 class EcoreTest {

         def static void main(String[] args) {

                 val inputs = new FileSystemWorkspace('''initialModels/''', "")

-                val workspace = new FileSystemWorkspace('''output/FAMTest/''', "")

+                val workspace = new FileSystemWorkspace('''output/FEcoreTest/''', "")

                 workspace.initAndClear

 

                 println("Input and output workspaces are created")

 

-                val metamodel = loadMetamodel()

-                val partialModel = loadPartialModel(inputs)

-//              val queries = loadQueries(metamodel)

+                val metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE)

+                val partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi")

+//              val queries = GeneralTest.loadQueries(metamodel, ecorePatterns.instance)

+                val queries = null

 

                 println("DSL loaded")

-                

+

                 val Ecore2Logic ecore2Logic = new Ecore2Logic

                 val Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic)

                 val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic)

                 val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic

-                

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

-                val modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem,partialModel)

+

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

+                val modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem, partialModel)

 //              val validModelExtensionProblem = viatra2Logic.transformQueries(queries,modelGenerationProblem,new Viatra2LogicConfiguration)

-                

                 val logicProblem = modelGenerationProblem.output

 //              val logicProblem = modelExtensionProblem.output

 //              val logicProblem = validModelExtensionProblem.output

-                

-                

                 println("Problem created")

-                

+

                 var LogicResult solution

                 var LogicReasoner reasoner

-                //*

+                // *

                 reasoner = new VampireSolver

                 val vampireConfig = new VampireSolverConfiguration => [

-                        //add configuration things, in config file first

+                        // add configuration things, in config file first

                         it.documentationLevel = DocumentationLevel::FULL

                 ]

-                

-                solution = reasoner.solve(logicProblem, vampireConfig,  workspace)

-                

-                println("Problem solved")

-                

-                

-        }

 

-        def private static loadMetamodel() {

-                val pckg = FunctionalarchitecturePackage.eINSTANCE

-                val List<EClass> classes = pckg.getEClassifiers.filter(EClass).toList

-                val List<EEnum> enums = pckg.getEClassifiers.filter(EEnum).toList

-                val List<EEnumLiteral> literals = enums.map[getELiterals].flatten.toList

-                val List<EReference> references = classes.map[getEReferences].flatten.toList

-                val List<EAttribute> attributes = classes.map[getEAttributes].flatten.toList

-                return new EcoreMetamodelDescriptor(classes,#{},false,enums,literals,references,attributes)

-        }

+                solution = reasoner.solve(logicProblem, vampireConfig, workspace)

 

-        def private static loadPartialModel(ReasonerWorkspace inputs) {

-                Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl());

-//              inputs.readModel(EObject,"FunctionalArchitectureModel.xmi").eResource.allContents.toList

-                inputs.readModel(EObject,"FamInstance.xmi").eResource.allContents.toList

-        }

+                println("Problem solved")

 

-        def private static loadQueries(EcoreMetamodelDescriptor metamodel) {

-//              val i = Patterns.instance

-//              val patterns = i.specifications.toList

-//              val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name== "Constraint"]].toSet

-//              val derivedFeatures = new LinkedHashMap

-//              derivedFeatures.put(i.type,metamodel.attributes.filter[it.name == "type"].head)

-//              derivedFeatures.put(i.model,metamodel.references.filter[it.name == "model"].head)

-//              val res = new ViatraQuerySetDescriptor(

-//                      patterns,

-//                      wfPatterns,

-//                      derivedFeatures

-//              )

-//              return res

         }

+

 }

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

 

-import ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns

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

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

 import functionalarchitecture.Function

@@ -39,14 +38,15 @@ class FAMTest {
 

                 // Load DSL

                 val metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE)

-                val partialModel = GeneralTest.loadPartialModel(inputs, "FaModel.xmi")

-                val queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance)

+                val partialModel = GeneralTest.loadPartialModel(inputs, "FAM/FaModel.xmi")

+//              val queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance)

+                val queries = null

 

                 println("DSL loaded")

 

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

 

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 50639577..d4cbb299 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
@@ -1,7 +1,7 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse

 

-import ca.mcgill.ecse.dslreasoner.vampire.queries

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

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

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

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

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

@@ -24,7 +24,7 @@ class FileSystemTest {
 

                 // Workspace setup

                 val inputs = new FileSystemWorkspace('''initialModels/''', "")

-                val workspace = new FileSystemWorkspace('''output/FAMTest/''', "")

+                val workspace = new FileSystemWorkspace('''output/FileSystemTest/''', "")

                 workspace.initAndClear

 

                 // Logicproblem writing setup

@@ -34,9 +34,10 @@ class FileSystemTest {
 

                 println("Input and output workspaces are created")

 

+

                 val metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE)

                 val partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi")

-                //val queries = GeneralTest.loadQueries(metamodel, FileSystemPatterns.instance)

+                val queries = GeneralTest.loadQueries(metamodel, FileSystemPatterns.instance)

 

                 println("DSL loaded")

 

@@ -44,7 +45,7 @@ class FileSystemTest {
                 var problem = modelGenerationProblem.output

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

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

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

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

 

                 println("Problem created")

 

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

                         it.documentationLevel = DocumentationLevel::FULL

 

-                        it.typeScopes.minNewElements = 4

-                        it.typeScopes.maxNewElements = 5

+                        it.typeScopes.minNewElements = 40

+                        it.typeScopes.maxNewElements = 59

                         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 1fac968b..f0d88b49 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
@@ -35,7 +35,7 @@ class YakinduTest {
 

                 val metamodel = GeneralTest.loadMetamodel(yakinduPackage.eINSTANCE)

                 val partialModel = GeneralTest.loadPartialModel(inputs, "yakindu/yakinduinstance.xmi")

-//              val queries = GeneralTest.loadQueries(metamodel, FamPa

+//              val queries = GeneralTest.loadQueries(metamodel, yakinduPatterns.instance)

                 val queries = null

 

                 println("DSL loaded")

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

                         it.documentationLevel = DocumentationLevel::FULL

 

-                        it.typeScopes.minNewElements = 20

-                        it.typeScopes.maxNewElements = 30

+                        it.typeScopes.minNewElements = 53

+                        it.typeScopes.maxNewElements = 53

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

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

                         it.contCycleLevel = 5