1 files changed, 46 insertions, 49 deletions

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
index 863a91c8..b65826ad 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
@@ -1,41 +1,42 @@
 package hu.bme.mit.inf.dslreasoner.run

 

+import functionalarchitecture.FunctionalarchitecturePackage

+import hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns

+import hu.bme.mit.inf.dslreasoner.domains.transima.fam.Model

+import hu.bme.mit.inf.dslreasoner.domains.transima.fam.Type

+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

+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult

+import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore

+import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic

+import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration

+import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy

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

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration

+import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualiser

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

-import hu.bme.mit.inf.dslreasomer.domains.transima.fam.FunctionalArchitecture.FunctionalArchitecturePackage

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

+import java.util.LinkedHashMap

+import java.util.LinkedList

 import java.util.List

+import org.eclipse.emf.ecore.EAttribute

 import org.eclipse.emf.ecore.EClass

-import org.eclipse.emf.ecore.EEnumLiteral

-import org.eclipse.emf.ecore.EReference

 import org.eclipse.emf.ecore.EEnum

-import org.eclipse.emf.ecore.EAttribute

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

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

+import org.eclipse.emf.ecore.EEnumLiteral

 import org.eclipse.emf.ecore.EObject

-import java.util.LinkedHashMap

-import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor

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

-import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic

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

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

-import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration

-import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.TypeInferenceMethod

-import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.StateCoderStrategy

-import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner

-import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult

-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

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

+import org.eclipse.emf.ecore.EReference

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

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

-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml

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

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

-import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore

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

-import java.util.LinkedList

-import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualisation

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicStructureBuilder

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicProblemBuilder

+import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetup

+import org.eclipse.viatra.query.runtime.rete.matcher.ReteEngine

 

 class SimpleRun {

         

@@ -59,7 +60,8 @@ class SimpleRun {
                 

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

                 val modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem,partialModel)

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

+                val validModelExtensionProblem = viatra2Logic.transformQueries(queries,modelExtensionProblem,new Viatra2LogicConfiguration)

+//              workspace.writeModel(validModelExtensionProblem.output, "generation.logicproblem")

                 

                 val logicProblem = validModelExtensionProblem.output

                 

@@ -71,11 +73,11 @@ class SimpleRun {
                 val viatraConfig = new ViatraReasonerConfiguration => [

                         it.typeScopes.maxNewElements = 40

                         it.typeScopes.minNewElements = 40

-                        it.solutionScope.numberOfRequiredSolution = 1

-                        it.existingQueries = queries.patterns.map[it.internalQueryRepresentation]

-                        it.debugCongiguration.logging = false

-                        it.debugCongiguration.partalInterpretationVisualisationFrequency = 1

-                        it.debugCongiguration.partialInterpretatioVisualiser = new GraphvizVisualisation

+                        it.solutionScope.numberOfRequiredSolutions = 1

+//                      it.scopePropagatorStrategy = ScopePropagatorStrategy.BasicTypeHierarchy

+                        it.documentationLevel = DocumentationLevel.NONE

+                        it.debugConfiguration.partalInterpretationVisualisationFrequency = 1

+                        it.debugConfiguration.partialInterpretatioVisualiser = new GraphvizVisualiser

                 ]

                 solution = reasoner.solve(logicProblem,viatraConfig,workspace)

                 /*/

@@ -92,23 +94,20 @@ class SimpleRun {
                 

                 println("Problem solved")

                 

-                val interpretations = reasoner.getInterpretations(solution as ModelResult)

+                val result = solution as ModelResult

+                val interpretations = reasoner.getInterpretations(result)

                 val models = new LinkedList

                 for(interpretation : interpretations) {

-                        val extension b = new LogicStructureBuilder

-                        val extension a = new LogicProblemBuilder

-                        

-                        

-                        

                         val instanceModel = logic2Ecore.transformInterpretation(interpretation,modelGenerationProblem.trace)

                         models+=instanceModel

                 }

+                println(result.statistics.solverTime)

                 

                 solution.writeSolution(workspace, #[])
         }

         

         def private static loadMetamodel() {

-                val pckg = FunctionalArchitecturePackage.eINSTANCE

+                val pckg = FunctionalarchitecturePackage.eINSTANCE

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

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

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

@@ -118,12 +117,12 @@ class SimpleRun {
         }

         

         def private static loadQueries(EcoreMetamodelDescriptor metamodel) {

-                val i = hu.bme.mit.inf.dslreasoner.domains.transima.fam.patterns.Pattern.instance

+                val i = FamPatterns.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)

+                derivedFeatures.put(Type.instance,metamodel.attributes.filter[it.name == "type"].head)

+                derivedFeatures.put(Model.instance,metamodel.references.filter[it.name == "model"].head)

                 val res = new ViatraQuerySetDescriptor(

                         patterns,

                         wfPatterns,

@@ -133,6 +132,8 @@ class SimpleRun {
         }

         

         def static loadPartialModel(ReasonerWorkspace inputs) {

+                EMFPatternLanguageStandaloneSetup.doSetup

+                ReteEngine.getClass

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

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

         }

@@ -160,8 +161,4 @@ class SimpleRun {
                         println("Solution saved and visualised")

                 } 

         }

-        

-        def static visualizeSolution() {

-                

-        }

 }
\ No newline at end of file