fmu-manipulation-toolbox 1.8.4.1rc1__tar.gz → 1.8.4.2__tar.gz

{fmu_manipulation_toolbox-1.8.4.1rc1 → fmu_manipulation_toolbox-1.8.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu_manipulation_toolbox
-Version: 1.8.4.1rc1
+Version: 1.8.4.2
 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.1rc1 → fmu_manipulation_toolbox-1.8.4.2}/README.md

@@ -12,12 +12,21 @@ FMU Manipulation Toolbox also allows to group FMU's inside FMU Containers. (see
 
 Two options available to install FMU Manipulation Toolbox:
 
-- (Easiest option) Install with from PyPI: `python -m pip install fmu_manipulation`
+- (*Easiest option*) Install with from PyPI: `pip install fmu-manipulation-toolbox`. This will install the latest
+  version of FMU Manipulation Toolbox and all its dependencies. See [PyPI page](https://pypi.org/project/fmu-manipulation-toolbox/).
 - Compile and install from [github repository](https://github.com/grouperenault/fmu_manipulation_toolbox). You will need 
-  - Python required packages. See `requirements.txt`.
-  - C compiler
+  - Python required packages. See [`requirements.txt`](requirements.txt).
+  - C compiler (C99 or later)
+  - CMake (>= 3.16)
+
+### Supported platforms
+FMU Manipulation Toolbox is tested on:
+- Windows 10/11
+- Linux (Ubuntu 22.04)
+
+Compilation is reported to work on:
+- MacOS (Apple Silicon and Intel)
 
-    
 ## Graphical User Interface
 
 FMU Manipulation Toolbox is released with a GUI. You can launch it with the following command `fmutool`

fmu_manipulation_toolbox-1.8.4.2/fmu_manipulation_toolbox/__version__.py

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

{fmu_manipulation_toolbox-1.8.4.1rc1 → fmu_manipulation_toolbox-1.8.4.2}/fmu_manipulation_toolbox/fmu_container.py

@@ -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]:
@@ -683,10 +683,11 @@ class FMUContainer:
                     print(f"{vr} {cport.port.vr}", file=txt_file)
 
             for type_name in type_names_list:
-                print(f"# Start values of {fmu.name} - {type_name}: <FMU_VR> <VALUE>", file=txt_file)
+                print(f"# Start values of {fmu.name} - {type_name}: <FMU_VR> <RESET> <VALUE>", file=txt_file)
                 print(len(start_values_fmu_per_type[type_name][fmu.name]), file=txt_file)
                 for cport, value in start_values_fmu_per_type[type_name][fmu.name].items():
-                    print(f"{cport.port.vr} {value}", file=txt_file)
+                    reset = 1 if cport.port.causality == "input" else 0
+                    print(f"{cport.port.vr} {reset} {value}", file=txt_file)
 
             for type_name in type_names_list:
                 print(f"# Outputs of {fmu.name} - {type_name}: <VR> <FMU_VR>", file=txt_file)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu_manipulation_toolbox
-Version: 1.8.4.1rc1
+Version: 1.8.4.2
 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.1rc1 → fmu_manipulation_toolbox-1.8.4.2}/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)
@@ -97,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.1rc1/fmu_manipulation_toolbox/__version__.py

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