5 files changed, 8 insertions, 8 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/AttributeMapper.xtend b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/AttributeMapper.xtend
index ebf49196..b78ad89f 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/AttributeMapper.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/AttributeMapper.xtend
@@ -47,7 +47,7 @@ class EAttributeMapper_RelationsOverTypes implements EAttributeMapper {
                         val rangeType = trace.TypeOfRange(attribute)

                         

                         // relations

-                        val indicator = '''inAttribute «attribute.name» «attribute.EContainingClass.name»'''.RelationDeclaration(sourceType,rangeType)

+                        val indicator = '''«attribute.name» attribute «attribute.EContainingClass.name»'''.RelationDeclaration(sourceType,rangeType)

 

                         logicProblem.add(indicator)

                         attributeMapperTrace.indicators.put(attribute,indicator)

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EClassMapper.xtend b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EClassMapper.xtend
index 3949749b..82abd252 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EClassMapper.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EClassMapper.xtend
@@ -26,7 +26,7 @@ class EClassMapper_AllElementAsObject implements EClassMapper{
                 val classMapperTrace = new EClassMapper_AllElementAsObject_Trace

                 trace.classMapperTrace = classMapperTrace

                 for(c:classes) {

-                        val logicType = problem.add(TypeDeclaration('''class «c.name»''',c.isAbstract || c.isInterface))

+                        val logicType = problem.add(TypeDeclaration('''«c.name» class''',c.isAbstract || c.isInterface))

                         classMapperTrace.typeMap.put(c,logicType)

                 }

                 for(c:classes) {

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EEnumMapper.xtend b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EEnumMapper.xtend
index eb7e9e44..82aee1e2 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EEnumMapper.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EEnumMapper.xtend
@@ -37,11 +37,11 @@ class EEnumMapper_PredefinedClasses implements EEnumMapper {
                 for(enum : enums) {

                         val l = new ArrayList<DefinedElement>(enum.ELiterals.size)

                         for(literal : enum.ELiterals.map[instance]) {

-                                val element = Element('''«literal.name» «enum.name»''')

+                                val element = Element('''«literal.name» literal «enum.name»''')

                                 l+=element

                                 enumTrace.literals.put(literal,element)

                         }

-                        val type = TypeDefinition('''enum «enum.name»''',false,l)

+                        val type = TypeDefinition('''«enum.name» enum''',false,l)

                         problem.add(type)

                         enumTrace.enums.put(enum,type)

                 }

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend
index 81c0858d..4eb78bc6 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend
@@ -50,7 +50,7 @@ class EReferenceMapper_RelationsOverTypes implements EReferenceMapper{
                 trace.referenceMapperTrace.asTrace.indicators = new HashMap

                 for(reference : references) {

                         val relation = problem.add(RelationDeclaration(

-                                '''inreference «reference.name» «reference.EContainingClass.name»''',

+                                '''«reference.name» reference «reference.EContainingClass.name»''',

                                 TypeofEClass(trace,reference.EContainingClass),

                                 TypeofEClass(trace,reference.EType as EClass)))

                         trace.referenceMapperTrace.asTrace.indicators.put(reference,relation as RelationDeclaration)

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend
index 39d8a365..87774f43 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend
@@ -57,7 +57,7 @@ class PartialInterpretation2Logic {
                 val newElements = new ArrayList(i.newElements)

                 var newElementIndex = 1

                 for(newElement : newElements) {

-                        newElement.name = '''DefinedElement «newElementIndex++»'''

+                        newElement.name = '''o «newElementIndex++»'''

                         p.elements += newElement

                 }

         }

@@ -67,12 +67,12 @@ class PartialInterpretation2Logic {
                         val declaration = partialTypeDeclaration.interpretationOf

                         

                         val definedPart = createTypeDefinition => [

-                                it.name = '''DefinedPartOf «declaration.name»'''

+                                it.name = '''«declaration.name» DefinedPart'''

                                 it.elements += partialTypeDeclaration.elements

                                 it.isAbstract = declaration.isIsAbstract

                         ]

                         val undefinedPart = createTypeDeclaration => [

-                                it.name = '''UndefinedPartOf «declaration.name»'''

+                                it.name = '''«declaration.name» UndefinedPart'''

                                 it.isAbstract = declaration.isIsAbstract

                         ]

                         declaration.isAbstract = true