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

armodel/models/common_structure.py

@@ -3,9 +3,10 @@
 from abc import ABCMeta
 from typing import List
 
+from .ar_object import ARFloat, ARLiteral, ARNumerical
 from .general_structure import ARObject, ARElement, Identifiable
 from .data_dictionary import SwDataDefProps
-from .ar_ref import RefType
+from .ar_ref import RefType, TRefType
 
 import re
 
@@ -96,7 +97,7 @@ class NumericalValueSpecification(ValueSpecification):
     def __init__(self):
         super().__init__()
 
-        self.value = None        # type: float  
+        self.value = None        # type: ARFloat  
 
 class ArrayValueSpecification(ValueSpecification):
     def __init__(self):
@@ -133,10 +134,10 @@ class ImplementationDataTypeElement(AbstractImplementationDataTypeElement):
     def __init__(self, parent, short_name: str):
         super().__init__(parent, short_name)
 
-        self.array_size = None              # type: int
-        self.array_size_semantics = None    # type: str
-        self.is_optional = None             # type: bool
-        self.sw_data_def_props = None       # type: SwDataDefProps
+        self.arraySize = None               # type: int
+        self.array_size_semantics = None      # type: str
+        self.isOptional = None              # type: bool
+        self.sw_data_def_props = None          # type: SwDataDefProps
     
     def createImplementationDataTypeElement(self, short_name: str): # type: (...) -> ImplementationDataTypeElement
         if (short_name not in self.elements):
@@ -144,7 +145,7 @@ class ImplementationDataTypeElement(AbstractImplementationDataTypeElement):
             self.elements[short_name] = event
         return self.elements[short_name]
     
-    def getImplementationDataTypeElements(self):                    # type：(...) -> List[ImplementationDataTypeElement]:
+    def getImplementationDataTypeElements(self):                    # type：(...) -> List[ImplementationDataTypeElement]
         return list(filter(lambda c: isinstance(c, ImplementationDataTypeElement), self.elements.values()))
 
 class ExclusiveArea(Identifiable):
@@ -157,13 +158,13 @@ class InternalBehavior(Identifiable, metaclass=ABCMeta):
             raise NotImplementedError("InternalBehavior is an abstract class.")
         super().__init__(parent, short_name)
 
-        self._data_type_mapping_refs = []      # type: List[RefType]
+        self._dataTypeMappingRefs = []      # type: List[RefType]
 
     def addDataTypeMappingRef(self, ref: RefType):
-        self._data_type_mapping_refs.append(ref)
+        self._dataTypeMappingRefs.append(ref)
 
     def getDataTypeMappingRefs(self) -> List[RefType]:
-        return self._data_type_mapping_refs
+        return self._dataTypeMappingRefs
 
     def createExclusiveArea(self, short_name: str) -> ExclusiveArea:
         if (short_name not in self.elements):
@@ -178,7 +179,14 @@ class ModeDeclaration(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.value = 0
+        self.value = None                           # type: ARNumerical
+
+    def setValue(self, value):
+        self.value = value
+        return self
+
+    def getValue(self) -> ARNumerical:
+        return self.value
 
 class ExecutableEntity(Identifiable, metaclass=ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
@@ -186,20 +194,22 @@ class ExecutableEntity(Identifiable, metaclass=ABCMeta):
             raise NotImplementedError("ExecutableEntity is an abstract class.")
         super().__init__(parent, short_name)
     
-        self.activation_reason = None           # *
-        self.minimum_start_interval = 0.0       # 0..1
-        self.reentrancy_level = None            # 
-        self.can_enter_exclusive_area_refs = [] # type: List[RefType]  
+        self.activation_reason = None               # *
+        self.minimum_start_interval = None          # type: ARFloat
+        self.reentrancy_level = None                # 
+        self._can_enter_exclusive_area_refs = []    # type: List[RefType]  
 
     @property
     def minimum_start_interval_ms(self) -> int:
-        return int(self.minimum_start_interval * 1000)
+        if self.minimum_start_interval is not None:
+            return int(self.minimum_start_interval.getValue() * 1000)
+        return None
 
     def addCanEnterExclusiveAreaRef(self, ref: RefType):
-        self.can_enter_exclusive_area_refs.append(ref)
+        self._can_enter_exclusive_area_refs.append(ref)
 
     def getCanEnterExclusiveAreaRefs(self):
-        return self.can_enter_exclusive_area_refs
+        return self._can_enter_exclusive_area_refs
     
 class ModeDeclarationGroupPrototype(Identifiable):
     """
@@ -208,44 +218,55 @@ class ModeDeclarationGroupPrototype(Identifiable):
 
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
-        self._sw_calibration_access = ""    # 0..1
-        self.type_tref = None                    # tref 0..1
+
+        self._swCalibrationAccess = None        # type: str
+        self.typeTRef = None                    # type: TRefType
 
     @property
     def sw_calibration_access(self):
-        return self._sw_calibration_access
+        return self._swCalibrationAccess
 
     @sw_calibration_access.setter
     def sw_calibration_access(self, value):
         if (value not in ("notAccessible", "readOnly", "readWrite")):
             raise ValueError("Invalid SwCalibrationAccess <%s> of ModeDeclarationGroupPrototype <%s>" % (value, self.short_name))
-        self._sw_calibration_access = value
+        self._swCalibrationAccess = value
 
 class MemorySection(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
         
-        self._alignment = None
-        self.sw_addr_method_ref = None  # type: RefType
+        self._alignment = None              # type: ARLiteral
+        self.size = None
+        self._options = []                  # type: List[ARLiteral]
+        self.swAddrMethodRef = None         # type: RefType
+        self.symbol = None                  # type: ARLiteral
+
+    def addOption(self, option: ARLiteral):
+        self._options.append(option)
+
+    def getOptions(self) -> List[ARLiteral]:
+        return self._options
 
     @property
-    def alignment(self) -> str:
+    def alignment(self) -> ARLiteral:
         return self._alignment
 
     @alignment.setter
-    def alignment(self, value:str):
-        match = False
-        if value in ("UNKNOWN", "UNSPECIFIED", "BOOLEAN", "PTR"):
-            self._alignment = value
-            match = True
-        else:
-            m = re.match(r'^\d+', value)
-            if m:
+    def alignment(self, value: ARLiteral):
+        if value is not None:
+            match = False
+            if value.value in ("UNKNOWN", "UNSPECIFIED", "BOOLEAN", "PTR"):
                 self._alignment = value
                 match = True
-                
-        if not match:
-            raise ValueError("Invalid alignment <%s> of memory section <%s>" % (value, self.short_name))
+            else:
+                m = re.match(r'^\d+', value.value)
+                if m:
+                    self._alignment = value
+                    match = True
+                    
+            if not match:
+                raise ValueError("Invalid alignment <%s> of memory section <%s>" % (value, self.short_name))
         
 
 class ResourceConsumption(Identifiable):
@@ -262,4 +283,58 @@ class ResourceConsumption(Identifiable):
         return list(filter(lambda a : isinstance(a, MemorySection), self.elements.values()))
 
     def getMemorySection(self, short_name: str) -> MemorySection:
-        return next(filter(lambda o: isinstance(o, MemorySection) and (o.short_name == short_name), self.elements.values()), None)
+        return next(filter(lambda o: isinstance(o, MemorySection) and (o.short_name == short_name), self.elements.values()), None)
+    
+class Trigger(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.swImplPolicy = None    # type: str
+        self.triggerPeriod = None   # type: float
+
+class ModeRequestTypeMap(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.implementation_data_type_ref = None           # type: RefType
+        self.mode_group_ref = None                        # type: RefType
+
+class ModeDeclarationGroup(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self._initial_mode_ref = None                      # type: RefType
+        self._on_transition_value = None                   # type: ARNumerical
+
+    def createModeDeclaration(self, short_name: str) -> ModeDeclaration:
+        if (short_name not in self.elements):
+            spec = ModeDeclaration(self, short_name)
+            self.elements[short_name] = spec
+        return self.elements[short_name]
+    
+    def getModeDeclarations(self) -> List[ModeDeclaration]:
+        return list(sorted(filter(lambda a: isinstance(a, ModeDeclaration), self.elements.values()), key= lambda o:o.short_name))
+    
+    def setInitialModeRef(self, ref: RefType):
+        self._initial_mode_ref = ref
+        return self
+    
+    def getInitialModeRef(self) -> RefType:
+        return self._initial_mode_ref
+
+    def setOnTransitionValue(self, value):
+        if isinstance(value, int):
+            value = ARNumerical()
+            value.setValue(value)
+        self._on_transition_value = value
+        return self
+    
+    def getOnTransitionValue(self) -> ARNumerical:
+        return self._on_transition_value
+    
+class ModeDeclarationGroupPrototype(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.swCalibrationAccess = None                 # type: str
+        self.type_tref = None                            # type: TRefType

armodel/models/communication.py

@@ -1,4 +1,7 @@
-from . import ARObject
+
+from .data_dictionary import SwDataDefProps
+from .ar_ref import ApplicationCompositeElementInPortInterfaceInstanceRef
+from .ar_object import ARObject
 
 class TransmissionAcknowledgementRequest(ARObject):
     def __init__(self):
@@ -6,3 +9,9 @@ class TransmissionAcknowledgementRequest(ARObject):
 
         self.timeout = None     # type: float
 
+class CompositeNetworkRepresentation(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.leaf_element_iref = None           # type: ApplicationCompositeElementInPortInterfaceInstanceRef
+        self.network_representation = None      # type: SwDataDefProps

armodel/models/data_def_properties.py

@@ -0,0 +1,16 @@
+from typing import List
+from .ar_object import ARFloat, ARLiteral, ARObject
+
+
+class ValueList(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.v = None                                       # type: ARFloat
+        self._vf = []                                       # type: List[ARLiteral]
+
+    def addVf(self, vf: ARLiteral):
+        self._vf.append(vf)
+
+    def getVfs(self) -> List[ARLiteral]:
+        return sorted(self._vf)

armodel/models/data_dictionary.py

@@ -1,17 +1,44 @@
-from .general_structure import ARObject
+from typing import List
+
+from .ar_object import ARFloat, ARLiteral
+from .calibration import SwCalprmAxisSet
+from .annotation import Annotation
+from .general_structure import ARObject, Identifiable
 from .ar_ref import RefType
 
+
+
+class SwDataDefPropsConditional(ARObject):
+    def __init__(self):
+        super().__init__()
+
 class SwDataDefProps(ARObject):
     def __init__(self):
         super().__init__()
 
-        self.base_type_ref = None                   # type: RefType
-        self.compu_method_ref = None                # type: RefType
-        self.data_constr_ref = None                 # type: RefType
-        self.implementation_data_type_ref = None    # type: RefType
-        self.sw_impl_policy = ""
-        self.sw_calibration_access = ""
-        self.sw_pointer_target_props = None         # type: SwPointerTargetProps
+        self._annotations = []                              # type: List[Annotation]
+        self.baseTypeRef = None                             # type: RefType
+        self.compuMethodRef = None                          # type: RefType
+        self.dataConstrRef = None                           # type: RefType
+        self.implementationDataTypeRef = None               # type: RefType
+        self.swImplPolicy = None                            # type: str
+        self.swCalibrationAccess = None                     # type: str
+        self.swCalprmAxisSet = None                         # type: SwCalprmAxisSet
+        self.sw_pointer_target_props = None                    # type: SwPointerTargetProps
+        self.swRecordLayoutRef = None                       # type: RefType
+        self.valueAxisDataTypeRef = None                    # type: RefType
+        self.unitRef = None                                 # type: RefType
+        self.conditional = SwDataDefPropsConditional()      # type: SwDataDefPropsConditional
+
+    def addAnnotation(self, annotation: Annotation):
+        self._annotations.append(annotation)
+
+    def getAnnotations(self) -> List[Annotation]:
+        return self._annotations
+    
+    def setUnitRef(self, ref: RefType):
+        self.unitRef = ref
+        return self
 
 class SwPointerTargetProps(ARObject):
     def __init__(self):
@@ -19,4 +46,14 @@ class SwPointerTargetProps(ARObject):
 
         self.function_pointer_signature = None      # type: RefType
         self.sw_data_def_props = None               # type: SwDataDefProps
-        self.target_category = ""
+        self.target_category = None
+
+class SwAddrMethod(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.memoryAllocationKeywordPolicy = None   # type: MemoryAllocationKeywordPolicyType
+        self.option = []                            # type: str
+        self.sectionInitializationPolicy = None     # type: SectionInitializationPolicyType
+        self.sectionType = None                     # type: MemorySectionType
+    

armodel/models/data_prototype.py

@@ -1,7 +1,10 @@
 from abc import ABCMeta
-from .general_structure import AtpFeature, Identifiable, ARObject
-from .data_dictionary import SwDataDefProps
+
+from .ar_object import ARNumerical
 from .ar_ref import RefType
+from .data_dictionary import SwDataDefProps
+from .common_structure import ValueSpecification
+from .general_structure import AtpFeature, ARObject
 
 class AtpPrototype(AtpFeature, metaclass = ABCMeta):
     def __init__(self, parent:ARObject, short_name: str):
@@ -25,25 +28,41 @@ class AutosarDataPrototype(DataPrototype, metaclass = ABCMeta):
             raise NotImplementedError("AutosarDataPrototype is an abstract class.")
 
         super().__init__(parent, short_name)
-        self.type_tref = RefType()
+
+        self.type_tref = None           
 
 class VariableDataPrototype(AutosarDataPrototype):
     def __init__(self, parent:ARObject, short_name: str):
         super().__init__(parent, short_name)
 
+        self.init_value = None      # type: ValueSpecification
+
 class ApplicationCompositeElementDataPrototype(DataPrototype, metaclass = ABCMeta):
     def __init__(self, parent:ARObject, short_name: str):
         if type(self) == ApplicationCompositeElementDataPrototype:
             raise NotImplementedError("ApplicationCompositeElementDataPrototype is an abstract class.")
 
         super().__init__(parent, short_name)
-        self.type_tref = RefType()
+
+        self.typeTRef = None                    # type: RefType
 
 class ApplicationArrayElement(ApplicationCompositeElementDataPrototype):
     def __init__(self, parent:ARObject, short_name: str):
         super().__init__(parent, short_name)
 
+        self.arraySizeHandling = None               # type: str
+        self.arraySizeSemantics = None              # type: str
+        self.indexDataTypeRef = None                # type: RefType
+        self.maxNumberOfElements = None             # type: ARNumerical
+
 class ApplicationRecordElement(ApplicationCompositeElementDataPrototype):
     def __init__(self, parent:ARObject, short_name: str):
         super().__init__(parent, short_name)
-        self.is_optional = None
+
+        self.isOptional = None
+
+class ParameterDataPrototype(AutosarDataPrototype):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.init_value = None      # type: ValueSpecification

armodel/models/datatype.py

@@ -1,12 +1,13 @@
 from abc import ABCMeta
 from typing import List
 
+from .ar_object import ARLiteral, ARNumerical
+from .ar_ref import RefType
 from .ar_package import Referrable
-from .general_structure import ARElement, ARObject
-from .data_prototype import ApplicationRecordElement
+from .general_structure import ARElement, ARObject, Identifiable
+from .data_prototype import ApplicationCompositeElementDataPrototype, ApplicationRecordElement
 from .data_dictionary import SwDataDefProps
-from .common_structure import ImplementationDataTypeElement
-
+from .common_structure import ImplementationDataTypeElement, ModeRequestTypeMap
 
 class ImplementationProps(Referrable, metaclass=ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
@@ -29,9 +30,9 @@ class BaseTypeDirectDefinition(BaseTypeDefinition):
         super().__init__()
 
         self.base_type_encoding = None
-        self.base_type_size = None          # type: int
-        self.byte_order = None              # type: str
-        self.mem_alignment = None
+        self.base_type_size = None                # type: ARNumerical
+        self.byteOrder = None                   # type: str
+        self.mem_alignment = None                # type: ARNumerical
         self.native_declaration = None      
 
 class BaseType(ARElement, metaclass=ABCMeta):
@@ -41,7 +42,7 @@ class BaseType(ARElement, metaclass=ABCMeta):
 
         super().__init__(parent, short_name)
 
-        self.base_type_definition = BaseTypeDirectDefinition()
+        self.baseTypeDefinition = BaseTypeDirectDefinition()
 
 class SwBaseType(BaseType):
     def __init__(self, parent: ARObject, short_name: str):
@@ -84,15 +85,45 @@ class ApplicationCompositeDataType(ApplicationDataType, metaclass=ABCMeta):
 
         super().__init__(parent, short_name)
 
+class ApplicationArrayElement(ApplicationCompositeElementDataPrototype):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.arraySizeHandling = None               # type: str
+        self.arraySizeSemantics = None              # type: str
+        self.indexDataTypeRef = None                # type: RefType
+        self.maxNumberOfElements = None             # type: ARNumerical
+
+    def setArraySizeHandling(self, handling: str):
+        self.arraySizeHandling = handling
+        return self
+    
+    def setArraySizeSemantics(self, semantics: str):
+        self.arraySizeSemantics = semantics
+        return self
+    
+    def setIndexDataTypeRef(self, ref: RefType):
+        self.indexDataTypeRef = ref
+        return self
+    
+    def setMaxNumberOfElements(self, number: ARNumerical):
+        self.maxNumberOfElements = number
+        return self
 
 class ApplicationArrayDataType(ApplicationCompositeDataType):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.dynamic_array_size_profile = ""
-        self.element = None
-
+        self.dynamic_array_size_profile = None      # type: ARLiteral
+        self.element = None                         # type: ApplicationArrayElement
 
+    def createApplicationArrayElement(self, short_name: str) -> ApplicationArrayElement:
+        if (short_name not in self.elements):
+            array_element = ApplicationArrayElement(self, short_name)
+            self.elements[short_name] = array_element
+            self.element = self.elements[short_name]
+        return self.elements[short_name]
+    
 class ApplicationRecordDataType(ApplicationCompositeDataType):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -126,9 +157,10 @@ class ImplementationDataType(AbstractImplementationDataType):
 
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
-        self.sub_elements = []      # List(str)
-        self.symbol_props = None    # SymbolProps
-        self.type_emitter = None
+        
+        self.sub_elements = []      # type: List[str]
+        self.symbol_props = None    # type: ARLiteral
+        self._type_emitter = None    # type: ARLiteral
 
         self._array_type = None     # ImplementationDataType
 
@@ -152,21 +184,38 @@ class ImplementationDataType(AbstractImplementationDataType):
 
     def setArrayElementType(self, type: str):
         self._array_type = type
+        return self
+
+    def setTypeEmitter(self, emitter: str):
+        self._type_emitter = emitter
+        return self
+    
+    def getTypeEmitter(self) -> str:
+        return self._type_emitter
 
 
 class DataTypeMap(ARObject):
     def __init__(self):
-        self.application_data_type_ref = None  # type: RefType
-        self.implementation_data_type_ref = None  # type: RefType
-
+        self.application_data_type_ref = None       # type: RefType
+        self.implementation_data_type_ref = None    # type: RefType
 
 class DataTypeMappingSet(ARElement):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
-        self.data_type_maps = []  # type: List[DataTypeMap]
+        
+        self._dataTypeMaps = []                     # type: List[DataTypeMap]
+        self._modeRequestTypeMaps = []              # type: List[ModeRequestTypeMap]
 
     def addDataTypeMap(self, type_map: DataTypeMap):
-        self.data_type_maps.append(type_map)
+        self._dataTypeMaps.append(type_map)
 
     def getDataTypeMaps(self) -> List[DataTypeMap]:
-        return self.data_type_maps
+        return self._dataTypeMaps
+    
+    def addModeRequestTypeMap(self, map: ModeRequestTypeMap):
+        self._modeRequestTypeMaps.append(map)
+
+    def getModeRequestTypeMaps(self) -> List[ModeRequestTypeMap]:
+        return self._modeRequestTypeMaps
+    
+

armodel/models/end_to_end_protection.py

@@ -0,0 +1,67 @@
+from typing import List
+
+from .ar_ref import VariableDataPrototypeInSystemInstanceRef
+from .ar_object import ARNumerical, ARObject
+from .general_structure import Identifiable
+
+
+class EndToEndDescription(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.category = None                # type: str
+        self.counterOffset = None           # type: int
+        self.crcOffset = None               # type: int
+        self.dataIds = []                   # type: List[ARNumerical]
+        self.dataIdMode = None              # type: int
+        self.dataIdNibbleOffset = None      # type: int
+        self.dataLength = None              # type: int
+        self.maxDeltaCounterInit = None     # type: int
+        self.maxNoNewOrRepeatedData = None  # type: int
+        self.syncCounterInit = None         # type: int
+
+    def addDataId(self, id: ARNumerical):
+        self.dataIds.append(id)
+    
+    def getDataIds(self) -> List[ARNumerical]:
+        return sorted(self.dataIds, key = lambda a: a) 
+
+class EndToEndProtectionVariablePrototype(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self._receiverIRefs = []            # type: List[VariableDataPrototypeInSystemInstanceRef]
+        self.senderIRef = None             # type: VariableDataPrototypeInSystemInstanceRef
+        self.shortLabel = None              # type: str
+
+    def addReceiverIref(self, iref: VariableDataPrototypeInSystemInstanceRef):
+        self._receiverIRefs.append(iref)
+
+    def getReceiverIrefs(self) -> List[VariableDataPrototypeInSystemInstanceRef]:
+        return self._receiverIRefs
+
+class EndToEndProtection(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.endToEndProfile = None                         # type: EndToEndDescription
+        self.endToEndProtectionVariablePrototype = []       # type: List[EndToEndProtectionVariablePrototype]
+
+    def addEndToEndProtectionVariablePrototype(self, prototype: EndToEndProtectionVariablePrototype):
+        self.endToEndProtectionVariablePrototype.append(prototype)
+
+    def getEndToEndProtectionVariablePrototypes(self) -> List[EndToEndProtectionVariablePrototype]:
+        return self.endToEndProtectionVariablePrototype
+
+class EndToEndProtectionSet(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+    def createEndToEndProtection(self, short_name: str) -> EndToEndProtection:
+        if (short_name not in self.elements):
+            protection = EndToEndProtection(self, short_name)
+            self.elements[short_name] = protection
+        return self.elements[short_name]
+    
+    def getEndToEndProtections(self) -> List[EndToEndProtection]:
+        return sorted(filter(lambda c: isinstance(c, EndToEndProtection), self.elements.values()), key= lambda e: e.short_name)