fmu-manipulation-toolbox 1.8.2.2__tar.gz → 1.8.3__tar.gz

{fmu_manipulation_toolbox-1.8.2.2 → fmu_manipulation_toolbox-1.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu_manipulation_toolbox
-Version: 1.8.2.2
+Version: 1.8.3
 Summary: FMU Manipulation Toobox is a python application which help to modify a Functional Mock-up Units (FMUs) without recompilation or to group them into FMU Containers
 Home-page: https://github.com/grouperenault/fmu_manipulation_toolbox/
 Author: Nicolas.LAURENT@Renault.com

{fmu_manipulation_toolbox-1.8.2.2 → fmu_manipulation_toolbox-1.8.3}/README.md

@@ -6,7 +6,7 @@ without recompilation. It is highly customizable. It can even modify the `modelD
 Manipulating the `modelDescription.xml` can be a dangerous thing! Communicating with the FMU-developer and adapting
 the way the FMU is generated, is preferable when possible.
 
-FMU Manipulation Toolbox also allows to group FMU's inside FMU Containers. (see [container/README.md](container/README.md))
+FMU Manipulation Toolbox also allows to group FMU's inside FMU Containers. (see [doc/container.md](doc/container.md))
 
 ## Installation
 

fmu_manipulation_toolbox-1.8.3/fmu_manipulation_toolbox/__version__.py

@@ -0,0 +1 @@
+'V1.8.3'

{fmu_manipulation_toolbox-1.8.2.2 → fmu_manipulation_toolbox-1.8.3}/fmu_manipulation_toolbox/fmu_container.py

@@ -146,7 +146,7 @@ class ContainerPort:
         return f"Port {self.fmu.name}/{self.port.name}"
 
     def __hash__(self):
-        return hash(f"{self.fmu.name}/{self.port.name}")
+        return hash("{self.fmu.name}/{self.port.name}")
 
     def __eq__(self, other):
         return str(self) == str(other)
@@ -300,13 +300,14 @@ class FMUContainer:
 
         self.start_values[cport] = value
 
-    def find_input(self, port_to_connect: FMUPort) -> Optional[ContainerPort]:
+    def find_inputs(self, port_to_connect: FMUPort) -> List[ContainerPort]:
+        candidates = []
         for fmu in self.execution_order:
             for port in fmu.ports.values():
                 if (port.causality == 'input' and port.name == port_to_connect.name
                         and port.type_name == port_to_connect.type_name):
-                    return ContainerPort(fmu, port.name)
-        return None
+                    candidates.append(ContainerPort(fmu, port.name))
+        return candidates
 
     def add_implicit_rule(self, auto_input=True, auto_output=True, auto_link=True, auto_parameter=False,
                           auto_local=False):
@@ -321,14 +322,14 @@ class FMUContainer:
                         self.inputs[parameter_name] = cport
                         self.mark_ruled(cport, 'PARAMETER')
                     elif cport.port.causality == 'output':
-                        candidate_cport = self.find_input(cport.port)
-                        if auto_link and candidate_cport:
-                            local = Local(cport)
-                            local.add_target(candidate_cport)
-                            logger.info(f"AUTO LINK: {cport} -> {candidate_cport}")
+                        candidates_cport_list = self.find_inputs(cport.port)
+                        if auto_link and candidates_cport_list:
+                            self.locals[cport] = Local(cport)
                             self.mark_ruled(cport, 'LINK')
-                            self.mark_ruled(candidate_cport, 'LINK')
-                            self.locals[cport] = local
+                            for candidate_cport in candidates_cport_list:
+                                self.locals[cport].add_target(candidate_cport)
+                                self.mark_ruled(candidate_cport, 'LINK')
+                                logger.info(f"AUTO LINK: {cport} -> {candidate_cport}")
                         elif auto_output:
                             self.mark_ruled(cport, 'OUTPUT')
                             self.outputs[port_name] = cport

{fmu_manipulation_toolbox-1.8.2.2 → fmu_manipulation_toolbox-1.8.3}/fmu_manipulation_toolbox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu_manipulation_toolbox
-Version: 1.8.2.2
+Version: 1.8.3
 Summary: FMU Manipulation Toobox is a python application which help to modify a Functional Mock-up Units (FMUs) without recompilation or to group them into FMU Containers
 Home-page: https://github.com/grouperenault/fmu_manipulation_toolbox/
 Author: Nicolas.LAURENT@Renault.com

fmu_manipulation_toolbox-1.8.2.2/fmu_manipulation_toolbox/__version__.py

@@ -1 +0,0 @@
-'V1.8.2.2'