Fix enum literal support for FAM

3 files changed, 12 insertions, 12 deletions

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/.project b/Domains/Examples/ModelGenExampleFAM_plugin/.project
index 70920828..6e1b3a06 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/.project
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/.project
@@ -11,11 +11,6 @@
                         </arguments>

                 </buildCommand>

                 <buildCommand>

-                        <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-                        <arguments>

-                        </arguments>

-                </buildCommand>

-                <buildCommand>

                         <name>org.eclipse.jdt.core.javabuilder</name>

                         <arguments>

                         </arguments>

@@ -33,7 +28,6 @@
         </buildSpec>

         <natures>

                 <nature>org.eclipse.jdt.core.javanature</nature>

-                <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

                 <nature>org.eclipse.viatra.query.projectnature</nature>

                 <nature>org.eclipse.pde.PluginNature</nature>

         </natures>

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDefinitionIndexer.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDefinitionIndexer.xtend
index 9845560c..0ae28b66 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDefinitionIndexer.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDefinitionIndexer.xtend
@@ -34,7 +34,7 @@ class RelationDefinitionIndexer {
                 this.base = base

         }

         

-        public def generateRelationDefinitions(

+        def generateRelationDefinitions(

                 LogicProblem problem,

                 Iterable<RelationDefinition> relations,

                 Map<String,PQuery> fqn2PQuery) {

@@ -110,7 +110,7 @@ class RelationDefinitionIndexer {
                 else return Modality::MUST

         } 

         

-        def public referPattern(PQuery p, String[] variables, Modality modality, boolean positive, boolean transitive) '''

+        def referPattern(PQuery p, String[] variables, Modality modality, boolean positive, boolean transitive) '''

                 «IF !positive»neg «ENDIF»find «IF transitive»twoParam_«ENDIF»«modality.name.toLowerCase»InRelation_pattern_«p.fullyQualifiedName.replace('.','_')»«IF transitive»+«ENDIF»(«IF !transitive»problem,interpretation,«ENDIF»«variables.join(',')»);

         '''

         

@@ -228,10 +228,11 @@ class RelationDefinitionIndexer {
                 var String additionalDefinition;

                 if(target instanceof EEnumLiteral) {

                         targetString = '''const_«target.name»_«target.EEnum.name»'''

-                        additionalDefinition = '''DefinedElement.name(«targetString»,"«target.name» «target.EEnum.name»");  //LogicProblem.elements(problem,«targetString»);'''

+                        additionalDefinition = '''DefinedElement.name(«targetString»,"«target.name» literal «target.EEnum.name»");  //LogicProblem.elements(problem,«targetString»);'''

                 } else if(target instanceof Enumerator) {

+                        // XXX We should get the corresponding EEnum name instead of the java class name.

                         targetString = '''const_«target.name»_«target.class.simpleName»'''

-                        additionalDefinition = '''DefinedElement.name(«targetString»,"«target.name» «target.class.simpleName»");  //LogicProblem.elements(problem,«targetString»);'''

+                        additionalDefinition = '''DefinedElement.name(«targetString»,"«target.name» literal «target.class.simpleName»");  //LogicProblem.elements(problem,«targetString»);'''

                 } else if(target instanceof Integer) {

                         targetString = '''const_«target»_Integer'''

                         additionalDefinition = '''IntegerElement.value(«targetString»,«target»);'''

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 fe4dcadd..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
@@ -15,6 +15,7 @@ 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

@@ -60,6 +61,7 @@ class SimpleRun {
                 val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel,new Ecore2LogicConfiguration())

                 val modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem,partialModel)

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

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

                 

                 val logicProblem = validModelExtensionProblem.output

                 

@@ -72,6 +74,7 @@ class SimpleRun {
                         it.typeScopes.maxNewElements = 40

                         it.typeScopes.minNewElements = 40

                         it.solutionScope.numberOfRequiredSolutions = 1

+//                      it.scopePropagatorStrategy = ScopePropagatorStrategy.BasicTypeHierarchy

                         it.documentationLevel = DocumentationLevel.NONE

                         it.debugConfiguration.partalInterpretationVisualisationFrequency = 1

                         it.debugConfiguration.partialInterpretatioVisualiser = new GraphvizVisualiser

@@ -91,12 +94,14 @@ 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 instanceModel = logic2Ecore.transformInterpretation(interpretation,modelGenerationProblem.trace)

                         models+=instanceModel

                 }

+                println(result.statistics.solverTime)

                 

                 solution.writeSolution(workspace, #[])
         }

@@ -129,7 +134,7 @@ class SimpleRun {
         def static loadPartialModel(ReasonerWorkspace inputs) {

                 EMFPatternLanguageStandaloneSetup.doSetup

                 ReteEngine.getClass

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

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

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

         }