From 64bd54b9b61a2e20d5db6b1eb60b99331bed0a2f Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Wed, 12 Jul 2017 15:22:58 +0200 Subject: Changed naming convention in generated logic problems. An identifier usually separated by whitespaces into name sections, creating hierarchic names. By convention names with at most three sections are represented in the following way: "nameOfObject typeOfObject namespaceOfObject". For example, the name of a relation "vertices" representing a "reference" in class "Region" will be: "vertices reference Region" --- .../src/hu/bme/mit/inf/dslreasoner/ecore2logic/AttributeMapper.xtend | 2 +- .../src/hu/bme/mit/inf/dslreasoner/ecore2logic/EClassMapper.xtend | 2 +- .../src/hu/bme/mit/inf/dslreasoner/ecore2logic/EEnumMapper.xtend | 4 ++-- .../src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src') 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(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) -- cgit v1.2.3-54-g00ecf