armodel 1.3.0__py3-none-any.whl → 1.4.3__py3-none-any.whl

armodel/models/ar_package.py

@@ -1,25 +1,47 @@
-from typing import List
+from typing import Dict, List
+
+from .data_dictionary import SwAddrMethod
+from .record_layout import SwRecordLayout
+from .end_to_end_protection import EndToEndProtectionSet
+from .unit import Unit
 from .general_structure import Identifiable, ARObject, Referrable, CollectableElement, SwcBswMapping
-from .port_interface import SenderReceiverInterface, ClientServerInterface
-from .sw_component import SwComponentType, EcuAbstractionSwComponentType, AtomicSwComponentType, ApplicationSwComponentType, ServiceSwComponentType, CompositionSwComponentType, SensorActuatorSwComponentType
-from .datatype import ImplementationDataType, ApplicationDataType, DataTypeMappingSet, DataTypeMap, SwBaseType, ApplicationPrimitiveDataType, ApplicationRecordDataType
+from .port_interface import ModeSwitchInterface, SenderReceiverInterface, ClientServerInterface, TriggerInterface
+from .sw_component import SwComponentType, EcuAbstractionSwComponentType, AtomicSwComponentType, ApplicationSwComponentType
+from .sw_component import ServiceSwComponentType, CompositionSwComponentType, SensorActuatorSwComponentType, ComplexDeviceDriverSwComponentType
+from .datatype import ApplicationArrayDataType, ImplementationDataType, ApplicationDataType, DataTypeMappingSet, DataTypeMap, SwBaseType, ApplicationPrimitiveDataType, ApplicationRecordDataType
 from .m2_msr import CompuMethod
+from .common_structure import ConstantSpecification, ModeDeclarationGroup
 from .implementation import BswImplementation, SwcImplementation, Implementation
 from .bsw_module_template import BswModuleDescription, BswModuleEntry
+from .global_constraints import DataConstr
 
 class ARPackage(Identifiable, CollectableElement):
     def __init__(self, parent: ARObject, short_name: str):
         Identifiable.__init__(self, parent, short_name)
         CollectableElement.__init__(self)
 
+        self._ar_packages = {}      # type: Dict[str, ARPackage]
+
     def getARPackages(self):    # type: (...) -> List[ARPackage]
-        return list(filter(lambda e: isinstance(e, ARPackage), self.elements.values()))
+        return list(sorted(self._ar_packages.values(), key= lambda a: a.short_name))
+        #return list(filter(lambda e: isinstance(e, ARPackage), self.elements.values()))
 
     def createARPackage(self, short_name: str):
+        '''
         if (short_name not in self.elements):
             ar_package = ARPackage(self, short_name)
             self.elements[short_name] = ar_package
         return self.elements[short_name]
+        '''
+        if short_name not in self._ar_packages:
+            ar_package = ARPackage(self, short_name)
+            self._ar_packages[short_name] = ar_package
+        return self._ar_packages[short_name]
+    
+    def getElement(self, short_name: str) -> Referrable:
+        if (short_name in self._ar_packages):
+            return self._ar_packages[short_name]
+        return CollectableElement.getElement(self, short_name)
 
     def createEcuAbstractionSwComponentType(self, short_name: str) -> EcuAbstractionSwComponentType:
         if (short_name not in self.elements):
@@ -28,10 +50,16 @@ class ARPackage(Identifiable, CollectableElement):
         return self.elements[short_name]
 
     def createApplicationSwComponentType(self, short_name: str) -> ApplicationSwComponentType:
-        if (short_name not in self.elements):
+        if short_name not in self.elements:
             sw_component = ApplicationSwComponentType(self, short_name)
             self.elements[short_name] = sw_component
         return self.elements[short_name]
+    
+    def createComplexDeviceDriverSwComponentType(self, short_name: str) -> ComplexDeviceDriverSwComponentType:
+        if short_name not in self.elements:
+            sw_component = ComplexDeviceDriverSwComponentType(self, short_name)
+            self.elements[short_name] = sw_component
+        return self.elements[short_name]
 
     def createServiceSwComponentType(self, short_name: str) -> ServiceSwComponentType:
         if (short_name not in self.elements):
@@ -128,9 +156,72 @@ class ARPackage(Identifiable, CollectableElement):
             sw_component = SwcBswMapping(self, short_name)
             self.elements[short_name] = sw_component
         return self.elements[short_name]
+    
+    def createConstantSpecification(self, short_name: str) -> ConstantSpecification:
+        if (short_name not in self.elements):
+            spec = ConstantSpecification(self, short_name)
+            self.elements[short_name] = spec
+        return self.elements[short_name]
+    
+    def createDataConstr(self, short_name: str) -> DataConstr:
+        if (short_name not in self.elements):
+            spec = DataConstr(self, short_name)
+            self.elements[short_name] = spec
+        return self.elements[short_name]
+    
+    def createUnit(self, short_name: str) -> Unit:
+        if (short_name not in self.elements):
+            spec = Unit(self, short_name)
+            self.elements[short_name] = spec
+        return self.elements[short_name]
+    
+    def createEndToEndProtectionSet(self, short_name: str) -> EndToEndProtectionSet:
+        if (short_name not in self.elements):
+            spec = EndToEndProtectionSet(self, short_name)
+            self.elements[short_name] = spec
+        return self.elements[short_name]
+    
+    def createApplicationArrayDataType(self, short_name: str) -> ApplicationArrayDataType:
+        if (short_name not in self.elements):
+            spec = ApplicationArrayDataType(self, short_name)
+            self.elements[short_name] = spec
+        return self.elements[short_name]
+    
+    def createSwRecordLayout(self, short_name: str) -> SwRecordLayout:
+        if (short_name not in self.elements):
+            spec = SwRecordLayout(self, short_name)
+            self.elements[short_name] = spec
+        return self.elements[short_name]
+    
+    def createSwAddrMethod(self, short_name: str) -> SwAddrMethod:
+        if (short_name not in self.elements):
+            spec = SwAddrMethod(self, short_name)
+            self.elements[short_name] = spec
+        return self.elements[short_name]
+    
+    def createTriggerInterface(self, short_name: str) -> TriggerInterface:
+        if (short_name not in self.elements):
+            spec = TriggerInterface(self, short_name)
+            self.elements[short_name] = spec
+        return self.elements[short_name]
+    
+    def createModeDeclarationGroup(self, short_name: str) -> ModeDeclarationGroup:
+        if (short_name not in self.elements):
+            spec = ModeDeclarationGroup(self, short_name)
+            self.elements[short_name] = spec
+        return self.elements[short_name]
+    
+    def createModeSwitchInterface(self, short_name: str) -> ModeSwitchInterface:
+        if (short_name not in self.elements):
+            spec = ModeSwitchInterface(self, short_name)
+            self.elements[short_name] = spec
+        return self.elements[short_name]
 
     def getApplicationPrimitiveDataTypes(self) -> List[ApplicationPrimitiveDataType]:
         return list(filter(lambda a: isinstance(a, ApplicationPrimitiveDataType), self.elements.values()))
+    
+    def getApplicationDataType(self) -> List[ApplicationDataType]:
+        return list(sorted(filter(lambda a: isinstance(a, ApplicationDataType), self.elements.values()), key= lambda o:o.short_name))
 
     def getImplementationDataTypes(self) -> List[ImplementationDataType]:
         return list(filter(lambda a: isinstance(a, ImplementationDataType), self.elements.values()))
@@ -149,6 +240,9 @@ class ARPackage(Identifiable, CollectableElement):
 
     def getCompositionSwComponentTypes(self) -> List[CompositionSwComponentType]:
         return list(filter(lambda a : isinstance(a, CompositionSwComponentType), self.elements.values()))
+    
+    def getComplexDeviceDriverSwComponentTypes(self) -> List[ComplexDeviceDriverSwComponentType]:
+        return list(sorted(filter(lambda a : isinstance(a, ComplexDeviceDriverSwComponentType), self.elements.values()), key = lambda a: a.short_name))
 
     def getSenderReceiverInterfaces(self) -> List[SenderReceiverInterface]:
         return list(filter(lambda a : isinstance(a, SenderReceiverInterface), self.elements.values()))
@@ -179,8 +273,35 @@ class ARPackage(Identifiable, CollectableElement):
 
     def getSwcBswMappings(self) -> List[SwcBswMapping]:
         return list(filter(lambda a: isinstance(a, SwcBswMapping), self.elements.values()))
+    
+    def getConstantSpecifications(self) -> List[ConstantSpecification]:
+        return list(filter(lambda a: isinstance(a, ConstantSpecification), self.elements.values()))
+    
+    def getDataConstrs(self) -> List[DataConstr]:
+        return list(filter(lambda a: isinstance(a, DataConstr), self.elements.values()))
+    
+    def getUnits(self) -> List[Unit]:
+        return list(filter(lambda a: isinstance(a, Unit), self.elements.values()))
+    
+    def getApplicationArrayDataTypes(self) -> List[ApplicationArrayDataType]:
+        return list(sorted(filter(lambda a : isinstance(a, ApplicationArrayDataType), self.elements.values()), key = lambda a: a.short_name))
+    
+    def getSwRecordLayouts(self) -> List[SwRecordLayout]:
+        return list(sorted(filter(lambda a : isinstance(a, SwRecordLayout), self.elements.values()), key = lambda a: a.short_name))
 
-class AUTOSAR (ARObject, CollectableElement):
+    def getSwAddrMethods(self) -> List[SwAddrMethod]:
+        return list(sorted(filter(lambda a : isinstance(a, SwAddrMethod), self.elements.values()), key = lambda a: a.short_name))
+    
+    def getTriggerInterfaces(self) -> List[TriggerInterface]:
+        return list(sorted(filter(lambda a : isinstance(a, TriggerInterface), self.elements.values()), key = lambda a: a.short_name))
+    
+    def getModeDeclarationGroups(self) -> List[ModeDeclarationGroup]:
+        return list(sorted(filter(lambda a : isinstance(a, ModeDeclarationGroup), self.elements.values()), key = lambda a: a.short_name))
+    
+    def getModeSwitchInterfaces(self) -> List[ModeSwitchInterface]:
+        return list(sorted(filter(lambda a : isinstance(a, ModeSwitchInterface), self.elements.values()), key = lambda a: a.short_name))
+
+class AUTOSAR (CollectableElement):
     __instance = None
 
     @staticmethod
@@ -194,26 +315,35 @@ class AUTOSAR (ARObject, CollectableElement):
             raise Exception("The AUTOSAR is singleton!")
         CollectableElement.__init__(self)
 
-        self.version = "4.3.0"
+        self.schema_location = ""
         self._appl_impl_type_maps = {}
         self._impl_appl_type_maps = {}
         AUTOSAR.__instance = self
 
+        self._ar_packages = {}          # type: Dict[str, ARPackage]
+
     @property
     def full_name(self):
         return ""
 
     def clear(self):
+        self._ar_packages = {}
         self.elements = {}
 
+    def getElement(self, short_name: str) -> Referrable:
+        if (short_name in self._ar_packages):
+            return self._ar_packages[short_name]
+        return CollectableElement.getElement(self, short_name)
+
     def getARPackages(self) -> List[ARPackage]:
-        return list(filter(lambda e: isinstance(e, ARPackage), self.elements.values()))
+        #return list(filter(lambda e: isinstance(e, ARPackage), self.elements.values()))
+        return list(sorted(self._ar_packages.values(), key= lambda a: a.short_name))
 
     def createARPackage(self, short_name: str) -> ARPackage:
-        if (short_name not in self.elements):
+        if (short_name not in self._ar_packages):
             ar_package = ARPackage(self, short_name)
-            self.elements[short_name] = ar_package
-        return self.elements[short_name]
+            self._ar_packages[short_name] = ar_package
+        return self._ar_packages[short_name]
 
     def find(self, referred_name: str) -> Referrable:
         short_name_list = referred_name.split("/")
@@ -230,11 +360,11 @@ class AUTOSAR (ARObject, CollectableElement):
     def getDataType(self, data_type: ImplementationDataType) -> ImplementationDataType:
         if (isinstance(data_type, ImplementationDataType) or isinstance(data_type, SwBaseType)):
             if (data_type.category == ImplementationDataType.CATEGORY_TYPE_REFERENCE):
-                referred_type = self.find(data_type.sw_data_def_props.implementation_data_type_ref.value)
+                referred_type = self.find(data_type.sw_data_def_props.implementationDataTypeRef.value)
                 return self.getDataType(referred_type)
             if (data_type.category == ImplementationDataType.CATEGORY_DATA_REFERENCE):
                 if (data_type.sw_data_def_props.sw_pointer_target_props.target_category == "VALUE"):
-                    referred_type = self.find(data_type.sw_data_def_props.sw_pointer_target_props.sw_data_def_props.base_type_ref.value)
+                    referred_type = self.find(data_type.sw_data_def_props.sw_pointer_target_props.sw_data_def_props.baseTypeRef.value)
                     return self.getDataType(referred_type)
             return data_type
         else:

armodel/models/ar_ref.py

@@ -1,4 +1,5 @@
 from abc import ABCMeta
+from typing import List
 from .ar_object import ARObject
 
 class RefType(ARObject):
@@ -14,23 +15,51 @@ class TRefType(RefType):
 class AutosarVariableRef(ARObject):
     def __init__(self):
         super().__init__()
-        self.autosar_variable_iref = None
-        self.autosar_variable_in_impl_datatype = None # type: ArVariableInImplementationDataInstanceRef
+        self.autosar_variable_iref = None               # type: VariableInAtomicSWCTypeInstanceRef 
+        self.autosar_variable_in_impl_datatype = None   # type: ArVariableInImplementationDataInstanceRef
         self.local_variable_ref = None
 
+class AutosarParameterRef(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.autosar_parameter_iref = None          # type: ParameterInAtomicSWCTypeInstanceRef
+        self.local_parameter_ref = None             # type: RefType
+
 class AtpInstanceRef(ARObject, metaclass=ABCMeta):
     def __init__(self):
         if type(self) == AtpInstanceRef:
             raise NotImplementedError("AtpInstanceRef is an abstract class.")
+        
         super().__init__()
 
-class ProvidedPortPrototypeInstanceRef(AtpInstanceRef):
+class VariableInAtomicSWCTypeInstanceRef(AtpInstanceRef):
+    def __init__(self):
+        super().__init__()
+
+        self.base_ref = None                            # type: RefType
+        self.context_data_prototype_ref = None          # type: RefType
+        self.port_prototype_ref = None                  # type: RefType
+        self.root_variable_data_prototype_ref = None    # type: RefType
+        self.target_data_prototype_ref = None           # type: RefType
+
+class PortInCompositionTypeInstanceRef(AtpInstanceRef, metaclass=ABCMeta):
+    def __init__(self):
+        if type(self) == PortInCompositionTypeInstanceRef:
+            raise NotImplementedError("PortInCompositionTypeInstanceRef is an abstract class.")
+        super().__init__()
+
+        self.abstract_context_component_ref = None  # type: RefType
+        self.base_ref = None                        # type: RefType
+        self.target_port_ref = None                 # type: RefType
+
+class PPortInCompositionInstanceRef(PortInCompositionTypeInstanceRef):
     def __init__(self):
         super().__init__()
         self.context_component_ref = None   # type: RefType
         self.target_p_port_ref     = None   # type: RefType
 
-class RequiredPortPrototypeInstanceRef(AtpInstanceRef):
+class RPortInCompositionInstanceRef(PortInCompositionTypeInstanceRef):
     def __init__(self):
         super().__init__()
         self.context_component_ref = None   # type: RefType
@@ -85,7 +114,44 @@ class RModeInAtomicSwcInstanceRef(AtpInstanceRef):
     def __init__(self):
         super().__init__()
 
-        self.base_ref = None                                    # type: RefType
-        self.context_mode_declaration_group_prototype = None    # type: RefType
-        self.context_port = None                                # type: RefType
-        self.target_mode_declaration = None                     # type: RefType
+        self.base_ref = None                                        # type: RefType
+        self.context_mode_declaration_group_prototype_ref = None    # type: RefType
+        self.context_port_ref = None                                # type: RefType
+        self.target_mode_declaration_ref = None                     # type: RefType
+
+class ParameterInAtomicSWCTypeInstanceRef(AtpInstanceRef):
+    def __init__(self):
+        super().__init__()
+
+        self.base_ref = None                                        # type: RefType
+        self.context_data_prototype_ref = None                      # type: RefType
+        self.port_prototype_ref = None                              # type: RefType
+        self.root_parameter_data_prototype_ref = None               # type: RefType
+        self.target_data_prototype_ref = None                       # type: RefType
+
+class ApplicationCompositeElementInPortInterfaceInstanceRef(AtpInstanceRef):
+    def __init__(self):
+        super().__init__()
+
+        self.base_ref = None                                        # type: RefType
+        self.context_data_prototype_ref = None                      # type: RefType
+        self.root_data_prototype_ref = None                         # type: RefType
+        self.target_data_prototype_ref = None                       # type: RefType
+
+class InnerPortGroupInCompositionInstanceRef(AtpInstanceRef):
+    def __init__(self):
+        super().__init__()
+
+        self.baseRef = None                                        # type: RefType
+        self.contextRef = None                                     # type: RefType
+        self.targetRef = None                                      # type: RefType
+
+class VariableDataPrototypeInSystemInstanceRef(AtpInstanceRef):
+    def __init__(self):
+        super().__init__()
+
+        self.baseRef = None                                        # type: RefType
+        self.contextComponentRef = []                              # type: List[RefType]
+        self.contextCompositionRef = None                          # type: RefType
+        self.contextPortRef = None                                 # type: RefType
+        self.targetDataPrototypeRef = None                         # type: RefType 

armodel/models/bsw_module_template.py

@@ -1,6 +1,7 @@
 from abc import ABCMeta
-from typing import List
+from typing import Dict, List
 from .general_structure import AtpStructureElement, ARObject, ARElement
+from .ar_object import ARBoolean, ARFloat, ARLiteral, ARNumerical, ARPositiveInteger
 from .common_structure import ExecutableEntity, ModeDeclarationGroupPrototype, InternalBehavior, Identifiable
 from .ar_ref import RefType
 
@@ -10,10 +11,16 @@ class BswModuleEntity(ExecutableEntity, metaclass=ABCMeta):
             raise NotImplementedError("BswModuleEntity is an abstract class.")
         super().__init__(parent, short_name)
 
-        self.accessed_mode_group_refs = []          # Ref ModeDeclarationGroupPrototype     *
-        self.activation_point_refs = []             # Ref BswInternalTriggeringPoint        *
-        self.implemented_entry_ref = None           # type: RefType
-        self.managed_mode_group_refs = []           # Ref ModeDeclarationGroupPrototype     *
+        self.accessedModeGroupRefs = []                 # type: List[RefType]
+        self.activationPointRefs = []                   # type: List[RefType]
+        self.implemented_entry_ref = None                 # type: RefType
+        self._managedModeGroupRefs = []                 # type: List[RefType]
+
+    def addManagedModeGroupRef(self, ref: RefType):
+        self._managedModeGroupRefs.append(ref)
+
+    def getManagedModeGroupRefs(self) -> List[RefType]:
+        return self._managedModeGroupRefs
 
 class BswCalledEntity(BswModuleEntity):
     def __init__(self, parent: ARObject, short_name: str):
@@ -46,7 +53,7 @@ class BswEvent(Identifiable, metaclass=ABCMeta):
             raise NotImplementedError("BswEvent is an abstract class.")
         super().__init__(parent, short_name)
 
-        self.starts_on_event_ref = None         # type: RefType 
+        self.startsOnEventRef = None                    # type: RefType 
 
 class BswOperationInvokedEvent(BswEvent):
     def __init__(self, parent: ARObject, short_name: str):
@@ -78,11 +85,13 @@ class BswTimingEvent(BswScheduleEvent):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
         
-        self.period = 0.0
+        self.period = None          # type: ARFloat
 
     @property
-    def period_ms(self) -> int:
-        return int(self.period * 1000)
+    def periodMs(self) -> int:
+        if self.period is not None:
+            return int(self.period.value * 1000)
+        return None
 
 class BswDataReceivedEvent(BswScheduleEvent):
     def __init__(self, parent: ARObject, short_name: str):
@@ -94,16 +103,62 @@ class BswInternalTriggerOccurredEvent(BswScheduleEvent):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.event_source_ref = None        # type: RefType
+        self.event_source_ref = None                # type: RefType
+
+
+class BswModeSwitchAckRequest(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.timeout = None                         # type: ARFloat
+
+class BswModeSenderPolicy(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.ack_request = None                     # type: BswModeSwitchAckRequest
+        self.enhanced_mode_api = None               # type: ARBoolean
+        self._provided_mode_group_ref = None        # type: RefType
+        self._queue_length = None                   # type: ARNumerical
+
+    def setProvidedModeGroupRef(self, ref: RefType):
+        self._provided_mode_group_ref = ref
+        return self
+
+    def getProvidedModeGroupRef(self) -> RefType:
+        return self._provided_mode_group_ref
+    
+    def setQueueLength(self, length: any):
+        if isinstance(length, ARNumerical):
+            self._queue_length = length
+        elif isinstance(length, int):
+            self._queue_length = ARNumerical()
+            self._queue_length.setValue(length)
+        else:
+            raise ValueError("Unsupported type <%s>" % type(length))
+        
+    def getQueueLength(self) -> ARNumerical:
+        return self._queue_length
 
 class BswInternalBehavior(InternalBehavior):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
+        self._entities = []                         # type: List[BswModuleEntity]
+        self._events = []                           # type: List[BswEvent]
+        self._mode_sender_policies = []             # type: List[BswModeSenderPolicy]
+
+    def addModeSenderPolicy(self, policy: BswModeSenderPolicy):
+        self._mode_sender_policies.append(policy)
+
+    def getModeSenderPolicies(self) -> List[BswModeSenderPolicy]:
+        return self._mode_sender_policies
+
     def createBswCalledEntity(self, short_name: str) -> BswCalledEntity:
         if (short_name not in self.elements):
             event = BswCalledEntity(self, short_name)
             self.elements[short_name] = event
+            self._entities.append(event)
         return self.elements[short_name]
 
     def getBswCalledEntities(self) -> List[BswCalledEntity]:
@@ -113,24 +168,30 @@ class BswInternalBehavior(InternalBehavior):
         if (short_name not in self.elements):
             event = BswSchedulableEntity(self, short_name)
             self.elements[short_name] = event
+            self._entities.append(event)
         return self.elements[short_name]
 
     def getBswSchedulableEntities(self) -> List[BswSchedulableEntity]:
         return list(filter(lambda a: isinstance(a, BswSchedulableEntity), self.elements.values()))
+    
+    def getBswModuleEntities(self) -> List[BswModuleEntity]:
+        return list(filter(lambda a: isinstance(a, BswModuleEntity), self.elements.values()))
 
     def createBswModeSwitchEvent(self, short_name: str) -> BswModeSwitchEvent:
         if (short_name not in self.elements):
             event = BswModeSwitchEvent(self, short_name)
             self.elements[short_name] = event
+            self._events.append(event)
         return self.elements[short_name]
 
     def getBswModeSwitchEvents(self) -> List[BswModeSwitchEvent]:
         return list(filter(lambda a: isinstance(a, BswModeSwitchEvent), self.elements.values()))
-
+    
     def createBswTimingEvent(self, short_name: str) -> BswTimingEvent:
         if (short_name not in self.elements):
             event = BswTimingEvent(self, short_name)
             self.elements[short_name] = event
+            self._events.append(event)
         return self.elements[short_name]
 
     def getBswTimingEvents(self) -> List[BswTimingEvent]:
@@ -140,6 +201,7 @@ class BswInternalBehavior(InternalBehavior):
         if (short_name not in self.elements):
             event = BswDataReceivedEvent(self, short_name)
             self.elements[short_name] = event
+            self._events.append(event)
         return self.elements[short_name]
 
     def getBswDataReceivedEvents(self) -> List[BswDataReceivedEvent]:
@@ -149,10 +211,14 @@ class BswInternalBehavior(InternalBehavior):
         if (short_name not in self.elements):
             event = BswInternalTriggerOccurredEvent(self, short_name)
             self.elements[short_name] = event
+            self._events.append(event)
         return self.elements[short_name]
 
     def getBswInternalTriggerOccurredEvents(self) -> List[BswInternalTriggerOccurredEvent]:
         return list(filter(lambda a: isinstance(a, BswInternalTriggerOccurredEvent), self.elements.values()))
+    
+    def getBswEvents(self) -> List[BswEvent]:
+        return list(filter(lambda a: isinstance(a, BswEvent), self.elements.values()))
 
 class BswModuleDescription(AtpStructureElement):
     '''
@@ -168,12 +234,18 @@ class BswModuleDescription(AtpStructureElement):
         super().__init__(parent, short_name)
 
         # MODULE-ID
-        self.module_id = 0
+        self.module_id = None                           # type: ARPositiveInteger           
         # PROVIDED-ENTRYS
-        self.implemented_entry_refs = []                # type: List[RefType]
+        self._implementedEntryRefs = []                 # type: List[RefType]
+
+        self.providedModeGroups   = {}                  # type: Dict[str, ModeDeclarationGroupPrototype]
+        self.requiredModeGroups   = {}                  # tyep: Dict[str, ModeDeclarationGroupPrototype] 
+
+    def addImplementedEntry(self, entry_ref: RefType):
+        self._implementedEntryRefs.append(entry_ref)
 
-        self.provided_mode_groups   = {}                # ModeDeclarationGroupPrototype         *
-        self.required_mode_groups   = {}                # ModeDeclarationGroupPrototype         * 
+    def getImplementedEntries(self) -> List[RefType]:
+        return self._implementedEntryRefs
 
     @property
     def category(self) -> str:
@@ -189,21 +261,21 @@ class BswModuleDescription(AtpStructureElement):
         if (short_name not in self.elements):
             prototype = ModeDeclarationGroupPrototype(self, short_name)
             self.elements[short_name] = prototype
-            self.provided_mode_groups[short_name] = prototype
+            self.providedModeGroups[short_name] = prototype
         return self.elements[short_name]
 
     def getProvidedModeGroups(self) -> List[ModeDeclarationGroupPrototype]:
-        return sorted(self.provided_mode_groups.values(), key=lambda v: v.short_name) 
+        return sorted(self.providedModeGroups.values(), key=lambda v: v.short_name) 
 
     def createRequiredModeGroup(self, short_name: str) -> ModeDeclarationGroupPrototype:
         if (short_name not in self.elements):
             prototype = ModeDeclarationGroupPrototype(self, short_name)
             self.elements[short_name] = prototype
-            self.required_mode_groups[short_name] = property
+            self.requiredModeGroups[short_name] = property
         return self.elements[short_name]
 
     def getRequiredModeGroups(self) -> List[ModeDeclarationGroupPrototype]:
-        return sorted(self.required_mode_groups.values(), key=lambda v: v.short_name) 
+        return sorted(self.requiredModeGroups.values(), key=lambda v: v.short_name) 
 
     def createBswInternalBehavior(self, short_name: str) -> BswInternalBehavior:
         '''
@@ -221,12 +293,12 @@ class BswModuleEntry(ARElement):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.service_id = None                  # type: int
-        self.is_reentrant = None                # type: bool
-        self.is_synchronous = None              # type: bool
-        self.call_type = None                   # type: str
-        self._execution_context = None          # type: str
-        self._sw_service_impl_policy = None     # type: str
+        self.service_id = None                      # type: ARNumerical
+        self.is_reentrant = None                    # type: ARBoolean
+        self.is_synchronous = None                  # type: ARBoolean
+        self.call_type = None                       # type: ARLiteral
+        self._execution_context = None              # type: ARLiteral
+        self._sw_service_impl_policy = None         # type: ARLiteral
 
     @property
     def execution_context(self):