Added methods to decide which attribure or enum type is mapped ot the

logic problem.

2 files changed, 17 insertions, 1 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 b78ad89f..74f82a13 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
@@ -18,6 +18,7 @@ interface EAttributeMapper {
         def Term IsAttributeValue(Ecore2Logic_Trace trace, TermDescription object, TermDescription value, EAttribute attribute)

         def RelationDeclaration relationOfAttribute(Ecore2Logic_Trace trace, EAttribute attribute)

         def TypeDescriptor TypeOfRange(Ecore2Logic_Trace trace, EAttribute attribute)

+        def Iterable<EAttribute> allAttributesInScope(Ecore2Logic_Trace trace) 

 }

 

 class EAttributeMapper_RelationsOverTypes_Trace implements Trace<EAttributeMapper_RelationsOverTypes>{

@@ -116,4 +117,9 @@ class EAttributeMapper_RelationsOverTypes implements EAttributeMapper {
         override relationOfAttribute(Ecore2Logic_Trace trace, EAttribute attribute) {

                 trace.attributeMapperTrace.asTrace.indicators.get(attribute)

         }

+        

+        override allAttributesInScope(Ecore2Logic_Trace trace) {

+                trace.attributeMapperTrace.asTrace.indicators.keySet

+        }

+        

 }
\ No newline at end of file
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 82aee1e2..5935c6d0 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
@@ -17,11 +17,12 @@ interface EEnumMapper {
         def void transformEEnums(Ecore2Logic_Trace trace, LogicProblem problem, Iterable<EEnum> enums,Ecore2LogicConfiguration config)

         def Type TypeofEEnum(Ecore2Logic_Trace trace, EEnum type)

         def TermDescription Literal(Ecore2Logic_Trace trace, Enumerator literal)

+        def Iterable<EEnum> allEnumsInScope(Ecore2Logic_Trace trace)

+        def Iterable<Enumerator> allLiteralsInScope(Ecore2Logic_Trace trace)

 }

 

 class EEnumMapper_PredefinedClasses_Trace implements Trace<EEnumMapper_PredefinedClasses>{

         public var Map<EEnum, Type> enums

-

         public var Map<Enumerator,DefinedElement> literals

 }

 

@@ -57,4 +58,13 @@ class EEnumMapper_PredefinedClasses implements EEnumMapper {
         override Literal(Ecore2Logic_Trace trace, Enumerator literal) {

                 literal.lookup(trace.enumMapperTrace.asTrace.literals)

         }

+        

+        override allEnumsInScope(Ecore2Logic_Trace trace) {

+                trace.enumMapperTrace.asTrace.enums.keySet

+        }

+        

+        override allLiteralsInScope(Ecore2Logic_Trace trace) {

+                trace.enumMapperTrace.asTrace.literals.keySet

+        }

+        

 }
\ No newline at end of file