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

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,16 +15,34 @@ 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 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:
@@ -95,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,7 +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
+from .ar_object import ARBoolean, ARFloat, ARLiteral, ARNumerical, ARPositiveInteger
 from .common_structure import ExecutableEntity, ModeDeclarationGroupPrototype, InternalBehavior, Identifiable
 from .ar_ref import RefType
 
@@ -11,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):
@@ -47,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):
@@ -79,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):
@@ -95,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]:
@@ -114,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]:
@@ -141,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]:
@@ -150,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):
     '''
@@ -169,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:
@@ -190,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:
         '''
@@ -222,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: ARBoolean
-        self.is_synchronous = None              # type: ARBoolean
-        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):

armodel/models/calibration.py

@@ -1,16 +1,119 @@
-from .ar_object import ARObject
+from abc import ABCMeta
+from typing import List
+
+from .ar_object import ARFloat, ARNumerical, ARObject
 from .ar_ref import RefType
+from .data_def_properties import ValueList
 
 class SwValues(ARObject):
     def __init__(self):
         super().__init__()
 
-        self.v = None                   # type: float
+        self._v = []                    # type: List[ARNumerical]
+        self.vt = None                  # type: float
+
+    def addV(self, v: ARNumerical):
+        self._v.append(v)
 
+    def getVs(self) -> List[ARNumerical]:
+        return self._v
+    
 class SwValueCont(ARObject):
     def __init__(self):
         super().__init__()
 
-        self.unit_ref = None            # type: RefType
-        self.sw_values_phys = None      # type: SwValues
+        self.sw_arraysize = None         # type: ValueList
+        self.unit_ref = None             # type: RefType
+        self.sw_values_phys = None        # type: SwValues
+
+class SwGenericAxisParam(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.swGenericAxisParamTypeRef = None   # type: RefType
+        self.vf = []                            # type: List[ARFloat]
+class SwAxisGeneric(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.swAxisTypeRef = None               # type: RefType
+        self.swGenericAxisParam = []            # type: List[SwGenericAxisParam]
+
+class SwCalprmAxisTypeProps(ARObject, metaclass = ABCMeta):
+    def __init__(self):
+        if type(self) == SwCalprmAxisTypeProps:
+            raise NotImplementedError("SwCalprmAxisTypeProps is an abstract class.")
+        
+        super().__init__()
+        
+        self.maxGradient = None         # type: ARFloat
+        self.monotony = None            # type: MonotonyEnum
+
+class SwAxisIndividual(SwCalprmAxisTypeProps):
+    def __init__(self):
+        super().__init__()
+
+        self.compuMethodRef = None              # type: RefType
+        self.dataConstrRef = None               # type: RefType
+        self.inputVariableTypeRef = None        # type: RefType
+        self.swAxisGeneric = None               # type: SwAxisGeneric
+        self.swMaxAxisPoints = None             # type: ARNumerical
+        self.swMinAxisPoints = None             # type: ARNumerical
+        self.swVariableRefs = []                # type: List
+        self.unitRef = None                     # type: RefType
+
+    def setInputVariableTypeRef(self, ref: RefType):
+        self.inputVariableTypeRef = ref
+        return self
+    
+    def setCompuMethodRef(self, ref: RefType):
+        self.compuMethodRef = ref
+        return self
+    
+    def setSwMaxAxisPoints(self, points: int):
+        self.swMaxAxisPoints = points
+        return self
+    
+    def setSwMinAxisPoints(self, points: int):
+        self.swMinAxisPoints = points
+        return self
+    
+    def setDataConstrRef(self, ref: RefType):
+        self.dataConstrRef = ref
+        return self
+
+class SwAxisGrouped(SwCalprmAxisTypeProps):
+    def __init__(self):
+        super().__init__()
+
+        self.sharedAxisTypeRef = None           # type: RefType
+        self.swAxisIndex = None                 # type: ARNumerical
+        self.swCalprmRef = None                 # type: SwCalprmRefProxy
+
+    def setSharedAxisTypeRef(self, ref: RefType):
+        self.sharedAxisTypeRef = ref
+        return self
+
+class SwCalprmAxis(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.category = None                # type: CalprmAxisCategoryEnum
+        self.displayFormat = None           # type: DisplayFormatString
+        self.sw_axis_index = None             # type: AxisIndexType   
+        self.swCalibrationAccess = None     # type: SwCalibrationAccessEnum
+        self.sw_calprm_axis_type_props = None   # type: SwCalprmAxisTypeProps
+
+class SwCalprmAxisSet(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self._swCalprmAxis = []          # type: List[SwCalprmAxis]
+
+    def addSwCalprmAxis(self, axis: SwCalprmAxis):
+        self._swCalprmAxis.append(axis)
+
+    def getSwCalprmAxises(self) -> List[SwCalprmAxis]:
+        return self._swCalprmAxis
+