steer-materials 0.1.17__py3-none-any.whl → 0.1.19__py3-none-any.whl

steer_materials/Base.py

@@ -10,8 +10,8 @@ import numpy as np
 
 class _Material(
     ValidationMixin, 
-    SerializerMixin,
-    DunderMixin
+    DunderMixin,
+    SerializerMixin
     ):
 
     def __init__(self, name: str, density: float, specific_cost: float, color: str):
@@ -43,13 +43,13 @@ class _Material(
 
     @property
     def density(self):
-        return round(self._density * (KG_TO_G / M_TO_CM**3), 2)
+        return np.round(self._density * (KG_TO_G / M_TO_CM**3), 2)
 
     @property
     def density_range(self):
         return (
-            round(self._density_range[0] * (KG_TO_G / M_TO_CM**3), 2),
-            round(self._density_range[1] * (KG_TO_G / M_TO_CM**3), 2),
+            np.round(self._density_range[0] * (KG_TO_G / M_TO_CM**3), 2),
+            np.round(self._density_range[1] * (KG_TO_G / M_TO_CM**3), 2),
         )
 
     @property
@@ -58,13 +58,13 @@ class _Material(
 
     @property
     def specific_cost(self):
-        return round(self._specific_cost, 2)
+        return np.round(self._specific_cost, 2)
 
     @property
     def specific_cost_range(self):
         return (
-            round(self._specific_cost_range[0], 2),
-            round(self._specific_cost_range[1], 2),
+            np.round(self._specific_cost_range[0], 2),
+            np.round(self._specific_cost_range[1], 2),
         )
 
     @property
@@ -173,21 +173,21 @@ class _VolumedMaterialMixin:
     @property
     def volume(self):
         if hasattr(self, '_volume') and self._volume is not None:
-            return round(self._volume * (M_TO_CM**3), 4)
+            return np.round(self._volume * (M_TO_CM**3), 4)
         else:
             return None
         
     @property
     def mass(self):
         if hasattr(self, '_mass') and self._mass is not None:
-            return round(self._mass * KG_TO_G, 2)
+            return np.round(self._mass * KG_TO_G, 2)
         else:
             return None
         
     @property
     def cost(self):
         if hasattr(self, '_cost') and self._cost is not None:
-            return round(self._cost, 2)
+            return np.round(self._cost, 2)
         else:
             return None
 

steer_materials/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.1.17"
+__version__ = "0.1.19"
 

{steer_materials-0.1.17.dist-info → steer_materials-0.1.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: steer-materials
-Version: 0.1.17
+Version: 0.1.19
 Summary: Modelling energy storage from cell to site - STEER OpenCell Design
 Author-email: Nicholas Siemons <nsiemons@stanford.edu>
 Maintainer-email: Nicholas Siemons <nsiemons@stanford.edu>
@@ -22,7 +22,7 @@ Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: steer-core==0.1.27
+Requires-Dist: steer-core==0.1.34
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

steer_materials-0.1.19.dist-info/RECORD

@@ -0,0 +1,6 @@
+steer_materials/Base.py,sha256=GU879XmYg15faUNAVIDFajz4UnmnzpG637_OZ4bZqjc,6155
+steer_materials/__init__.py,sha256=6tnuZovonD7YdM-OVvctlazpGv5MmkO_yJLeLDmnvGw,24
+steer_materials-0.1.19.dist-info/METADATA,sha256=MrRtumzWdsZMH3JJYpZbx5SItOf4hCFG2hC5IqV_Wr4,1622
+steer_materials-0.1.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+steer_materials-0.1.19.dist-info/top_level.txt,sha256=vlZIS_XS59tP1rltDORHZbwi6KZ99QjnPoPN46hpsP0,16
+steer_materials-0.1.19.dist-info/RECORD,,

steer_materials-0.1.17.dist-info/RECORD

@@ -1,6 +0,0 @@
-steer_materials/Base.py,sha256=MhIe_oFF_wljbivP8GF56PZCdgyPEiR4xBc4Bsn_EBw,6128
-steer_materials/__init__.py,sha256=CsJQ6eHgR7sw3Q6_uhlOBZNYJdrrx4wGir6o855GjwM,24
-steer_materials-0.1.17.dist-info/METADATA,sha256=K1F-6IoYbcwn0YDaRYoI_QD3rEmLZCcmuc6F3w2qEKk,1622
-steer_materials-0.1.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-steer_materials-0.1.17.dist-info/top_level.txt,sha256=vlZIS_XS59tP1rltDORHZbwi6KZ99QjnPoPN46hpsP0,16
-steer_materials-0.1.17.dist-info/RECORD,,