pythonfmu3 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

pythonfmu3/variables.py

@@ -50,6 +50,11 @@ class ModelVariable(ABC):
         self.setter = setter
         self._type = None
         self.local_name = name.split(".")[-1]
+        
+        # demanagle names
+        self.local_name = self.local_name.lstrip('_')
+
+
         self.__attrs = {
             "name": name,
             "valueReference": None,
@@ -151,7 +156,6 @@ class Start(object):
         attrib["value"] = self.value
         return Element("Start", attrib)
 
-
 class Dimension(object):
     def __init__(self, start: str = "", valueReference: str = ""):
         if start and valueReference and any((start, valueReference)):
@@ -177,15 +181,38 @@ class Dimension(object):
         ele = Element("Dimension", attrib)
         return ele
 
-class Float64(ModelVariable):
+class Arrayable(object):
+    def __init__(self, dimensions : List[Dimension] = [], **kwargs):
+        if dimensions:
+            check_numpy()
+        self._dimensions = dimensions
+    
+    @property
+    def dimensions(self) -> List[Dimension]:
+        return self._dimensions
+
+    def get_start_str(self, value, formatter):
+        if len(self.dimensions) > 0:
+            output = " ".join([formatter(val) for val in flatten(value)])
+            if len(output) > MAX_LENGTH:
+                output = output[0]
+            return output
+        else:
+            return formatter(value)
+        
+    def dimensions_xml(self) -> List[Element]:
+        return [dim.to_xml() for dim in self._dimensions]
+
+    def size(self, vars):
+        return reduce(lambda x, dim: x * int(dim.size(vars)), self._dimensions, 1)
+
+class Float64(ModelVariable, Arrayable):
     def __init__(self, name: str, start: Optional[Any] = None, derivative: Optional[Any] = None, dimensions: List[Dimension] = [], unit: Optional[str] = None, **kwargs):
-        super().__init__(name, **kwargs)
+        ModelVariable.__init__(self, name, **kwargs)
+        Arrayable.__init__(self, dimensions)
         self.__attrs = {"start": start, "derivative": derivative}
         self._type = "Float64"
         self._unit = unit
-        if dimensions:
-            check_numpy()
-        self.__dimensions = dimensions
 
     @property
     def start(self) -> Optional[Any]:
@@ -206,11 +233,6 @@ class Float64(ModelVariable):
     @property
     def derivative(self):
         return self.__attrs["derivative"]
-    
-    @property
-    def dimensions(self) -> List[Dimension]:
-        return self.__dimensions
-
 
     def to_xml(self) -> Element:
         attrib = dict()
@@ -218,13 +240,7 @@ class Float64(ModelVariable):
             if value is not None:
                 # In order to not loose precision, a number of this type should be
                 # 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 flatten(value)])
-                    if len(output) > MAX_LENGTH:
-                        output = output[0]
-                else:
-                    output = f"{value:.16g}"
+                output = self.get_start_str(value, lambda v: f"{v:.16g}")
                 attrib[key] = output
 
         if self.unit:
@@ -233,18 +249,15 @@ class Float64(ModelVariable):
         self._extras = attrib
         parent = super().to_xml()
 
-        for dimension in self.__dimensions:
-            parent.append(dimension.to_xml())
+        parent.extend(self.dimensions_xml())
 
         return parent
     
-    def size(self, vars):
-        return reduce(lambda x, dim: x * int(dim.size(vars)), self.__dimensions, 1)
-
 
-class Int32(ModelVariable):
-    def __init__(self, name: str, start: Optional[Any] = None, **kwargs):
-        super().__init__(name, **kwargs)
+class Int32(ModelVariable, Arrayable):
+    def __init__(self, name: str, start: Optional[Any] = None, dimensions: List[Dimension] = [], **kwargs):
+        ModelVariable.__init__(self, name, **kwargs)
+        Arrayable.__init__(self, dimensions, **kwargs)
         self.__attrs = {"start": start}
         self._type = "Int32";
 
@@ -260,15 +273,18 @@ class Int32(ModelVariable):
         attrib = dict()
         for key, value in self.__attrs.items():
             if value is not None:
-                attrib[key] = str(value)
+                attrib[key] = self.get_start_str(value, lambda v: str(v))
         self._extras = attrib
         parent = super().to_xml()
+        
+        parent.extend(self.dimensions_xml())
 
         return parent
         
-class Int64(ModelVariable):
-    def __init__(self, name: str, start: Optional[Any] = None, **kwargs):
-        super().__init__(name, **kwargs)
+class Int64(ModelVariable, Arrayable):
+    def __init__(self, name: str, start: Optional[Any] = None, dimensions: List[Dimension] = [], **kwargs):
+        ModelVariable.__init__(self, name, **kwargs)
+        Arrayable.__init__(self, dimensions, **kwargs)
         self.__attrs = {"start": start}
         self._type = "Int64";
 
@@ -284,15 +300,18 @@ class Int64(ModelVariable):
         attrib = dict()
         for key, value in self.__attrs.items():
             if value is not None:
-                attrib[key] = str(value)
+                attrib[key] = self.get_start_str(value, lambda v: str(v))
         self._extras = attrib
         parent = super().to_xml()
 
+        parent.extend(self.dimensions_xml())
+
         return parent
 
-class UInt64(ModelVariable):
-    def __init__(self, name: str, start: Optional[Any] = None, **kwargs):
-        super().__init__(name, **kwargs)
+class UInt64(ModelVariable, Arrayable):
+    def __init__(self, name: str, start: Optional[Any] = None, dimensions: List[Dimension] = [], **kwargs):
+        ModelVariable.__init__(self, name, **kwargs)
+        Arrayable.__init__(self, dimensions, **kwargs)
         self.__attrs = {"start": start}
         self._type = "UInt64";
 
@@ -308,15 +327,18 @@ class UInt64(ModelVariable):
         attrib = dict()
         for key, value in self.__attrs.items():
             if value is not None:
-                attrib[key] = str(value)
+                attrib[key] = self.get_start_str(value, lambda v: str(v))
         self._extras = attrib
         parent = super().to_xml()
 
-        return parent
+        parent.extend(self.dimensions_xml())
 
-class Boolean(ModelVariable):
-    def __init__(self, name: str, start: Optional[Any] = None, **kwargs):
-        super().__init__(name, **kwargs)
+        return parent
+    
+class Boolean(ModelVariable, Arrayable):
+    def __init__(self, name: str, start: Optional[Any] = None, dimensions: List[Dimension] = [], **kwargs):
+        ModelVariable.__init__(self, name, **kwargs)
+        Arrayable.__init__(self, dimensions, **kwargs)
         self.__attrs = {"start": start}
         self._type = "Boolean"
 
@@ -332,16 +354,18 @@ class Boolean(ModelVariable):
         attrib = dict()
         for key, value in self.__attrs.items():
             if value is not None:
-                attrib[key] = str(value).lower()
+                attrib[key] = self.get_start_str(value, lambda v: str(v).lower())
         self._extras = attrib
         parent = super().to_xml()
+        
+        parent.extend(self.dimensions_xml())
 
         return parent
 
 
 class String(ModelVariable):
-    def __init__(self, name: str, start: Optional[Any] = None, **kwargs):
-        super().__init__(name, **kwargs)
+    def __init__(self, name: str, start: Optional[Any] = None, dimensions: List[Dimension] = [], **kwargs):
+        ModelVariable.__init__(self, name, **kwargs)
         self.__attrs = dict()
         self._type = "String"
         self._start = Start(start)
@@ -358,13 +382,13 @@ class String(ModelVariable):
         attrib = dict()
         for key, value in self.__attrs.items():
             if value is not None:
-                attrib[key] = str(value)
+                attrib[key] = str(value, lambda v: str(v))
         self._extras = attrib
         parent = super().to_xml()
         
         if self.start is not None:
             parent.append(self._start.to_xml())
-
+        
         return parent
     
 class Enumeration(ModelVariable):

{pythonfmu3-0.3.2.dist-info → pythonfmu3-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pythonfmu3
-Version: 0.3.2
+Version: 0.3.4
 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
@@ -173,6 +173,7 @@ To create a model exchange FMU you must inherit from `Fmi3SlaveBase` and one of
 ```python
 
 from pythonfmu3 import Fmi3Causality, Fmi3SlaveBase, Float64, ModelExchange
+from typing import List
 
 
 class PythonSlaveMX(Fmi3SlaveBase, ModelExchange):

{pythonfmu3-0.3.2.dist-info → pythonfmu3-0.3.4.dist-info}/RECORD

@@ -1,42 +1,43 @@
 pythonfmu3/__init__.py,sha256=VJ4QqOZTU8sBI8xhiRVD540Hsp381ma24xGWHABZ724,551
 pythonfmu3/__main__.py,sha256=gC1T8x2d02hhqshyNQGSS70SyCk-3I3t8zPqoRo2Xd8,1543
-pythonfmu3/_version.py,sha256=vNiWJ14r_cw5t_7UDqDQIVZvladKFGyHH2avsLpN7Vg,22
-pythonfmu3/builder.py,sha256=w7c9ZFv1Udz99cb7rj2NpD0CgrcHRu1SR_axm0ew__Y,10103
+pythonfmu3/_version.py,sha256=oYLGMpySamd16KLiaBTfRyrAS7_oyp-TOEHmzmeumwg,22
+pythonfmu3/builder.py,sha256=DLpy6Hd9ZmbeQLVMw_FcxnS5LB_-yRXzkPjlupyiYsg,11060
 pythonfmu3/cosimulation.py,sha256=EZ5pa_5hy1AwoaZRzZqNz_IX8kjxoFM9sPgeqrUiRuw,179
 pythonfmu3/default_experiment.py,sha256=FJ0l0FpU7pT4Pox2RiA2y-Cb_e7DE2XlbWKySRYQaVk,293
 pythonfmu3/deploy.py,sha256=eqFWVxZUkJCLvmq1-GuMNjn2j0VCGoaXPhRWrCk2Vxg,3741
 pythonfmu3/enums.py,sha256=ZmC6vGeBTGt7HarPQ4uYV10ezPsvIxAHH1ypjNq7G3E,729
-pythonfmu3/fmi3slave.py,sha256=dq0rru4QsLm75irlpM8nquKVbn22FgFG33PVnNUumGc,19458
+pythonfmu3/fmi3slave.py,sha256=JpN_zeaXpEIk2Hnnd7LvV2cs5IOD6x1GEAYdNy9TMWU,20844
 pythonfmu3/logmsg.py,sha256=0wn11GLwq0LLWqyC2ktLRjQFWlpj07wWliZ8rUHx1gg,359
 pythonfmu3/modelexchange.py,sha256=pdC3gvr-vCXA8qvJ_urWplJZWEi1YKjMcNczme7GOOo,1884
 pythonfmu3/osutil.py,sha256=1qN6qudN4zCupZwc15pzp52WObkqi6jGy9a-MehNt9Q,656
 pythonfmu3/unit.py,sha256=SjOaywb5lVQbAO_iLjc_7Ly3nYrmAvIW2_hAGt12UFU,1475
 pythonfmu3/variable_types.py,sha256=Q0D4wlGi3i3zE5UsmGJEpNh7SV_W8mn_8p_WIkwrLQA,2881
-pythonfmu3/variables.py,sha256=GDAbR_BSRsiBlcqpMKE_uvehNiRczgL7xC4BMEj-BJo,12254
+pythonfmu3/variables.py,sha256=U4ESws0jx6QNlzvT9d7If2HEgp6ujpFi225GO9FgHaM,13500
 pythonfmu3/pythonfmu-export/.clang-format,sha256=ApbsHWYwilCXJ1iBux4nqOjLkaqgbGLsVrc_U3hX7WI,944
 pythonfmu3/pythonfmu-export/CMakeLists.txt,sha256=WLFfomT1rj9eWJMSXLtSbh5HLIu0DR5VCiYdCl8Cxrw,1854
 pythonfmu3/pythonfmu-export/build_unix.sh,sha256=I5RrF2O6y0hRG_SN4ExKN_CCFYaa2l-ngKzqmBXnHmA,73
 pythonfmu3/pythonfmu-export/build_win.sh,sha256=UzmAcWqFmwBu6mvYne2Dx3UK8iPwTtP4HpjICsjUaJA,97
 pythonfmu3/pythonfmu-export/src/CMakeLists.txt,sha256=fOVlV7hy9c0wx_Qp4K51tQaQ5xy9lL4qtyGl15ZXfGs,1208
 pythonfmu3/pythonfmu-export/src/cppfmu/cppfmu_common.hpp,sha256=cgrlZa5L-bbjZeVi0pmy4JKE5UJ2GszzuyOqTdRcBRQ,4353
-pythonfmu3/pythonfmu-export/src/cppfmu/cppfmu_cs.cpp,sha256=EsUIevwmCzX9hsui3i8x1crSnSOG8dEK15Zm1ZIavYQ,3843
-pythonfmu3/pythonfmu-export/src/cppfmu/cppfmu_cs.hpp,sha256=tEz_LIZT1CuXi21S4e_ggM9RJh-ZKukjD-5QHxfZXAk,7444
-pythonfmu3/pythonfmu-export/src/cppfmu/fmi_functions.cpp,sha256=nAb0bPGMf44z6aXzH7dGZDrX8N92l8gx-SkQrq3jIik,30015
+pythonfmu3/pythonfmu-export/src/cppfmu/cppfmu_cs.cpp,sha256=explSkxXPayKgSMHxadQ8_Gd8IMYwSnOw5SBItTimuE,4093
+pythonfmu3/pythonfmu-export/src/cppfmu/cppfmu_cs.hpp,sha256=FO2ugz1-YFE8St2AO7k_cXtT7qM5ktrejv_SEKjDRf4,7734
+pythonfmu3/pythonfmu-export/src/cppfmu/fmi_functions.cpp,sha256=oetqW88dlZd75suBoScD0AcA4yktCBSaRfx0vHD_Lyw,30105
 pythonfmu3/pythonfmu-export/src/fmi/fmi3FunctionTypes.h,sha256=Tk1WY0nAYBGiOAQ8zVbmqRAfdQttITWsLba7udhBwG4,30050
 pythonfmu3/pythonfmu-export/src/fmi/fmi3Functions.h,sha256=NsHuclp20wcuUInYf-91UXZbljTeu2cPXENqNEORdgU,16262
 pythonfmu3/pythonfmu-export/src/fmi/fmi3PlatformTypes.h,sha256=ZCQLJgSbRGrMsBiQ4auaYCY4J3Hck6g3t1iZp5NEguw,4251
 pythonfmu3/pythonfmu-export/src/pythonfmu/IPyState.hpp,sha256=GLiOjhKLDVEICersnqVwezwEshbxfdh_cyMxBJGFbu8,456
-pythonfmu3/pythonfmu-export/src/pythonfmu/PySlaveInstance.cpp,sha256=Dmnvn7CprYxECYYXZCI2t81VNw3qscsKOIb6kMm3mNA,33301
-pythonfmu3/pythonfmu-export/src/pythonfmu/PySlaveInstance.hpp,sha256=kdLzY-vrRyRnJfqZ0ZQiz7g7i3gP1MLzmvUD7u0ylPM,5392
+pythonfmu3/pythonfmu-export/src/pythonfmu/PySlaveInstance.cpp,sha256=3VTCxq4uXBJW8Ut6oMHHSUGO8OMtSSPoK2VsPGtuT3U,33908
+pythonfmu3/pythonfmu-export/src/pythonfmu/PySlaveInstance.hpp,sha256=59icfvAVdq5rFaeAE1PgEqpknyZHgSQMEBXnZz3efAw,5602
 pythonfmu3/pythonfmu-export/src/pythonfmu/PyState.hpp,sha256=CjFEIrZu8b1jxQAIgfI_o36hyItW_SdQ5VSkImf7JNs,2977
-pythonfmu3/resources/binaries/x86_64-linux/libpythonfmu-export.so,sha256=MYOFAGHaNBGS-o7DFQPmdYrfSgG1QXkhznwlh7fsRfY,367904
-pythonfmu3/resources/binaries/x86_64-windows/pythonfmu-export.dll,sha256=j3ye1lnsJbgczHEDAqR15Li_rhUuesX7gc6Jei2rSXc,427008
+pythonfmu3/resources/binaries/x86_64-linux/libpythonfmu-export.so,sha256=U_1xuoNMGN6i3xXX5ns6QkQeemB3V8tayCX_mLUFtYA,367944
+pythonfmu3/resources/binaries/x86_64-windows/pythonfmu-export.dll,sha256=SFtJHFYRgW8kp6faJ78HKCYOYaPQVXhtG6SUR3Zv5Iw,427008
 pythonfmu3/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pythonfmu3/tests/conftest.py,sha256=B6XxTnBdeF_tEJ3w2DlfPKUfvlk-oULgIhQtXkgOJIc,171
 pythonfmu3/tests/test_builder.py,sha256=GrD4ziin3RLOe_36rBQCMnKrSkhc3IqnxE1a6kCFPok,6842
 pythonfmu3/tests/test_deploy.py,sha256=JCDo-O93-izxrP9Q4K0njBcfZ-gAXYx9aZ4plgctz7k,1783
+pythonfmu3/tests/test_docs.py,sha256=VZZFUj2j35mBKvWATIUzJnWNDfiETsLdHZnRZGutOVM,3134
 pythonfmu3/tests/test_fmi3slave.py,sha256=VSd3o3ejOcTG6TlnqxVK7YQc4QCKFTCQnpIgleaxJl4,4801
-pythonfmu3/tests/test_integration.py,sha256=34rus-OU9S5FlAVAfpZyoHrXoziG14d4_yw4Wdt5uVU,12513
+pythonfmu3/tests/test_integration.py,sha256=0WdI02SmzGB2G5oBnPYgmUnvkKNQ_CpIyfdsUVWfDis,16194
 pythonfmu3/tests/test_logger.py,sha256=OcHQhxUtNBPH-0zdmheC4I9OWz1yu48W8MYDshNVkf8,5765
 pythonfmu3/tests/test_multiple_fmus.py,sha256=-sthCm2YUZiRkdfvpLQNgquPBForUKQ7HGqfFBdrRas,3942
 pythonfmu3/tests/test_variables.py,sha256=FL7eUCXH4RmH0rK0k6qXDnyDzthW_wAWJBHEmC-u8SI,10384
@@ -48,11 +49,12 @@ pythonfmu3/tests/slaves/localmodule.py,sha256=-q5Lmh2I88MG7nLTscms0n5xhHLkUDed1I
 pythonfmu3/tests/slaves/pythonslave.py,sha256=uzrTQmfk0QBalxNTviGMZNph_YgVmcbxPqKgX5rSvXg,2172
 pythonfmu3/tests/slaves/pythonslaveMX.py,sha256=rmtiKWj-7DNCEGKAzCoS-6ybkWKabYMhatpn14r7UpA,1167
 pythonfmu3/tests/slaves/pythonslaveMXCS.py,sha256=P1aKY92obd-y9VGwDRin9fwmnAlSmdHguFW8E5-LU4I,1417
+pythonfmu3/tests/slaves/pythonslave_arraytypes.py,sha256=l5DB0HI0CH_saLwoe1BvZUXgEzxGGYUHiaG3npt2vDk,2429
 pythonfmu3/tests/slaves/pythonslave_read_file.py,sha256=t2sDaZSr2veD91gdqCO9W9CN-AN3TyXABXXfV9Rt0Xs,791
 pythonfmu3/tests/slaves/slavewithdep.py,sha256=hHDFB0dw8wkHiGzxeAVbz9O5LR6ghsFeONgRFdiK_t0,812
-pythonfmu3-0.3.2.dist-info/licenses/LICENSE,sha256=RL2018BU2DKcTi8Eb4ODF-XF3wnr7SDKvMP5S49x4rQ,1188
-pythonfmu3-0.3.2.dist-info/METADATA,sha256=uDfgPNTvIe_vJrgWUk5LGwqdzQDLemg01w4ckpv7B4c,9351
-pythonfmu3-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pythonfmu3-0.3.2.dist-info/entry_points.txt,sha256=GgkWYs0DKGHLcijMEYZGkhkHOK2RVUpjGwvl1fwyDwQ,60
-pythonfmu3-0.3.2.dist-info/top_level.txt,sha256=6ne7bh_cME1hepxCx1BG8N5QVhVAufrp7LLok6vq7nE,11
-pythonfmu3-0.3.2.dist-info/RECORD,,
+pythonfmu3-0.3.4.dist-info/licenses/LICENSE,sha256=RL2018BU2DKcTi8Eb4ODF-XF3wnr7SDKvMP5S49x4rQ,1188
+pythonfmu3-0.3.4.dist-info/METADATA,sha256=ydejh5qlluJ22V1R33dKaQQ_TR7-K2BBmHuDcq9lo0E,9375
+pythonfmu3-0.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pythonfmu3-0.3.4.dist-info/entry_points.txt,sha256=GgkWYs0DKGHLcijMEYZGkhkHOK2RVUpjGwvl1fwyDwQ,60
+pythonfmu3-0.3.4.dist-info/top_level.txt,sha256=6ne7bh_cME1hepxCx1BG8N5QVhVAufrp7LLok6vq7nE,11
+pythonfmu3-0.3.4.dist-info/RECORD,,