py-eb-model 1.1.3__py3-none-any.whl → 1.1.5__py3-none-any.whl

eb_model/models/__init__.py

@@ -1,5 +1,5 @@
-from .abstract import *
-from .os_xdm import *
-from .rte_xdm import *
-from .eb_doc import *
-from .importer_xdm import *
+from .abstract import *             # noqa F403
+from .os_xdm import *               # noqa F403
+from .rte_xdm import *              # noqa F403
+from .eb_doc import *               # noqa F403
+from .importer_xdm import *         # noqa F403

eb_model/models/abstract.py

@@ -2,15 +2,16 @@ from abc import ABCMeta
 from typing import Dict
 import re
 
+
 class EcucObject(metaclass=ABCMeta):
     def __init__(self, parent, name) -> None:
-        if type(self) == EcucObject:
+        if type(self) is EcucObject:
             raise ValueError("Abstract EcucObject cannot be initialized.")
         
         self.name = name
         self.parent = parent                # type: EcucObject
 
-        if isinstance(parent, EcucContainer):
+        if isinstance(parent, EcucParamConfContainerDef):
             parent.addElement(self)
 
     def getName(self):
@@ -30,14 +31,15 @@ class EcucObject(metaclass=ABCMeta):
     def getFullName(self) -> str:
         return self.parent.getFullName() + "/" + self.name
 
-class EcucContainer(EcucObject):
+
+class EcucParamConfContainerDef(EcucObject):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
         self.elements = {}                  # type: Dict[str, EcucObject]
 
     def getTotalElement(self) -> int:
-        #return len(list(filter(lambda a: not isinstance(a, ARPackage) , self.elements.values())))
+        # return len(list(filter(lambda a: not isinstance(a, ARPackage) , self.elements.values())))
         return len(self.elements)
     
     def addElement(self, object: EcucObject):
@@ -60,6 +62,7 @@ class EcucContainer(EcucObject):
             return None
         return self.elements[name]
 
+
 class EcucRefType:
     def __init__(self, value: str) -> None:
         self.value = value
@@ -82,6 +85,7 @@ class EcucRefType:
             return m.group(1)
         return self.value
     
+    
 class Version:
     def __init__(self):
         self.majorVersion = None
@@ -115,7 +119,8 @@ class Version:
     def getVersion(self) -> str:
         return "%d.%d.%d" % (self.majorVersion, self.minorVersion, self.patchVersion)
 
-class Module(EcucContainer):
+
+class Module(EcucParamConfContainerDef):
     def __init__(self, parent, name):
         super().__init__(parent, name)
 

eb_model/models/eb_doc.py

@@ -1,17 +1,17 @@
 from .importer_xdm import SystemDescriptionImporter
 from .rte_xdm import Rte
 from .os_xdm import Os
-from .abstract import EcucContainer, EcucObject
+from .abstract import EcucParamConfContainerDef, EcucObject
 
 
-class AbstractModel(EcucContainer):
+class AbstractModel(EcucParamConfContainerDef):
     def getFullName(self):
         return self.name
 
     def clear(self):
         self.elements = {}
 
-    def find_object(self, referred_name: str, element: EcucContainer) -> EcucObject:
+    def find_object(self, referred_name: str, element: EcucParamConfContainerDef) -> EcucObject:
         name_list = referred_name.split("/")
         # element = EBModel.getInstance()
         for name in name_list:
@@ -37,19 +37,19 @@ class EBModel(AbstractModel):
         if (EBModel.__instance is not None):
             raise Exception("The EBModel is singleton!")
         
-        EcucContainer.__init__(self, None, "")
+        EcucParamConfContainerDef.__init__(self, None, "")
         EBModel.__instance = self
 
     def find(self, referred_name: str) -> EcucObject:
         return self.find_object(referred_name, EBModel.getInstance())
 
     def getOs(self) -> Os:
-        container = EcucContainer(self, "Os")
+        container = EcucParamConfContainerDef(self, "Os")
         Os(container)
         return self.find("/Os/Os")
     
     def getRte(self) -> Rte:
-        container = EcucContainer(self, "Rte")
+        container = EcucParamConfContainerDef(self, "Rte")
         Rte(container)
         return self.find("/Rte/Rte")
 
@@ -67,10 +67,10 @@ class PreferenceModel(AbstractModel):
         if (PreferenceModel.__instance is not None):
             raise Exception("The PreferenceModel is singleton!")
         
-        EcucContainer.__init__(self, None, "")
+        EcucParamConfContainerDef.__init__(self, None, "")
         PreferenceModel.__instance = self
 
-        container = EcucContainer(self, "ImporterExporterAdditions")
+        container = EcucParamConfContainerDef(self, "ImporterExporterAdditions")
         SystemDescriptionImporter(container, "SystemDescriptionImporters")
 
     def find(self, referred_name: str) -> EcucObject:

eb_model/models/eclipse_project.py

@@ -1,8 +1,5 @@
-
 class Link:
     def __init__(self, name, type, locationURI):
         self.name = name
         self.type = type
         self.locationURI = locationURI
-
-        

eb_model/models/importer_xdm.py

@@ -7,6 +7,7 @@ import os
 import re
 import logging
 
+
 class SystemDescriptionImporter(EcucObject):
     def __init__(self, parent, name):
         super().__init__(parent, name)
@@ -28,7 +29,7 @@ class SystemDescriptionImporter(EcucObject):
             file_list.append(file)
         return file_list
     
-    def getParsedInputFiles(self, params = {}) -> List[str]:
+    def getParsedInputFiles(self, params={}) -> List[str]:
         file_list = []
         for input_file in self.inputFiles:
             m = re.match(r'\$\{(env_var:\w+)\}(.*)', input_file)
@@ -50,7 +51,7 @@ class SystemDescriptionImporter(EcucObject):
                 file_list.append(input_file)
         return file_list
     
-    def getAllPaths(self, path :str) -> List[str]:
+    def getAllPaths(self, path: str) -> List[str]:
         path_segments = path.split("/")
 
         result = []
@@ -61,11 +62,11 @@ class SystemDescriptionImporter(EcucObject):
             if long_path == "":
                 long_path = path_segment
             else:
-                long_path = long_path +"/" + path_segment
+                long_path = long_path + "/" + path_segment
             result.append(long_path)
         return result
     
-    def getNameByPath(self, path : str):              
+    def getNameByPath(self, path: str):
         path_segments = path.split("/")
 
         result = []
@@ -76,10 +77,10 @@ class SystemDescriptionImporter(EcucObject):
             else:
                 result.append(path_segment)
         
-        return (count , "/".join(result))
+        return (count, "/".join(result))
     
     def getLinks(self, file_list: List[str]) -> List[Link]:
-        path_sets = {}             # type: Dict[str, List[str]] 
+        path_sets = {}                              # type: Dict[str, List[str]]
         path_segment_sets = []
 
         for file in file_list:
@@ -111,5 +112,3 @@ class SystemDescriptionImporter(EcucObject):
                 links.append(link)
         
         return links
-
-

eb_model/models/os_xdm.py

@@ -1,14 +1,14 @@
-from typing import Dict, List
+from typing import Dict, List                                                       # noqa F401
 import logging
-from ..models.abstract import EcucContainer, EcucObject, EcucRefType, Module
+from ..models.abstract import EcucParamConfContainerDef, EcucObject, EcucRefType, Module
 
 
-class OsAlarmAction(EcucContainer):
+class OsAlarmAction(EcucParamConfContainerDef):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
 
-class OsAlarmAutostart(EcucContainer):
+class OsAlarmAutostart(EcucParamConfContainerDef):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
@@ -110,7 +110,7 @@ class OsAlarmSetEvent(OsAlarmAction):
         return self
 
 
-class OsAlarm(EcucContainer):
+class OsAlarm(EcucParamConfContainerDef):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
@@ -160,7 +160,7 @@ class OsAlarm(EcucContainer):
         return "\n".join(result)
 
 
-class OsApplicationHooks(EcucContainer):
+class OsApplicationHooks(EcucParamConfContainerDef):
     def __init__(self, parent, name):
         super().__init__(parent, name)
 
@@ -198,7 +198,7 @@ class OsApplicationHooks(EcucContainer):
         return self
 
 
-class OsApplicationTrustedFunction(EcucContainer):
+class OsApplicationTrustedFunction(EcucParamConfContainerDef):
     def __init__(self, parent, name):
         super().__init__(parent, name)
 
@@ -220,12 +220,12 @@ class OsApplicationTrustedFunction(EcucContainer):
         return self
 
 
-class OsAppMode(EcucContainer):
+class OsAppMode(EcucParamConfContainerDef):
     def __init__(self, parent, name):
         super().__init__(parent, name)
 
 
-class OsApplication(EcucContainer):
+class OsApplication(EcucParamConfContainerDef):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
@@ -344,7 +344,7 @@ class OsApplication(EcucContainer):
         return self
 
 
-class OsDriver(EcucContainer):
+class OsDriver(EcucParamConfContainerDef):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
@@ -364,7 +364,7 @@ class OsDriver(EcucContainer):
         return self
 
 
-class OsTimeConstant(EcucContainer):
+class OsTimeConstant(EcucParamConfContainerDef):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
@@ -384,7 +384,7 @@ class OsTimeConstant(EcucContainer):
         return self
 
 
-class OsCounter(EcucContainer):
+class OsCounter(EcucParamConfContainerDef):
 
     OS_COUNTER_TYPE_HARDWARE = "HARDWARE"
     OS_COUNTER_TYPE_SOFTWARE = "SOFTWARE"
@@ -482,12 +482,12 @@ class OsCounter(EcucContainer):
         return self
 
 
-class OsResource(EcucContainer):
+class OsResource(EcucParamConfContainerDef):
     def __init__(self) -> None:
         pass
 
 
-class OsIsrResourceLock(EcucContainer):
+class OsIsrResourceLock(EcucParamConfContainerDef):
     def __init__(self) -> None:
         self.osIsrResourceLockBudget = None
         self.osIsrResourceLockResourceRef = None
@@ -635,7 +635,7 @@ class OsTask(EcucObject):
         self.osTaskAccessingApplication = None
         self.osTaskEventRef = None                      # type: EcucRefType
         self.osTaskResourceRefs = []                    # type: List[EcucRefType]
-        self.osTaskAutostart = None                     # type: bool
+        self.osTaskAutostart = None                     # type: OsTaskAutostart
 
     def getOsTaskActivation(self):
         return self.osTaskActivation
@@ -664,7 +664,7 @@ class OsTask(EcucObject):
     def setOsTaskSchedule(self, value):
         self.osTaskSchedule = value
         return self
-    
+
     def getOsTaskType(self):
         return self.OsTaskType
 
@@ -716,11 +716,15 @@ class OsTask(EcucObject):
         return self.osTaskAutostart
 
     def setOsTaskAutostart(self, value):
-        self.osTaskAutostart = value
+        if value is not None:
+            self.osTaskAutostart = value
         return self
+    
+    def isOsTaskAutostart(self) -> bool:
+        return self.osTaskAutostart is not None
 
 
-class OsScheduleTableAutostart(EcucContainer):
+class OsScheduleTableAutostart(EcucParamConfContainerDef):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
@@ -750,7 +754,7 @@ class OsScheduleTableAutostart(EcucContainer):
         return self
 
 
-class OsScheduleTblAdjustableExpPoint(EcucContainer):
+class OsScheduleTblAdjustableExpPoint(EcucParamConfContainerDef):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
@@ -772,7 +776,7 @@ class OsScheduleTblAdjustableExpPoint(EcucContainer):
         return self
 
 
-class OsScheduleTableTaskActivation(EcucContainer):
+class OsScheduleTableTaskActivation(EcucParamConfContainerDef):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
@@ -786,7 +790,7 @@ class OsScheduleTableTaskActivation(EcucContainer):
         return self
 
 
-class OsScheduleTableEventSetting(EcucContainer):
+class OsScheduleTableEventSetting(EcucParamConfContainerDef):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
@@ -810,7 +814,7 @@ class OsScheduleTableEventSetting(EcucContainer):
         return self
 
 
-class OsScheduleTableExpiryPoint(EcucContainer):
+class OsScheduleTableExpiryPoint(EcucParamConfContainerDef):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
@@ -850,7 +854,7 @@ class OsScheduleTableExpiryPoint(EcucContainer):
         return self
 
 
-class OsScheduleTable(EcucContainer):
+class OsScheduleTable(EcucParamConfContainerDef):
 
     OS_TIME_UNIT_NANOSECONDS = "NANOSECONDS"
     OS_TIME_UNIT_TICKS = "TICKS"

eb_model/models/rte_xdm.py

@@ -1,6 +1,8 @@
 from typing import Dict, List
-from ..models.abstract import EcucContainer, EcucRefType, Module
-class RteEventToIsrMapping(EcucContainer):
+from ..models.abstract import EcucParamConfContainerDef, EcucRefType, Module
+
+
+class RteEventToIsrMapping(EcucParamConfContainerDef):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
         
@@ -10,7 +12,8 @@ class RteEventToIsrMapping(EcucContainer):
         self.RteRipsFillRoutineRef = None
         self.RteRipsFlushRoutineRef = None
 
-class AbstractEventToTaskMapping(EcucContainer):
+
+class AbstractEventToTaskMapping(EcucParamConfContainerDef):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
@@ -23,6 +26,7 @@ class AbstractEventToTaskMapping(EcucContainer):
         self.rtePositionInTask = value
         return self
 
+
 class RteEventToTaskMapping(AbstractEventToTaskMapping):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
@@ -174,8 +178,9 @@ class RteEventToTaskMapping(AbstractEventToTaskMapping):
 
     def setRteVirtuallyMappedToTaskRef(self, value):
         self.rteVirtuallyMappedToTaskRef = value
-        return self   
-    
+        return self
+
+
 class RteEventToTaskMappingV3(RteEventToTaskMapping):
     def __init__(self, parent, name):
         super().__init__(parent, name)
@@ -189,6 +194,7 @@ class RteEventToTaskMappingV3(RteEventToTaskMapping):
         self.rteEventRef = value
         return self
 
+
 class RteEventToTaskMappingV4(RteEventToTaskMapping):
     def __init__(self, parent, name):
         super().__init__(parent, name)
@@ -208,6 +214,7 @@ class RteEventToTaskMappingV4(RteEventToTaskMapping):
             raise ValueError("Unsupported RteEventRef of RteEventToTaskMapping <%s> " % self.name)
         return self.rteEventRefs[0]
 
+
 class RteBswEventToTaskMapping(AbstractEventToTaskMapping):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
@@ -329,6 +336,7 @@ class RteBswEventToTaskMapping(AbstractEventToTaskMapping):
         self.rteRipsFlushRoutineRef = value
         return self
 
+
 class RteBswEventToTaskMappingV3(RteBswEventToTaskMapping):
     def __init__(self, parent, name):
         super().__init__(parent, name)
@@ -343,6 +351,7 @@ class RteBswEventToTaskMappingV3(RteBswEventToTaskMapping):
             self.rteBswEventRef = value
         return self
 
+
 class RteBswEventToTaskMappingV4(RteBswEventToTaskMapping):
     def __init__(self, parent, name):
         super().__init__(parent, name)
@@ -361,10 +370,12 @@ class RteBswEventToTaskMappingV4(RteBswEventToTaskMapping):
             raise ValueError("Unsupported RteEventRef of RteEventToTaskMapping <%s> " % self.name)
         return self.rteBswEventRefs[0]
 
-class AbstractRteInstance(EcucContainer):
+
+class AbstractRteInstance(EcucParamConfContainerDef):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
+
 class RteSwComponentInstance(AbstractRteInstance):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
@@ -443,6 +454,7 @@ class RteSwComponentInstance(AbstractRteInstance):
         self.rteNvRamAllocations.append(value)
         return self
 
+
 class RteBswModuleInstance(AbstractRteInstance):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
@@ -551,25 +563,43 @@ class RteBswModuleInstance(AbstractRteInstance):
     def setRteMappedToOsApplicationRef(self, value):
         self.rteMappedToOsApplicationRef = value
         return self
-    
+
+
 class Rte(Module):
     def __init__(self, parent) -> None:
         super().__init__(parent, "Rte")
 
+        self.rteBswModuleInstances = []                                         # type: List[RteBswModuleInstance]
+        self.rteSwComponentInstances = []                                       # type: List[RteSwComponentInstance]
+
+    def getRteBswModuleInstance(self, name: str) -> RteBswModuleInstance:
+        result = list(filter(lambda a: a.name == name, self.rteBswModuleInstances))
+        if len(result) > 0:
+            return result[0]
+        return None
+
     def getRteBswModuleInstanceList(self) -> List[RteBswModuleInstance]:
-        return list(sorted(filter(lambda a: isinstance(a, RteBswModuleInstance), self.elements.values()), key= lambda o:o.name))
+        return list(sorted(self.rteBswModuleInstances, key=lambda o: o.name))
 
     def addRteBswModuleInstance(self, value: RteBswModuleInstance):
         self.elements[value.getName()] = value
+        self.rteBswModuleInstances.append(value)
+
+    def getRteSwComponentInstance(self, name: str) -> RteSwComponentInstance:
+        result = list(filter(lambda a: a.name == name, self.rteSwComponentInstances))
+        if len(result) > 0:
+            return result[0]
+        return None
 
     def getRteSwComponentInstanceList(self) -> List[RteSwComponentInstance]:
-        return list(sorted(filter(lambda a: isinstance(a, RteSwComponentInstance), self.elements.values()), key= lambda o:o.name))
+        return list(sorted(self.rteSwComponentInstances, key=lambda o: o.name))
 
     def addRteSwComponentInstance(self, value: RteSwComponentInstance):
         self.elements[value.getName()] = value
+        self.rteSwComponentInstances.append(value)
 
     def getRteModuleInstanceList(self) -> List[AbstractRteInstance]:
-        return list(sorted(filter(lambda a: isinstance(a, AbstractRteInstance), self.elements.values()), key= lambda o:o.name))
+        return list(sorted(filter(lambda a: isinstance(a, AbstractRteInstance), self.elements.values()), key=lambda o: o.name))
     
     def _addToRteEventToOsTasks(self, mapping: AbstractEventToTaskMapping, os_tasks: Dict[str, List[AbstractEventToTaskMapping]]):
         if isinstance(mapping, RteBswEventToTaskMapping):
@@ -601,4 +631,4 @@ class Rte(Module):
             else:
                 raise NotImplementedError("Invalid Rte Module Instance <%s>" % type(instance))
 
-        return os_tasks
+        return os_tasks

eb_model/parser/os_xdm_parser.py

@@ -21,7 +21,7 @@ class OsXdmParser(AbstractEbModelParser):
         self.read_version(element, os)
 
         self.logger.info("Parse Rte ARVersion:<%s> SwVersion:<%s>" % (os.getArVersion().getVersion(), os.getSwVersion().getVersion()))
-        
+
         self.os = os
 
         self.read_os_tasks(element, os)
@@ -37,9 +37,7 @@ class OsXdmParser(AbstractEbModelParser):
             autostart = OsTaskAutostart(os_task, ctr_tag.attrib["name"])
             for app_mode_ref in self.read_ref_value_list(ctr_tag, "OsTaskAppModeRef"):
                 autostart.addOsTaskAppModeRef(app_mode_ref)
-            os_task.setOsTaskAutostart(True)
-        else:
-            os_task.setOsTaskAutostart(False)
+            os_task.setOsTaskAutostart(autostart)
 
     def read_os_tasks(self, element: ET.Element, os: Os):
         for ctr_tag in self.find_ctr_tag_list(element, "OsTask"):

eb_model/reporter/excel_reporter/os_xdm.py

@@ -23,7 +23,7 @@ class OsXdmXlsWriter(ExcelReporter):
             self.write_cell(sheet, row, 2, os_app.getName())
             self.write_cell(sheet, row, 3, os_task.getOsTaskActivation())
             self.write_cell(sheet, row, 4, os_task.getOsTaskPriority())
-            self.write_cell(sheet, row, 5, os_task.getOsTaskAutostart())
+            self.write_cell(sheet, row, 5, os_task.isOsTaskAutostart())
 
             self.write_cell(sheet, row, 6, os_task.getOsTaskSchedule())
             self.write_cell(sheet, row, 7, os_task.getOsStacksize())

eb_model/tests/models/test_ecuc_container.py

@@ -1,12 +1,12 @@
 
 from ...models.eb_doc import EBModel
-from ...models.abstract import EcucContainer, EcucObject
+from ...models.abstract import EcucParamConfContainerDef, EcucObject
 
 class TestEcucContainer:
 
     def test_create_container(self):
         document = EBModel.getInstance()
-        os_container = EcucContainer(document, "Os")
+        os_container = EcucParamConfContainerDef(document, "Os")
 
         assert (os_container.getFullName() == "/Os")
         assert (os_container.getParent() == document)
@@ -18,5 +18,5 @@ class TestEcucContainer:
         assert (container.getParent() == document)
         assert (container.getName() == "Os")
 
-        assert(isinstance(container, EcucContainer))
+        assert(isinstance(container, EcucParamConfContainerDef))
         assert(isinstance(container, EcucObject))

{py_eb_model-1.1.3.dist-info → py_eb_model-1.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-eb-model
-Version: 1.1.3
+Version: 1.1.5
 Summary: The parser for EB XDM file
 Home-page: UNKNOWN
 Author: melodypapa
@@ -192,3 +192,16 @@ PrefSystemImporter --base-path c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rt
 2. Export the Isr Priority and Vector to Excel.
 3. Read the OsAppResourceRef, OsAppIsrRef from OsApplication.
 
+**Version 1.1.4**
+
+1. Fix the incorrect attribute of osTaskAutostart.
+2. Add the isOsTaskAutostart method to get the enabled flag of osTaskAutostart.
+3. Add the flake8 change rules.
+
+**Version 1.1.5**
+
+1. Add the new interfaces to support to get the instance by name.
+   * Rte::getRteBswModuleInstance
+   * Rte::getRteBswModuleInstance
+
+

{py_eb_model-1.1.3.dist-info → py_eb_model-1.1.5.dist-info}/RECORD

@@ -3,36 +3,36 @@ eb_model/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eb_model/cli/os_xdm_2_xls_cli.py,sha256=zUnxJ4uHWRSjMmpSK5hXRAzVt-_YGEyiMXrexnJSk6g,1970
 eb_model/cli/pref_system_importer_cli.py,sha256=Cra-rVpgxruLLyWHRdYAgbwfcHVPV2L8Jk6ck0v4lJU,3361
 eb_model/cli/rte_xdm_2_xls_cli.py,sha256=83uzE2Vk0h267gWxF9mnWN3Bh69RJpYyKULFXpxTByY,2127
-eb_model/models/__init__.py,sha256=7_WxCwRdVavLbPzepHWNar3O-rOxhLwmVYWd2pqm2kI,124
-eb_model/models/abstract.py,sha256=uavSXSfKeM2JvOLmpBh43WlYLQ5fCk_F99tf9YVHDkU,3833
-eb_model/models/eb_doc.py,sha256=uVV8Bh7fJtaILRVIGmQW3XnK29uam0tEhphKN3P-MKU,2575
-eb_model/models/eclipse_project.py,sha256=W6ovTd3SMnlmWm_efVBZqTUGQebF0hJocsTqMlQ7_XQ,169
-eb_model/models/importer_xdm.py,sha256=B2Vqw5nkmzFgaGSpZlmTVFWZ88rTMqD8Iryytg4kUnk,4249
-eb_model/models/os_xdm.py,sha256=7t4CkVp5cJHZV1vGqsTGnweJD4gXP-0LSLOaDv3ERhU,33550
-eb_model/models/rte_xdm.py,sha256=otYbFuIKsFl0Jlqm18fRqroTi1fUEGw2HPhGZb7sAQ0,21060
+eb_model/models/__init__.py,sha256=Jn4oOg6CxbAvULNaVt0obDLGPZC2sLzeo6rQt4eTDQ0,245
+eb_model/models/abstract.py,sha256=rYy45TV8HzcG1dQWbXD0yalWpkxubUzjAvwOugAwtbE,3884
+eb_model/models/eb_doc.py,sha256=Kx0eExrQCmkWdPC0OnzVcZAOeXtRcwNM6AFMANntgAQ,2671
+eb_model/models/eclipse_project.py,sha256=I1y4UUPJQqy8Bh77sJkufzcH9wXMN1Wk82er-m1Sxhc,155
+eb_model/models/importer_xdm.py,sha256=wUdwZQ-uq75EkhU4nzrYeNR5UphaTJ41MjywOPcCHsE,4246
+eb_model/models/os_xdm.py,sha256=Kj5DuBP3-RJUdEf3d5Q1iKhpqCF_lnM-evougloAsZo,33983
+eb_model/models/rte_xdm.py,sha256=dEsGhpnaG-VG5QfEPv6hxQdopzwMkHHz8kDHj_7MuYM,21851
 eb_model/parser/__init__.py,sha256=7VOmPr4dng_TrOyDZFu2_s3r0BJZQGiOUxALMY8EnqI,170
 eb_model/parser/eb_parser.py,sha256=_5sUl2pMt1SchHvrLOhU2axqa3FmKTWElSB79taz0O4,8188
 eb_model/parser/eb_parser_factory.py,sha256=zqsqq52uImU4-WcS5dvHfhM95hiEPAGRtNzVik8i8wc,971
-eb_model/parser/os_xdm_parser.py,sha256=OglPMQ1urvAQdspcd18Ia52ytGTcfHoBouan0Djfe8w,10575
+eb_model/parser/os_xdm_parser.py,sha256=folWFp-4HdxIBmEzrBW4LA3ZQRAYygI30sZbks6rOnQ,10510
 eb_model/parser/pref_xdm_parser.py,sha256=EjfR4vrnjRVLw_7wyPmMYlBj6lPXZbBZMEdWlYPj3uI,1539
 eb_model/parser/rte_xdm_parser.py,sha256=plUue0c4ejreE9w71_mT0JNzGSClf30cXhfC2NalrII,5471
 eb_model/reporter/__init__.py,sha256=H8D_23UwJi1Ph6yjBfZhxWVbu9ci5_O4471gqXGiZCM,36
 eb_model/reporter/markdown.py,sha256=NhcJOFQ_BVbkgGe66uAT7KUPIchWU4kfVMtMLQtbK-w,1647
 eb_model/reporter/excel_reporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eb_model/reporter/excel_reporter/abstract.py,sha256=PfIoiKNKy1eRJBABln7rADkSdwWzS03Vs03jBYM-_5Y,1622
-eb_model/reporter/excel_reporter/os_xdm.py,sha256=d6_xWdhEVLB6QoIpkZT7PoDfJUaosZZQ21lVm5mMIHI,6407
+eb_model/reporter/excel_reporter/os_xdm.py,sha256=MG6-6qi7Dh1XXv4CR2I-iQpOvypso0dlfXt_ZQ3lO7I,6406
 eb_model/reporter/excel_reporter/rte_xdm.py,sha256=OHuVPUV7xCdDzxELyXi766YJ6GejTHrzPrlAUBqexIw,3937
 eb_model/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eb_model/tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eb_model/tests/models/test_eb_model.py,sha256=3fpIHhzQlf9KZjm4fZxcSTT4Zio6YhTrcn9UBvlhOfo,1632
-eb_model/tests/models/test_ecuc_container.py,sha256=lZmtXwPMz9T52WFduTgFy16fO2agjSW-Rl2cVypM86s,722
+eb_model/tests/models/test_ecuc_container.py,sha256=-M_XZTSeWGVIJac6sj_an2-Ui65QVNXbfbETOD_Ipm8,758
 eb_model/tests/models/test_importer_xdm.py,sha256=F80kO77jeyfCkLPRgRLjEj3UPcrACimR5LhBhFgX_m4,3372
 eb_model/writer/__init__.py,sha256=CXvQAsNV1OvYClkHdKCG7Q300OVBzcl2TmoD68MyQOs,95
 eb_model/writer/project_writer.py,sha256=9BQU1CJAktVxFvQk89Pj4IbizTJXnlQidt4eX_CIFXU,2800
 eb_model/writer/text_writer.py,sha256=7d4_PUTJk5Y6S_EQflAH3ACDnUw9VwJzP90GFDh0n0I,991
-py_eb_model-1.1.3.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
-py_eb_model-1.1.3.dist-info/METADATA,sha256=NaaH-Mkbpz4C28vxGmhb8tdfGEJTzK7KSRcPpeYZ8GQ,6125
-py_eb_model-1.1.3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-py_eb_model-1.1.3.dist-info/entry_points.txt,sha256=yDLH9wnJ5Fp7ImgyFRSnr3mU6nvaenuKZnbe2rgs8Mk,183
-py_eb_model-1.1.3.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
-py_eb_model-1.1.3.dist-info/RECORD,,
+py_eb_model-1.1.5.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
+py_eb_model-1.1.5.dist-info/METADATA,sha256=ZT0KjMQ8x1ezJYgwhkrupkz4lcb0-hKKVw4WWxTyKcI,6476
+py_eb_model-1.1.5.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+py_eb_model-1.1.5.dist-info/entry_points.txt,sha256=yDLH9wnJ5Fp7ImgyFRSnr3mU6nvaenuKZnbe2rgs8Mk,183
+py_eb_model-1.1.5.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
+py_eb_model-1.1.5.dist-info/RECORD,,