armodel 1.7.2__py3-none-any.whl → 1.7.3__py3-none-any.whl

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/__init__.py

@@ -8,7 +8,7 @@ from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDa
 from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PerInstanceMemory import PerInstanceMemory
 from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents import AsynchronousServerCallReturnsEvent, DataReceivedEvent, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, RTEEvent, SwcModeSwitchEvent, TimingEvent
 from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import SwcServiceDependency
-from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, RefType, ARBoolean
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, Boolean, RefType, ARBoolean
 from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.DataElements import ParameterAccess, VariableAccess
 from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServerCall import ServerCallPoint
 from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ModeDeclarationGroup import ModeAccessPoint, ModeSwitchPoint
@@ -224,38 +224,47 @@ class SwcInternalBehavior(InternalBehavior):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.handle_termination_and_restart = None      # type: str
-        self.supports_multiple_instantiation = None     # type: ARBoolean
-        self.explicit_inter_runnable_variables = []     # type: List[VariableDataPrototype]
-        self.implicit_inter_runnable_variables = []     # type: List[VariableDataPrototype]
-        self.per_instance_memories = []                 # type: List[PerInstanceMemory]
-        self.per_instance_parameters = []               # type: List[ParameterDataPrototype]
-        self.port_api_options = []                      # type: List[PortAPIOption]
-        self.included_data_type_sets = []               # type: List[IncludedDataTypeSet]
+        self.arTypedPerInstanceMemories = []                        # type: List[VariableDataPrototype]
+        self.events = []                                            # type: List[RTEEvent]
+        self.exclusiveAreaPolicies = []                             # type: List[SwcExclusiveAreaPolicy]
+        self.explicitInterRunnableVariables = []                    # type: List[VariableDataPrototype]
+        self.handleTerminationAndRestart = None      # type: str
+        self.implicitInterRunnableVariables = []                    # type: List[VariableDataPrototype]
+        self.includedDataTypeSets = []                              # type: List[IncludedDataTypeSet]
+        self.includedModeDeclarationGroupSets = []                  # type: List[IncludedModeDeclarationGroupSet]
+        self.instantiationDataDefProps = []                         # type: List[InstantiationDataDefProps]
+        self.perInstanceMemories = []                               # type: List[PerInstanceMemory]
+        self.perInstanceParameters = []                             # type: List[ParameterDataPrototype]
+        self.portAPIOptions = []                                    # type: List[PortAPIOption]
+        self.runnables = []                                         # type: List[RunnableEntity]
+        self.serviceDependencies = []                               # type: List[SwcServiceDependency]
+        self.sharedParameters = []                                  # type: List[ParameterDataPrototype]
+        self.supportsMultipleInstantiation = None                   # type: Boolean
+        self.variationPointProxies = []                             # type: VariationPointProxy
 
     def getExplicitInterRunnableVariables(self) -> List[VariableDataPrototype]:
-        return self.explicit_inter_runnable_variables
+        return self.explicitInterRunnableVariables
 
     def getImplicitInterRunnableVariables(self) -> List[VariableDataPrototype]:
-        return self.implicit_inter_runnable_variables
+        return self.implicitInterRunnableVariables
 
     def getPerInstanceMemories(self) -> List[PerInstanceMemory]:
-        return self.per_instance_memories
+        return self.perInstanceMemories
 
     def getPerInstanceParameters(self) -> List[ParameterDataPrototype]:
-        return self.per_instance_parameters
+        return self.perInstanceParameters
 
     def addPortAPIOption(self, option: PortAPIOption):
-        self.port_api_options.append(option)
+        self.portAPIOptions.append(option)
 
     def getPortAPIOptions(self) -> List[PortAPIOption]:
-        return self.port_api_options
+        return self.portAPIOptions
 
     def addIncludedDataTypeSet(self, set: IncludedDataTypeSet):
-        self.included_data_type_sets.append(set)
+        self.includedDataTypeSets.append(set)
 
     def getIncludedDataTypeSets(self) -> List[IncludedDataTypeSet]:
-        return self.included_data_type_sets
+        return self.includedDataTypeSets
 
     def createOperationInvokedEvent(self, short_name: str) -> OperationInvokedEvent:
         if (short_name not in self.elements):
@@ -338,28 +347,28 @@ class SwcInternalBehavior(InternalBehavior):
         if (short_name not in self.elements):
             prototype = VariableDataPrototype(self, short_name)
             self.elements[short_name] = prototype
-            self.explicit_inter_runnable_variables.append(prototype)
+            self.explicitInterRunnableVariables.append(prototype)
         return self.elements[short_name]
 
     def createImplicitInterRunnableVariable(self, short_name: str) -> VariableDataPrototype:
         if (short_name not in self.elements):
             prototype = VariableDataPrototype(self, short_name)
             self.elements[short_name] = prototype
-            self.implicit_inter_runnable_variables.append(prototype)
+            self.implicitInterRunnableVariables.append(prototype)
         return self.elements[short_name]
 
     def createPerInstanceMemory(self, short_name: str) -> PerInstanceMemory:
         if (short_name not in self.elements):
             memory = PerInstanceMemory(self, short_name)
             self.elements[short_name] = memory
-            self.per_instance_memories.append(memory)
+            self.perInstanceMemories.append(memory)
         return self.elements[short_name]
 
     def createPerInstanceParameter(self, short_name: str) -> ParameterDataPrototype:
         if (short_name not in self.elements):
             prototype = ParameterDataPrototype(self, short_name)
             self.elements[short_name] = prototype
-            self.per_instance_parameters.append(prototype)
+            self.perInstanceParameters.append(prototype)
         return self.elements[short_name]
 
     def getVariableDataPrototypes(self) -> List[VariableDataPrototype]:
@@ -377,3 +386,9 @@ class SwcInternalBehavior(InternalBehavior):
     def getRunnableEntity(self, short_name) -> RunnableEntity:
         return self.elements[short_name]
 
+    def getSupportsMultipleInstantiation(self):
+        return self.supportsMultipleInstantiation
+
+    def setSupportsMultipleInstantiation(self, value):
+        self.supportsMultipleInstantiation = value
+        return self

armodel/models/M2/AUTOSARTemplates/SystemTemplate/DataMapping.py

@@ -1,6 +1,8 @@
 from abc import ABCMeta
+
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import CommunicationDirectionType
 
 class DataMapping(ARObject, metaclass = ABCMeta):
     def __init__(self):
@@ -18,16 +20,23 @@ class DataMapping(ARObject, metaclass = ABCMeta):
         self.introduction = value
         return self
 
-
 class SenderReceiverToSignalMapping(DataMapping):
     def __init__(self):
         super().__init__()
 
+        self.communicationDirection = None                          # type: CommunicationDirectionType
         self.dataElementIRef = None
         self.senderToSignalTextTableMapping = None
         self.signalToReceiverTextTableMapping = None
         self.systemSignalRef = None
 
+    def getCommunicationDirection(self):
+        return self.communicationDirection
+
+    def setCommunicationDirection(self, value):
+        self.communicationDirection = value
+        return self
+
     def getDataElementIRef(self):
         return self.dataElementIRef
 

armodel/models/M2/MSR/AsamHdo/ComputationMethod.py

@@ -87,7 +87,6 @@ class CompuConstTextContent(CompuConstContent):
         return self
 
 class CompuConstNumericContent(CompuConstContent):
-
     def __init__(self):
         super().__init__()
 
@@ -99,6 +98,22 @@ class CompuConstNumericContent(CompuConstContent):
     def setV(self, value):
         self.v = value
         return self
+    
+class CompuConstFormulaContent(CompuConstContent):
+    def __init__(self):
+        super().__init__()
+
+        self.vf = None
+
+    def getVf(self):
+        return self.vf
+
+    def setVf(self, value):
+        self.vf = value
+        return self
+
+
+
 
 class CompuScaleContents(ARObject, metaclass=ABCMeta):
     def __init__(self):

armodel/models/M2/MSR/CalibrationData/CalibrationValue.py

@@ -1,4 +1,6 @@
 from typing import List
+
+from ....M2.MSR.AsamHdo.Units import SingleLanguageUnitNames
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical, RefType
 from ....M2.MSR.DataDictionary.DataDefProperties import ValueList
@@ -21,6 +23,35 @@ class SwValueCont(ARObject):
     def __init__(self):
         super().__init__()
 
-        self.sw_arraysize = None         # type: ValueList
-        self.unit_ref = None             # type: RefType
-        self.sw_values_phys = None        # type: SwValues
+        self.swArraysize = None             # type: ValueList
+        self.swValuesPhys = None            # type: SwValues
+        self.unitRef = None                 # type: RefType
+        self.unitDisplayName = None         # type: SingleLanguageUnitNames
+
+    def getSwArraysize(self):
+        return self.swArraysize
+
+    def setSwArraysize(self, value):
+        self.swArraysize = value
+        return self
+
+    def getSwValuesPhys(self):
+        return self.swValuesPhys
+
+    def setSwValuesPhys(self, value):
+        self.swValuesPhys = value
+        return self
+
+    def getUnitRef(self):
+        return self.unitRef
+
+    def setUnitRef(self, value):
+        self.unitRef = value
+        return self
+
+    def getUnitDisplayName(self):
+        return self.unitDisplayName
+
+    def setUnitDisplayName(self, value):
+        self.unitDisplayName = value
+        return self

armodel/models/M2/MSR/DataDictionary/DataDefProperties.py

@@ -296,6 +296,13 @@ class ValueList(ARObject):
         self.v = None                                       # type: ARFloat
         self._vf = []                                       # type: List[ARLiteral]
 
+    def getV(self):
+        return self.v
+
+    def setV(self, value):
+        self.v = value
+        return self
+
     def addVf(self, vf: ARLiteral):
         self._vf.append(vf)
 

armodel/models/M2/MSR/DataDictionary/ServiceProcessTask.py

@@ -0,0 +1,33 @@
+from ....M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps, ValueList
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ArgumentDirectionEnum
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+
+class SwServiceArg(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.direction = None                   # type: ArgumentDirectionEnum
+        self.swArraysize = None                 # type: ValueList
+        self.swDataDefProps = None              # type: SwDataDefProps
+
+    def getDirection(self):
+        return self.direction
+
+    def setDirection(self, value):
+        self.direction = value
+        return self
+
+    def getSwArraysize(self):
+        return self.swArraysize
+
+    def setSwArraysize(self, value):
+        self.swArraysize = value
+        return self
+
+    def getSwDataDefProps(self):
+        return self.swDataDefProps
+
+    def setSwDataDefProps(self, value):
+        self.swDataDefProps = value
+        return self

armodel/models/__init__.py

@@ -22,11 +22,14 @@ from .M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import *
 from .M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import *
 from .M2.AUTOSARTemplates.CommonStructure import *
 from .M2.AUTOSARTemplates.CommonStructure.Filter import *
+from .M2.AUTOSARTemplates.CommonStructure.FlatMap import *
 from .M2.AUTOSARTemplates.CommonStructure.Implementation import *
 from .M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import *
 from .M2.AUTOSARTemplates.CommonStructure.InternalBehavior import *
 from .M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import *
 from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption import *
+from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.HeapUsage import *
+from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.StackUsage import *
 from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.MemorySectionUsage import *
 from .M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import *
 from .M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import *

armodel/parser/abstract_arxml_parser.py

@@ -133,6 +133,7 @@ class AbstractARXMLParser:
         float_value = None
         if (child_element is not None) and (child_element.text is not None):
             float_value = ARFloat()
+            self.readARObjectAttributes(child_element, float_value)
             float_value.setValue(child_element.text)
         return float_value
     
@@ -162,7 +163,9 @@ class AbstractARXMLParser:
 
     def getChildElementOptionalBooleanValue(self, element: ET.Element, key: str) -> Boolean:
         literal = self.getChildElementOptionalLiteral(element, key)
-        if (literal == None):
+        if literal == None:
+            return None
+        if literal.getText() == "":
             return None
         bool_value = Boolean()
         bool_value.timestamp = literal.timestamp
@@ -175,19 +178,6 @@ class AbstractARXMLParser:
             return int(m.group(1), 16)
         return int(value)
 
-    '''
-    def getChildElementNumberValue(self, short_name: str, element: ET.Element, key: str) -> int:
-        value = self.getChildElement(short_name, element, key)
-        return self._convertStringToNumberValue(value)
-    
-
-    def getChildElementOptionalNumberValue(self, element: ET.Element, key: str) -> int:
-        value = self.getChildElementOptionalValue(element, key)
-        if (value == None):
-            return None
-        return self._convertStringToNumberValue(value)
-    '''
-    
     def getChildElementOptionalNumericalValue(self, element: ET.Element, key: str) -> ARNumerical:
         child_element = self.find(element, key)
         if child_element == None: