1 files changed, 35 insertions, 17 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
index 2c53d181..8a60f486 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
@@ -26,56 +26,74 @@ import org.eclipse.emf.ecore.EReference
 import org.eclipse.emf.ecore.resource.Resource

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

 import org.eclipse.viatra.query.runtime.api.IQueryGroup

+import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloySolver

+import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloySolverConfiguration

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

 

 class GeneralTest {

-        def static String createAndSolveProblem(EcoreMetamodelDescriptor metamodel, List<EObject> partialModel, ViatraQuerySetDescriptor queries, FileSystemWorkspace workspace) {

+        def static String createAndSolveProblem(EcoreMetamodelDescriptor metamodel, List<EObject> partialModel,

+                ViatraQuerySetDescriptor queries, FileSystemWorkspace workspace) {

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

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

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

-                

+

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

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

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

+

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

-                

+

                 println("Problem created")

-                

+

                 var LogicResult solution

                 var LogicReasoner reasoner

+                

                 //*

                 reasoner = new VampireSolver

                 val vampireConfig = new VampireSolverConfiguration => [

-                        //add configuration things, in config file first

-                        it.writeToFile = true

+                        // add configuration things, in config file first

+                        it.documentationLevel = DocumentationLevel::FULL

+                        it.typeScopes.minNewElements = 5

                 ]

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

                 

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

+                /*/

                 

+                reasoner = new AlloySolver

+                val alloyConfig = new AlloySolverConfiguration => [

+                        it.typeScopes.maxNewElements = 7

+                        it.typeScopes.minNewElements = 3

+                        it.solutionScope.numberOfRequiredSolution = 1

+                        it.typeScopes.maxNewIntegers = 0

+                        it.documentationLevel = DocumentationLevel::NORMAL

+                ]

+                solution = reasoner.solve(problem, alloyConfig, workspace)

+                //*/

+

                 println("Problem solved")

         }

-        

+

         def static loadMetamodel(EPackage pckg) {

                 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)

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

         }

 

         def static loadPartialModel(ReasonerWorkspace inputs, String path) {

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

-                inputs.readModel(EObject,path).eResource.contents

+                inputs.readModel(EObject, path).eResource.contents

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

         }

 

         def static loadQueries(EcoreMetamodelDescriptor metamodel, IQueryGroup i) {

                 val patterns = i.specifications.toList

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

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

                 val derivedFeatures = emptyMap

-                //NO DERIVED FEATURES

+                // NO DERIVED FEATURES

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

@@ -86,4 +104,4 @@ class GeneralTest {
                 )

                 return res

         }

-}
\ No newline at end of file
+}