armodel 1.6.2__py3-none-any.whl → 1.6.4__py3-none-any.whl

armodel/models/{general_structure.py → M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/Identifiable.py}

@@ -1,99 +1,22 @@
+from .....M2.MSR.AsamHdo.AdminData import AdminData
+from .....M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName
+from .....M2.MSR.Documentation.Annotation import Annotation
+from .....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
 from abc import ABCMeta
 from typing import List
 
-from .annotation import Annotation
-from .ar_ref import RefType
-from .multilanguage_data import MultiLanguageOverviewParagraph, MultilanguageLongName
-from .ar_object import ARObject, ARLiteral
-
-class Sd(ARObject):
-    def __init__(self):
-        super().__init__()
-
-        self.gid = ""
-        self.value = ""
-
-    def getGID(self):
-        return self.gid
-
-    def setGID(self, value):
-        self.gid = value
-        return self
-
-    def getValue(self):
-        return self.value
-
-    def setValue(self, value):
-        self.value = value
-        return self
-class Sdg(ARObject):
-    def __init__(self):
-        super().__init__()
-
-        self.gid = ""
-        self.sd = []                        # type: List[Sd]
-        self.sdgCaption = None
-        self.sdgContentsTypes = []          # type: List[Sdg]
-
-    def getGID(self):
-        return self.gid
-
-    def setGID(self, value):
-        self.gid = value
-        return self
-
-    def addSd(self, sd: Sd):
-        self.sd.append(sd)
-        return self
-
-    def getSds(self) -> List[Sd]:
-        return self.sd
-    
-    def getSdgCaption(self):
-        return self.sdgCaption
-
-    def setSdgCaption(self, value):
-        self.sdgCaption = value
-        return self
-    
-    def addSdgContentsType(self, sdg):
-        self.sdgContentsTypes.append(sdg)
-
-    def getSdgContentsTypes(self):
-        return self.sdgContentsTypes
-    
-class AdminData(ARObject):
-    def __init__(self):
-        super().__init__()
-
-        self.doc_revision = []
-        self.language = None
-        self.sdg = []
-        self.used_languages = None
-
-    def addSdg(self, sdg: Sdg):
-        self.sdg.append(sdg)
-
-    def getSdgs(self) -> List[Sdg]:
-        return self.sdg
-
-class Referrable(ARObject, metaclass=ABCMeta):
+class Referrable(ARObject, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
+
         if type(self) == Referrable:
             raise NotImplementedError("Referrable is an abstract class.")
         ARObject.__init__(self)
 
-        self._parent = parent
+        self.parent = parent
         self.short_name = short_name
 
-    @property
-    def parent(self):
-        return self._parent
-
-    @parent.setter
-    def parent(self, value):
-        self._parent = value
-
     @property
     def shortName(self):
         return self.short_name
@@ -104,19 +27,22 @@ class Referrable(ARObject, metaclass=ABCMeta):
 
     def getShortName(self) -> str:
         return self.short_name
+    
+    def getParent(self):
+        return self.parent
 
     @property
     def full_name(self) -> str:
-        return self._parent.full_name + "/" + self.short_name
-    
+        return self.parent.full_name + "/" + self.short_name
+
     def getFullName(self) -> str:
         return self.full_name
-    
+
 class MultilanguageReferrable(Referrable, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         if type(self) == MultilanguageReferrable:
             raise NotImplementedError("MultilanguageReferrable is an abstract class.")
-        
+
         super().__init__(parent, short_name)
 
         #self._parent = parent
@@ -128,16 +54,18 @@ class MultilanguageReferrable(Referrable, metaclass = ABCMeta):
     def setLongName(self, value: MultilanguageLongName):
         self.longName = value
         return self
+
+
 class CollectableElement(ARObject, metaclass = ABCMeta):
     def __init__(self):
         if type(self) == CollectableElement:
             raise NotImplementedError("CollectableElement is an abstract class.")
-        self.elements = {}              # type: dict[str, PackageableElement]
+        self.elements = {}              # type: dict[str, Referrable]
 
     def getTotalElement(self) -> int:
         #return len(list(filter(lambda a: not isinstance(a, ARPackage) , self.elements.values())))
         return len(self.elements.values())
-    
+
     def removeElement(self, key):
         if key not in self.elements:
             raise KeyError("Invalid key <%s> for removing element" % key)
@@ -145,7 +73,7 @@ class CollectableElement(ARObject, metaclass = ABCMeta):
 
     def getElements(self):
         return self.elements.values()
-    
+
     def addElement(self, element: Referrable):
         self.elements[element.getShortName()] = element
 
@@ -154,7 +82,7 @@ class CollectableElement(ARObject, metaclass = ABCMeta):
             return None
         return self.elements[short_name]
 
-class Identifiable(MultilanguageReferrable, CollectableElement, metaclass=ABCMeta):
+class Identifiable(MultilanguageReferrable, CollectableElement, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         if type(self) == Identifiable:
             raise NotImplementedError("Identifiable is an abstract class.")
@@ -172,7 +100,7 @@ class Identifiable(MultilanguageReferrable, CollectableElement, metaclass=ABCMet
     def setAdminData(self, value):
         self.adminData = value
         return self
-    
+
     def getDesc(self):
         return self.desc
 
@@ -186,19 +114,34 @@ class Identifiable(MultilanguageReferrable, CollectableElement, metaclass=ABCMet
     def setCategory(self, value):
         self.category = value
         return self
-    
+
     def addAnnotation(self, annotation: Annotation):
         self.annotations.append(annotation)
         return self
-    
+
     def getAnnotations(self) -> List[Annotation]:
         return self.annotations
-    
+
+
+class PackageableElement(Identifiable, metaclass=ABCMeta):
+    def __init__(self, parent: ARObject, short_name: str):
+        if type(self) == PackageableElement:
+            raise NotImplementedError("PackageableElement is an abstract class.")
+        super().__init__(parent, short_name)
+
+
+class ARElement(PackageableElement, metaclass=ABCMeta):
+    def __init__(self, parent: ARObject, short_name: str):
+        if type(self) == ARElement:
+            raise NotImplementedError("ARElement is an abstract class.")
+        super().__init__(parent, short_name)
+
+
 class Describable(ARObject, metaclass=ABCMeta):
     def __init__(self):
         if type(self) == Describable:
             raise NotImplementedError("Describable is an abstract class.")
-        
+
         super().__init__()
 
         self._desc = None
@@ -222,64 +165,4 @@ class Describable(ARObject, metaclass=ABCMeta):
     def category(self, value: ARLiteral):
         self._category = value
 
-class AtpFeature(Identifiable, metaclass=ABCMeta):
-    def __init__(self, parent: ARObject, short_name: str):
-        if type(self) == AtpFeature:
-            raise NotImplementedError("AtpFeature is an abstract class.")
-        super().__init__(parent, short_name)
-
-class PackageableElement(Identifiable, metaclass=ABCMeta):
-    def __init__(self, parent: ARObject, short_name: str):
-        if type(self) == PackageableElement:
-            raise NotImplementedError("PackageableElement is an abstract class.")
-        super().__init__(parent, short_name)
-
-class SwcBswRunnableMapping(ARObject):
-    def __init__(self):
-        '''
-            Maps a BswModuleEntity to a RunnableEntity if it is implemented as part of a BSW
-            module (in the case of an AUTOSAR Service, a Complex Driver or an ECU
-            Abstraction). The mapping can be used by a tool to find relevant information on the
-            behavior, e.g. whether the bswEntity shall be running in interrupt context.
-
-        '''
-        super().__init__()
-
-        self.bswEntityRef   = None        # type: RefType
-        self.swcRunnableRef = None        # type: RefType
-
-class SwcBswMapping(Identifiable):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.bswBehaviorRef = None              # type: RefType
-        self._runnableMappings = []
-        self.swcBehaviorRef = None              # type: RefType
-        self.synchronizedModeGroups = []       
-        self.synchronizedTriggers = []
-
-    def addRunnableMapping(self, mapping: SwcBswRunnableMapping):
-        self._runnableMappings.append(mapping)
-
-    def getRunnableMappings(self) -> List[SwcBswRunnableMapping]:
-        return self._runnableMappings
-
-class ARElement(PackageableElement, metaclass=ABCMeta):
-    def __init__(self, parent: ARObject, short_name: str):
-        if type(self) == ARElement:
-            raise NotImplementedError("ARElement is an abstract class.")
-        super().__init__(parent, short_name)
-        
-
-class AtpStructureElement(AtpFeature, metaclass=ABCMeta):
-    def __init__(self, parent: ARObject, short_name: str):
-        if type(self) == AtpFeature:
-            raise NotImplementedError("AtpStructureElement is an abstract class.")
-        super().__init__(parent, short_name)
-
-class Limit(ARObject):
-    def __init__(self):
-        super().__init__()
 
-        self.intervalType = None       # type: str
-        self.value = None               # type: str

armodel/models/{ar_object.py → M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/PrimitiveTypes.py}

@@ -1,71 +1,30 @@
 from abc import ABCMeta
 import re
-from typing import Dict, List
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
-import xml.etree.cElementTree as ET
-
-
-class ARObject(metaclass=ABCMeta):
-    def __init__(self):
-        if type(self) == ARObject:
-            raise NotImplementedError("ARObject is an abstract class.")
-        
-        self.parent = None              # type: ARObject
-        self.checksum = None            # type: str
-
-        self.timestamp = None           # type: str
-        self.uuid = None                # type: str
-
-    def getTagName(self, tag: str, nsmap: Dict) -> str:
-        return tag.replace("{%s}" % nsmap["xmlns"], "")
-    
-class ARType(metaclass=ABCMeta):
+class ARType(metaclass = ABCMeta):
     def __init__(self) -> None:
         self.timestamp = None           # type: str   
         self.uuid = None                # type: str
-        self._value = None              
+        self._value = None
 
     @property
     def value(self):
         return self._value
-    
+
     @value.setter
     def value(self, val):
         self._value = val
 
     def getValue(self):
         return self.value
-    
+
     def setValue(self, val):
         self.value = val
 
     def getText(self) -> str:
         return str(self)
 
-        
-class ARLiteral(ARType):
-    def __init__(self) -> None:
-        super().__init__()              
-
-    @property
-    def value(self) -> str:
-        if self._value is None:
-            return ""
-        return self._value
-    
-    @value.setter
-    def value(self, val: any):
-        if isinstance(val, str):
-            self._value = val
-        else:
-            self._value = str(val)
-    
-    def __str__(self) -> str:
-        return self.value
-    
-    def upper(self) -> str:
-        return self.value.upper()
-
 class ARNumerical(ARType):
     def __init__(self) -> None:
         super().__init__()
@@ -82,17 +41,20 @@ class ARNumerical(ARType):
                 m = re.match(r"0x([0-9a-f]+)", value, re.I)
                 if m:
                     return int(m.group(1), 16)
+                m = re.match(r'0b([\d]+)', value, re.I)
+                if m:
+                    return int(m.group(1), 2)
                 m = re.match(r"-?\d+\.\d+", value)
                 if m:
                     return float(value)
                 return int(value)
         except:
             raise ValueError("Invalid Numerical Type <%s>" % value)
-    
+
     @property
     def value(self) -> int:
         return self._value
-    
+
     @value.setter
     def value(self, val: any):
         if isinstance(val, int):
@@ -108,26 +70,7 @@ class ARNumerical(ARType):
             return self._text
         else:
             return str(self._value)
-    
-class ARPositiveInteger(ARNumerical):
-    def __init__(self) -> None:
-        super().__init__()
 
-    @property
-    def value(self) -> int:
-        return self._value
-    
-    @value.setter
-    def value(self, val: any):
-        if isinstance(val, int):
-            if val < 0:
-                raise ValueError("Invalid Positive Integer <%s>" % val)
-            self._value = val
-        elif isinstance(val, str):
-            self._text = val
-            self._value = self._convertStringToNumberValue(val)
-        else:
-            raise ValueError("Unsupported Type <%s>", type(val))
 
 class ARFloat(ARNumerical):
     def __init__(self) -> None:
@@ -138,7 +81,7 @@ class ARFloat(ARNumerical):
     @property
     def value(self) -> float:
         return self._value
-    
+
     @value.setter
     def value(self, val: any):
         if isinstance(val, float):
@@ -158,11 +101,74 @@ class ARFloat(ARNumerical):
         else:
             return str(self._value)
         
+class TimeValue(ARFloat):
+    '''
+        This primitive type is taken for expressing time values. The numerical value is supposed to be interpreted
+        in the physical unit second.
+        Tags:
+            * xml.xsd.customType=TIME-VALUE
+            * xml.xsd.type=double
+    '''
+
+    def __init__(self):
+        super().__init__()
+
+
+class ARLiteral(ARType):
+    def __init__(self) -> None:
+        super().__init__()
+
+    @property
+    def value(self) -> str:
+        if self._value is None:
+            return ""
+        return self._value
+
+    @value.setter
+    def value(self, val: any):
+        if isinstance(val, str):
+            self._value = val
+        else:
+            self._value = str(val)
+
+    def __str__(self) -> str:
+        return self.value
+
+    def upper(self) -> str:
+        return self.value.upper()
+
+
+class String(ARLiteral):
+    
+    pass
+
+
+class ARPositiveInteger(ARNumerical):
+    def __init__(self) -> None:
+        super().__init__()
+
+    @property
+    def value(self) -> int:
+        return self._value
+
+    @value.setter
+    def value(self, val: any):
+        if isinstance(val, int):
+            if val < 0:
+                raise ValueError("Invalid Positive Integer <%s>" % val)
+            self._value = val
+        elif isinstance(val, str):
+            self._text = val
+            self._value = self._convertStringToNumberValue(val)
+        else:
+            raise ValueError("Unsupported Type <%s>", type(val))
+
+
 class ARBoolean(ARType):
     def __init__(self) -> None:
         super().__init__()
 
-        self._text = None   
+        self._text = None
 
     def _convertNumberToBoolean(self, value: int) -> bool:
         if value == 0:
@@ -181,7 +187,7 @@ class ARBoolean(ARType):
     @property
     def value(self) -> int:
         return self._value
-    
+
     @value.setter
     def value(self, val: any):
         if isinstance(val, bool):
@@ -203,4 +209,106 @@ class ARBoolean(ARType):
                 return "true"
             else:
                 return "false"
-                
+
+class NameToken(ARLiteral):
+    '''
+        This is an identifier as used in xml, e.g. xml-names. Typical usages are, for example, the names of type
+        emitters, protocols, or profiles. For details see NMTOKEN definition on the W3C website
+        (https://www.w3.org/TR/xml/#NT-Nmtoken).
+        
+        Note: Although NameToken supports a wide range of characters, the actually allowed patterns for a
+        certain attribute typed by NameToken may be further restricted by the specification of that attribute.
+        
+        Tags:
+            * xml.xsd.customType=NMTOKEN-STRING
+            * xml.xsd.type=NMTOKEN
+    '''
+    def __init__(self):
+        super().__init__()
+
+class PositiveInteger(ARPositiveInteger):
+    '''
+        This is a positive integer which can be denoted in decimal, binary, octal and hexadecimal. The value is
+        between 0 and 4294967295.
+        
+        Tags:
+            * xml.xsd.customType=POSITIVE-INTEGER
+            * xml.xsd.pattern=0|[\+]?[1-9][0-9]*|0[xX][0-9a-fA-F]+|0[bB][0-1]+|0[0-7]+
+            * xml.xsd.type=string
+    '''
+    def __init__(self):
+        super().__init__()
+
+class Integer(ARNumerical):
+    '''
+        An instance of Integer is an element in the set of integer numbers ( ..., -2, -1, 0, 1, 2, ...).
+        The value can be expressed in decimal, octal, hexadecimal and binary representation. Negative numbers
+        can only be expressed in decimal notation
+        Range is from -2147483648 and 2147483647.
+        
+        Tags:
+            * xml.xsd.customType=INTEGER
+            * xml.xsd.pattern=0|[\+\-]?[1-9][0-9]*|0[xX][0-9a-fA-F]+|0[bB][0-1]+|0[0-7]+
+            * xml.xsd.type=string
+    '''
+    def __init__(self):
+        super().__init__()
+
+class Boolean(ARBoolean):
+    '''
+        A Boolean value denotes a logical condition that is either 'true' or 'false'. It can be one of "0", "1", "true",
+        "false"
+        
+        Tags:
+            * xml.xsd.customType=BOOLEAN
+            * xml.xsd.pattern=0|1|true|false
+            * xml.xsd.type=string
+    '''
+    def __init__(self):
+        super().__init__()
+
+class Identifier(ARLiteral):
+    '''
+        An Identifier is a string with a number of constraints on its appearance, satisfying the requirements typical
+        programming languages define for their Identifiers.
+        This datatype represents a string, that can be used as a c-Identifier.
+        It shall start with a letter, may consist of letters, digits and underscores.
+        
+        Tags:
+            * xml.xsd.customType=IDENTIFIER
+            * xml.xsd.maxLength=128
+            * xml.xsd.pattern=[a-zA-Z][a-zA-Z0-9_]*
+            * xml.xsd.type=string
+    '''
+    def __init__(self):
+        super().__init__()
+class Limit(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.intervalType = None       # type: str
+        self.value = None               # type: str
+
+
+class RefType(ARObject):
+    def __init__(self):
+        self.dest = ""
+        self.value = ""
+
+    def getDest(self):
+        return self.dest
+
+    def setDest(self, value):
+        self.dest = value
+        return self
+
+    def getValue(self):
+        return self.value
+
+    def setValue(self, value):
+        self.value = value
+        return self
+
+class TRefType(RefType):
+    def __init__(self):
+        super().__init__()

armodel/models/M2/AUTOSARTemplates/GenericStructure/__init__.py

@@ -0,0 +1 @@
+from . import *

armodel/models/{m2/autosar_templates/sw_component_template/communication.py → M2/AUTOSARTemplates/SWComponentTemplate/Communication.py}

@@ -1,12 +1,14 @@
 from abc import ABCMeta
 from typing import List
 
+from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface.InstanceRefs import ApplicationCompositeElementInPortInterfaceInstanceRef
 
-from .....models.ar_object import ARNumerical, ARObject, ARLiteral, ARBoolean, ARPositiveInteger
-from .....models.ar_ref import RefType
-from .....models.communication import CompositeNetworkRepresentation, TransmissionAcknowledgementRequest
-from ...msr.data_dictionary.data_def_properties import SwDataDefProps
-from ..common_structure import ValueSpecification
+from ..GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, ARPositiveInteger
+from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
+from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ...MSR.DataDictionary.DataDefProperties import SwDataDefProps
+from ..CommonStructure import ValueSpecification
 
 class PPortComSpec(ARObject, metaclass = ABCMeta):
     """
@@ -43,6 +45,21 @@ class RPortComSpec(ARObject, metaclass = ABCMeta):
         super().__init__()
 
 
+class CompositeNetworkRepresentation(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.leaf_element_iref = None           # type: ApplicationCompositeElementInPortInterfaceInstanceRef
+        self.network_representation = None      # type: SwDataDefProps
+
+
+class TransmissionAcknowledgementRequest(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.timeout = None     # type: float
+
+
 class SenderComSpec(PPortComSpec, metaclass = ABCMeta):
     def __init__(self):
         if type(self) == SenderComSpec:

armodel/models/{m2/autosar_templates/sw_component_template/components/instance_refs.py → M2/AUTOSARTemplates/SWComponentTemplate/Components/InstanceRefs.py}

@@ -1,8 +1,6 @@
 from abc import ABCMeta
-
-from ...generic_structure.abstract_structure import AtpInstanceRef
-from .....ar_ref import RefType
-
+from .....M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpInstanceRef
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
 
 class ModeGroupInAtomicSwcInstanceRef(AtpInstanceRef, metaclass = ABCMeta):
     def __init__(self):