pythonfmu3 0.2.0__tar.gz → 0.2.1__tar.gz

{pythonfmu3-0.2.0/pythonfmu3.egg-info → pythonfmu3-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pythonfmu3
-Version: 0.2.0
+Version: 0.2.1
 Summary: A lightweight framework that enables the packaging of Python3.x code as co-simulation FMUs.
 Home-page: https://github.com/stephensmith25/PythonFMU3
 Author: Stephen Smith

pythonfmu3-0.2.1/pythonfmu3/_version.py

@@ -0,0 +1 @@
+__version__ = "0.2.1"

{pythonfmu3-0.2.0 → pythonfmu3-0.2.1}/pythonfmu3/pythonfmu-export/src/pythonfmu/PySlaveInstance.cpp

@@ -73,6 +73,7 @@ PySlaveInstance::PySlaveInstance(std::string instanceName, std::string resources
         std::string moduleName = getline(resources_ + "/slavemodule.txt");
         PyObject* pModule = PyImport_ImportModule(moduleName.c_str());
         if (pModule == nullptr) {
+            PyErr_Print();
             handle_py_exception("[ctor] PyImport_ImportModule", gilState);
         }
 
@@ -732,7 +733,7 @@ namespace
         }
         return TRUE;
 }
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__APPLE__)
     __attribute__((destructor)) void onLibraryUnload()
     {
         finalizePythonInterpreter();

{pythonfmu3-0.2.0 → pythonfmu3-0.2.1}/pythonfmu3/tests/test_variables.py

@@ -8,7 +8,7 @@ from xml.etree import ElementTree
 
 from pythonfmu3 import Fmi3Slave
 from pythonfmu3.enums import Fmi3Causality, Fmi3Initial, Fmi3Variability
-from pythonfmu3.variables import Boolean, Int32, UInt64, Float64, ModelVariable, String, Dimension
+from pythonfmu3.variables import flatten, Boolean, Int32, UInt64, Float64, ModelVariable, String, Dimension
 
 from .utils import PY2FMI, UInt64ValType
 
@@ -303,14 +303,33 @@ def test_String_to_xml(name, start):
 @pytest.mark.requirements("numpy")  
 @pytest.mark.parametrize("name,start,dims", [
     ("array1", [1.,2.,3.,4.], [4]),
-    ("array2", [1.,2.,3.,4.], [2, 2]),
+    ("array2", [1.,2.,3.,4.], [2, 2])
 ])
 def test_array_to_xml(name, start, dims):
     r = Float64(name, start, dimensions=[Dimension(start=val) for val in dims])
     xml = r.to_xml()
     if start is not None:
-        assert xml.attrib['start'] == " ".join([f"{val:.16g}" for val in start])
+        assert xml.attrib['start'] == " ".join([f"{val:.16g}" for val in flatten(start)])
     if dims is not None:
         xml_dims = xml.findall('.//Dimension')
         assert len(xml_dims) == len(dims)
         assert [xml_dim.attrib['start'] for xml_dim in xml_dims] == dims
+
+
+@pytest.mark.requirements("numpy")  
+@pytest.mark.parametrize("name,start,dims", [
+    ("array1", [1.,2.,3.,4.], [4]),
+    ("array2", [1.,2.,3.,4.], [2, 2])
+])
+def test_array_output_to_xml(name, start, dims):
+    import numpy as np
+    start = np.reshape(start, newshape=dims) 
+    r = Float64(name, start, dimensions=[Dimension(start=val) for val in dims], causality=Fmi3Causality.output)
+    xml = r.to_xml()
+    print(xml, start)
+    if start is not None:
+        assert xml.attrib['start'] == " ".join([f"{val:.16g}" for val in flatten(start)])
+    if dims is not None:
+        xml_dims = xml.findall('.//Dimension')
+        assert len(xml_dims) == len(dims)
+        assert [xml_dim.attrib['start'] for xml_dim in xml_dims] == dims

{pythonfmu3-0.2.0 → pythonfmu3-0.2.1}/pythonfmu3/variables.py

@@ -4,11 +4,19 @@ from enum import Enum
 import importlib
 from typing import Any, Optional, List
 from xml.etree.ElementTree import Element, SubElement
+from collections.abc import Iterable
 from collections import ChainMap
 from functools import reduce  
 
 from .enums import Fmi3Causality, Fmi3Initial, Fmi3Variability
 
+def flatten(lst):
+    for item in lst:
+        if isinstance(item, Iterable) and not isinstance(item, (str, bytes)):
+            yield from flatten(item)
+        else:
+            yield item
+
 def check_numpy():
     try:
         importlib.import_module('numpy')
@@ -210,7 +218,7 @@ class Float64(ModelVariable):
                 # stored on an XML file with at least 16 significant digits
                 output = ""
                 if len(self.dimensions) > 0:
-                    output = " ".join([f"{val:.16g}" for val in value])
+                    output = " ".join([f"{val:.16g}" for val in flatten(value)])
                 else:
                     output = f"{value:.16g}"
                 attrib[key] = output

{pythonfmu3-0.2.0 → pythonfmu3-0.2.1/pythonfmu3.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pythonfmu3
-Version: 0.2.0
+Version: 0.2.1
 Summary: A lightweight framework that enables the packaging of Python3.x code as co-simulation FMUs.
 Home-page: https://github.com/stephensmith25/PythonFMU3
 Author: Stephen Smith

pythonfmu3-0.2.0/pythonfmu3/_version.py

@@ -1 +0,0 @@
-__version__ = "0.2.0"