fmu-manipulation-toolbox 1.8.4__tar.gz → 1.8.4.1__tar.gz

{fmu_manipulation_toolbox-1.8.4 → fmu_manipulation_toolbox-1.8.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu_manipulation_toolbox
-Version: 1.8.4
+Version: 1.8.4.1
 Summary: FMU Manipulation Toolbox is a python application for modifying Functional Mock-up Units (FMUs) without recompilation or bundling them into FMU Containers
 Home-page: https://github.com/grouperenault/fmu_manipulation_toolbox/
 Author: Nicolas.LAURENT@Renault.com

fmu_manipulation_toolbox-1.8.4.1/fmu_manipulation_toolbox/__version__.py

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

{fmu_manipulation_toolbox-1.8.4 → fmu_manipulation_toolbox-1.8.4.1}/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}")
+        return hash(str(self))
 
     def __eq__(self, other):
         return str(self) == str(other)
@@ -266,7 +266,7 @@ class FMUContainer:
 
         try:
             fmu = EmbeddedFMU(self.fmu_directory / fmu_filename)
-            self.involved_fmu[fmu_filename] = fmu
+            self.involved_fmu[fmu.name] = fmu
             self.execution_order.append(fmu)
             if not fmu.fmi_version == "2.0":
                 raise FMUContainerError("Only FMI-2.0 is supported by FMUContainer")
@@ -663,7 +663,7 @@ class FMUContainer:
                 nb += len(self.execution_order)
                 print(f"{nb} {nb+nb_input_link}", file=txt_file)
                 for profiling_port, _ in enumerate(self.execution_order):
-                    print(f"{profiling_port} -2 {profiling_port}", file=txt_file)
+                    print(f"{profiling_port} 1 -2 {profiling_port}", file=txt_file)
             else:
                 print(f"{nb} {nb+nb_input_link}", file=txt_file)
             for input_port in inputs_per_type[type_name]:
@@ -727,9 +727,9 @@ class FMUContainer:
                 binary_directory.mkdir(exist_ok=True)
                 shutil.copy(library_filename, binary_directory / f"{self.identifier}.dll")
 
-        for fmu in self.involved_fmu.values():
+        for i, fmu in enumerate(self.involved_fmu.values()):
             shutil.copytree(self.long_path(fmu.fmu.tmp_directory),
-                            self.long_path(resources_directory / fmu.name), dirs_exist_ok=True)
+                            self.long_path(resources_directory / f"{i:02x}"), dirs_exist_ok=True)
         return resources_directory
 
     def make_fmu_package(self, base_directory: Path, fmu_filename: Path):

{fmu_manipulation_toolbox-1.8.4 → fmu_manipulation_toolbox-1.8.4.1}/fmu_manipulation_toolbox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu_manipulation_toolbox
-Version: 1.8.4
+Version: 1.8.4.1
 Summary: FMU Manipulation Toolbox is a python application for modifying Functional Mock-up Units (FMUs) without recompilation or bundling them into FMU Containers
 Home-page: https://github.com/grouperenault/fmu_manipulation_toolbox/
 Author: Nicolas.LAURENT@Renault.com

{fmu_manipulation_toolbox-1.8.4 → fmu_manipulation_toolbox-1.8.4.1}/tests/test_suite.py

@@ -17,6 +17,13 @@ class FMUManipulationToolboxTestSuite(unittest.TestCase):
         with open(filename1, mode="rt", newline=None) as a, open(filename2, mode="rt", newline=None) as b:
             self.assertTrue(all(lineA == lineB for lineA, lineB in zip(a, b)))
 
+    def assert_identical_files_but_guid(self, filename1, filename2):
+        with open(filename1, mode="rt", newline=None) as a, open(filename2, mode="rt", newline=None) as b:
+            for lineA, lineB in zip(a, b):
+                if not "guid" in lineA and not lineA == lineB:
+                    return False
+        return True
+
     def assert_names_match_ref(self, fmu_filename):
         fmu = FMU(fmu_filename)
         csv_filename = Path(fmu_filename).with_suffix(".csv")
@@ -65,6 +72,19 @@ class FMUManipulationToolboxTestSuite(unittest.TestCase):
         self.assert_identical_files("containers/bouncing_ball/REF-bouncing.json",
                                     "containers/bouncing_ball/bouncing.json")
 
+    def test_container_bouncing_ball_profiling(self):
+        assembly = Assembly("bouncing-profiling.csv", fmu_directory=Path("containers/bouncing_ball"), profiling=True,
+                            debug=True)
+        assembly.write_json("bouncing-profiling.json")
+        assembly.make_fmu()
+        self.assert_identical_files("containers/bouncing_ball/REF-container-profiling.txt",
+                                    "containers/bouncing_ball/bouncing-profiling/resources/container.txt")
+        self.assert_identical_files("containers/bouncing_ball/REF-bouncing-profiling.json",
+                                    "containers/bouncing_ball/bouncing-profiling.json")
+        self.assert_identical_files_but_guid("containers/bouncing_ball/REF-modelDescription-profiling.xml",
+                                             "containers/bouncing_ball/bouncing-profiling/modelDescription.xml")
+
+
     def test_container_ssp(self):
         assembly = Assembly("bouncing.ssp", fmu_directory=Path("containers/ssp"))
         assembly.make_fmu(dump_json=True)
@@ -77,6 +97,14 @@ class FMUManipulationToolboxTestSuite(unittest.TestCase):
         self.assert_identical_files("containers/arch/REF-flat-dump.json",
                                     "containers/arch/flat-dump.json")
 
+    def test_container_subdir_flat(self):
+        container = FMUContainer("sub.fmu", fmu_directory=Path("containers/arch"))
+        container.get_fmu("subdir/gain2.fmu")
+        container.get_fmu("integrate.fmu")
+        container.get_fmu("sine.fmu")
+        container.add_implicit_rule()
+        container.make_fmu("sub.fmu", step_size=0.5)
+
     def test_container_json_hierarchical(self):
         assembly = Assembly("hierarchical.json", fmu_directory=Path("containers/arch"))
         assembly.make_fmu(dump_json=True)
@@ -89,6 +117,14 @@ class FMUManipulationToolboxTestSuite(unittest.TestCase):
         self.assert_identical_files("containers/arch/REF-reversed-dump.json",
                                     "containers/arch/reversed-dump.json")
 
+    def test_container_start(self):
+        assembly = Assembly("slx.json", fmu_directory=Path("containers/start"), debug=True)
+        assembly.make_fmu()
+        self.assert_identical_files("containers/start/REF-container.txt",
+                                    "containers/start/container-slx/resources/container.txt")
+        self.assert_identical_files_but_guid("containers/start/REF-modelDescription.xml",
+                                             "containers/start/container-slx/modelDescription.xml")
+
     def test_container_move(self):
         #bb = Assembly("bouncing.csv", fmu_directory=Path("containers/bouncing_ball"))
         #links = bb.root.get_fmu_connections("bb_position.fmu")

fmu_manipulation_toolbox-1.8.4/fmu_manipulation_toolbox/__version__.py

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