pythonfmu3 0.2.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

pythonfmu3/tests/utils.py

@@ -1,13 +1,13 @@
-from pythonfmu3.variables import Boolean, Int32, UInt64, Float64, ModelVariable, String
-
-class UInt64ValType(int): pass
-
-
-FMI2PY = dict((
-    (Boolean, bool),
-    (Int32, int),
-    (Float64, float),
-    (String, str),
-    (UInt64, UInt64ValType),
-))
-PY2FMI = dict([(v, k) for k, v in FMI2PY.items()])
+from pythonfmu3.variables import Boolean, Int32, UInt64, Float64, ModelVariable, String
+
+class UInt64ValType(int): pass
+
+
+FMI2PY = dict((
+    (Boolean, bool),
+    (Int32, int),
+    (Float64, float),
+    (String, str),
+    (UInt64, UInt64ValType),
+))
+PY2FMI = dict([(v, k) for k, v in FMI2PY.items()])

pythonfmu3/unit.py

@@ -1,62 +1,62 @@
-from xml.etree.ElementTree import Element
-
-class BaseUnit(object):
-    tag = "BaseUnit"
-    base_units = {
-        "kg": 0,
-        "m": 0,
-        "s": 0,
-        "A": 0,
-        "K": 0,
-        "mol": 0,
-        "cd": 0,
-        "rad": 0,
-    }
-
-    def __init__(self, factor=1.0, offset=0.0, **kwargs) -> None:
-        self._factor = factor
-        self._offset = offset
-        self._units = {**BaseUnit.base_units, **kwargs}
-
-    @property
-    def units(self):
-        return {key: str(value) for key, value in self._units.items() if value != 0}
-
-    def to_xml(self):
-      """Convert the variable to XML node.
-
-      Returns
-          xml.etree.ElementTree.Element: XML node
-      """
-      attrib = dict()
-      if self._factor != 1.0:
-        attrib["factor"] = str(self._factor)
-      if self._offset != 0.0:
-        attrib["offset"] = str(self._offset)
-      attrib.update(self.units)
-      ele = Element(self.tag, attrib)
-      return ele
-
-
-class Unit(object):
-    tag = "Unit"
-
-    def __init__(self, name, **kwargs):
-        self._name = name
-        self._base_unit = BaseUnit(**kwargs)
-
-    @property
-    def name(self) -> str:
-       return self._name
-
-    def to_xml(self) -> Element:
-      """Convert the variable to XML node.
-
-      Returns
-          xml.etree.ElementTree.Element: XML node
-      """
-      attrib = dict()
-      attrib["name"] = self._name
-      ele = Element(self.tag, attrib)
-      ele.append(self._base_unit.to_xml())
-      return ele
+from xml.etree.ElementTree import Element
+
+class BaseUnit(object):
+    tag = "BaseUnit"
+    base_units = {
+        "kg": 0,
+        "m": 0,
+        "s": 0,
+        "A": 0,
+        "K": 0,
+        "mol": 0,
+        "cd": 0,
+        "rad": 0,
+    }
+
+    def __init__(self, factor=1.0, offset=0.0, **kwargs) -> None:
+        self._factor = factor
+        self._offset = offset
+        self._units = {**BaseUnit.base_units, **kwargs}
+
+    @property
+    def units(self):
+        return {key: str(value) for key, value in self._units.items() if value != 0}
+
+    def to_xml(self):
+      """Convert the variable to XML node.
+
+      Returns
+          xml.etree.ElementTree.Element: XML node
+      """
+      attrib = dict()
+      if self._factor != 1.0:
+        attrib["factor"] = str(self._factor)
+      if self._offset != 0.0:
+        attrib["offset"] = str(self._offset)
+      attrib.update(self.units)
+      ele = Element(self.tag, attrib)
+      return ele
+
+
+class Unit(object):
+    tag = "Unit"
+
+    def __init__(self, name, **kwargs):
+        self._name = name
+        self._base_unit = BaseUnit(**kwargs)
+
+    @property
+    def name(self) -> str:
+       return self._name
+
+    def to_xml(self) -> Element:
+      """Convert the variable to XML node.
+
+      Returns
+          xml.etree.ElementTree.Element: XML node
+      """
+      attrib = dict()
+      attrib["name"] = self._name
+      ele = Element(self.tag, attrib)
+      ele.append(self._base_unit.to_xml())
+      return ele

pythonfmu3/variable_types.py

@@ -1,102 +1,102 @@
-from enum import Enum
-from typing import Optional
-from xml.etree.ElementTree import Element
-
-class VariableType(object):
-
-    def __init__(self, tag, name, **kwargs):
-        self._tag = tag
-        self._attrs = {
-            "name": name,
-        }
-        self._attrs.update(**kwargs)
-    
-    @property
-    def name(self) -> str:
-        """str: Variable name"""
-        return self._attrs["name"]
-
-    def to_xml(self) -> Element:
-        """Convert the variable to XML node.
-
-        Returns
-            xml.etree.ElementTree.Element: XML node
-        """
-        attrib = dict()
-        for key, value in self._attrs.items():
-            if value is not None:
-                attrib[key] = str(value.name if isinstance(value, Enum) else value)
-        return Element(self._tag, attrib)
-
-class Float64Type(VariableType):
-    tag = "Float64Type"
-
-    def __init__(self, name, **kwargs):
-        super().__init__(self.tag, name, **kwargs)
-
-
-class Item(object):
-    tag = "Item"
-
-    def __init__(self, name: str, value: int, description: str = "", **kwargs):
-        self.__attrs = {
-            "name": name,
-            "value": str(value),
-            "description": description
-        }
-
-    def name(self) -> str:
-        return self.__attrs["name"]
-
-    @property
-    def value(self) -> str:
-        return self.__attrs["value"]
-
-    @property
-    def description(self) -> Optional[str]:
-        return self.__attrs["description"]
-
-    def to_xml(self) -> Element:
-        """Convert the variable to XML node.
-
-        Returns
-            xml.etree.ElementTree.Element: XML node
-        """
-        attrib = dict()
-        for key, value in self.__attrs.items():
-            if value is not None:
-                attrib[key] = str(value.name if isinstance(value, Enum) else value)
-        return Element(self.tag, attrib)
-
-    def __repr__(self) -> str:
-        return f"{self.__class__.__name__}" \
-               f"(name={self.name}, " \
-               f"value={self.value}, " \
-               f"description={self.description})"
-
-class EnumerationType(VariableType):
-    tag = "EnumerationType"
-
-    def __init__(self, name: str, values: Optional[Enum] = None,  **kwargs):
-        super().__init__(self.tag, name, **kwargs)
-        self._items = {}
-        
-        for val in values:
-            self.add_value(name = val.name, value = val.value)
-
-    def add_value(self, name: str, value: int, description: str = "", **kwargs):
-        self._items[name] = Item(name, value, description, **kwargs)
-    
-    def get_value(self, name):
-        return self._items[name]
-
-    def to_xml(self) -> Element:
-        """Convert the variable to XML node.
-
-        Returns
-            xml.etree.ElementTree.Element: XML node
-        """
-        parent = super().to_xml()
-        for _, item in self._items.items():
-            parent.append(item.to_xml())
+from enum import Enum
+from typing import Optional
+from xml.etree.ElementTree import Element
+
+class VariableType(object):
+
+    def __init__(self, tag, name, **kwargs):
+        self._tag = tag
+        self._attrs = {
+            "name": name,
+        }
+        self._attrs.update(**kwargs)
+    
+    @property
+    def name(self) -> str:
+        """str: Variable name"""
+        return self._attrs["name"]
+
+    def to_xml(self) -> Element:
+        """Convert the variable to XML node.
+
+        Returns
+            xml.etree.ElementTree.Element: XML node
+        """
+        attrib = dict()
+        for key, value in self._attrs.items():
+            if value is not None:
+                attrib[key] = str(value.name if isinstance(value, Enum) else value)
+        return Element(self._tag, attrib)
+
+class Float64Type(VariableType):
+    tag = "Float64Type"
+
+    def __init__(self, name, **kwargs):
+        super().__init__(self.tag, name, **kwargs)
+
+
+class Item(object):
+    tag = "Item"
+
+    def __init__(self, name: str, value: int, description: str = "", **kwargs):
+        self.__attrs = {
+            "name": name,
+            "value": str(value),
+            "description": description
+        }
+
+    def name(self) -> str:
+        return self.__attrs["name"]
+
+    @property
+    def value(self) -> str:
+        return self.__attrs["value"]
+
+    @property
+    def description(self) -> Optional[str]:
+        return self.__attrs["description"]
+
+    def to_xml(self) -> Element:
+        """Convert the variable to XML node.
+
+        Returns
+            xml.etree.ElementTree.Element: XML node
+        """
+        attrib = dict()
+        for key, value in self.__attrs.items():
+            if value is not None:
+                attrib[key] = str(value.name if isinstance(value, Enum) else value)
+        return Element(self.tag, attrib)
+
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}" \
+               f"(name={self.name}, " \
+               f"value={self.value}, " \
+               f"description={self.description})"
+
+class EnumerationType(VariableType):
+    tag = "EnumerationType"
+
+    def __init__(self, name: str, values: Optional[Enum] = None,  **kwargs):
+        super().__init__(self.tag, name, **kwargs)
+        self._items = {}
+        
+        for val in values:
+            self.add_value(name = val.name, value = val.value)
+
+    def add_value(self, name: str, value: int, description: str = "", **kwargs):
+        self._items[name] = Item(name, value, description, **kwargs)
+    
+    def get_value(self, name):
+        return self._items[name]
+
+    def to_xml(self) -> Element:
+        """Convert the variable to XML node.
+
+        Returns
+            xml.etree.ElementTree.Element: XML node
+        """
+        parent = super().to_xml()
+        for _, item in self._items.items():
+            parent.append(item.to_xml())
         return parent