steer-core 0.1.10__py3-none-any.whl → 0.1.11__py3-none-any.whl

steer_core/Mixins/Coordinates.py

@@ -280,10 +280,10 @@ class CoordinateMixin:
         Returns
         -------
         Tuple[np.ndarray, np.ndarray]
-            Modified x and y coordinate arrays with None separators between segments
+            Modified x and y coordinate arrays with np.nan separators between segments
         """
         if len(x_coords) == 0 or len(y_coords) == 0:
-            return np.array([]), np.array([])
+            return np.array([], dtype=float), np.array([], dtype=float)
         
         x_min, x_max = np.min(x_coords), np.max(x_coords)
         y_min, y_max = np.min(y_coords), np.max(y_coords)
@@ -297,7 +297,7 @@ class CoordinateMixin:
         if len(valid_positions) == 0:
             rect_x = [x_min, x_max, x_max, x_min, x_min]
             rect_y = [y_min, y_min, y_max, y_max, y_min]
-            return np.array(rect_x, dtype=object), np.array(rect_y, dtype=object)
+            return np.array(rect_x, dtype=float), np.array(rect_y, dtype=float)
         
         # Sort weld tab cut positions
         cuts = np.sort(valid_positions)
@@ -317,7 +317,7 @@ class CoordinateMixin:
         if start < x_max:
             segments.append((start, x_max))
         
-        # Build rectangles for each kept segment with None separators
+        # Build rectangles for each kept segment with np.nan separators
         x_result = []
         y_result = []
         
@@ -329,10 +329,10 @@ class CoordinateMixin:
             x_result.extend(rect_x)
             y_result.extend(rect_y)
             
-            # Add None separator (except for the last segment)
+            # Add np.nan separator (except for the last segment)
             if i < len(segments) - 1:  # Fixed: use index comparison
-                x_result.append(None)
-                y_result.append(None)
+                x_result.append(np.nan)
+                y_result.append(np.nan)
         
-        return np.array(x_result, dtype=object), np.array(y_result, dtype=object)
+        return np.array(x_result, dtype=float), np.array(y_result, dtype=float)
 

steer_core/Mixins/{Validators.py → validators.py}

@@ -14,124 +14,26 @@ ALLOWED_REFERENCE = [
 class ValidationMixin:
 
     @staticmethod
-    def validate_formulations(value: Type) -> None:
+    def validate_type(value: Type, expected_type: Type, name: str) -> None:
         """
-        Validate that a value is an instance of _ElectrodeFormulation.
+        Validate that a value is of the expected type.
 
         Parameters
         ----------
         value : Type
             The value to validate.
+        expected_type : Type
+            The expected type of the value.
+        name : str
+            The name of the parameter for error messages.
 
         Raises
         ------
         TypeError
-            If the value is not an instance of _ElectrodeFormulation.
-        """
-        from steer_opencell_design.Formulations.ElectrodeFormulations import _ElectrodeFormulation
-
-        if not isinstance(value, _ElectrodeFormulation):
-            raise TypeError(f"Expected an instance of _ElectrodeFormulation. Provided: {type(value)}.")
-
-    @staticmethod
-    def validate_insulation_material(value: Type) -> None:
-        """
-        Validate that a value is an instance of InsulationMaterial.
-
-        Parameters
-        ----------
-        value : Type
-            The value to validate.
-
-        Raises
-        ------
-        TypeError
-            If the value is not an instance of InsulationMaterial.
-        """
-        from steer_materials.CellMaterials.Base import InsulationMaterial
-
-        if not isinstance(value, InsulationMaterial):
-            raise TypeError(f"Expected an instance of InsulationMaterial. Provided: {type(value)}.")
-
-    @staticmethod
-    def validate_current_collector(value: Type) -> None:
-        """
-        Validate that a value is an instance of _CurrentCollector.
-        
-        Parameters
-        ----------
-        value : Type
-            The value to validate.
-
-        Raises
-        ------
-        TypeError
-            If the value is not an instance of _CurrentCollector.
-        """
-        from steer_opencell_design.Components.CurrentCollectors import _CurrentCollector
-
-        if not isinstance(value, _CurrentCollector):
-            raise TypeError(f"Expected an instance of _CurrentCollector. Provided: {type(value)}.")
-
-    @staticmethod
-    def validate_active_material(value: Type) -> None:
-        """
-        Validate that a value is an instance of _ActiveMaterial.
-        
-        Parameters
-        ----------
-        value : Type
-            The value to validate.
-
-        Raises
-        ------
-        TypeError
-            If the value is not an instance of _ActiveMaterial.
-        """
-        from steer_materials.CellMaterials.Electrode import _ActiveMaterial
-
-        if not isinstance(value, _ActiveMaterial):
-            raise TypeError(f"Expected an instance of _ActiveMaterial. Provided: {type(value)}.")
-
-    @staticmethod
-    def validate_binder(value: Type) -> None:
-        """
-        Validate that a value is an instance of Binder.
-        
-        Parameters
-        ----------
-        value : Type
-            The value to validate.
-
-        Raises
-        ------
-        TypeError
-            If the value is not an instance of Binder.
-        """
-        from steer_materials.CellMaterials.Electrode import Binder
-
-        if not isinstance(value, Binder):
-            raise TypeError(f"Expected an instance of Binder. Provided: {type(value)}.")
-        
-    @staticmethod
-    def validate_conductive_additive(value: Type) -> None:
-        """
-        Validate that a value is an instance of ConductiveAdditive.
-        
-        Parameters
-        ----------
-        value : Type
-            The value to validate.
-
-        Raises
-        ------
-        TypeError
-            If the value is not an instance of ConductiveAdditive.
+            If the value is not of the expected type.
         """
-        from steer_materials.CellMaterials.Electrode import ConductiveAdditive
-
-        if not isinstance(value, ConductiveAdditive):
-            raise TypeError(f"Expected an instance of ConductiveAdditive. Provided: {type(value)}.")
+        if not isinstance(value, expected_type):
+            raise TypeError(f"{name} must be of type {expected_type.__name__}. Provided: {type(value).__name__}.")
 
     @staticmethod
     def validate_percentage(value: float, name: str) -> None:
@@ -248,48 +150,6 @@ class ValidationMixin:
         if not all(isinstance(coord, (int, float)) for coord in datum):
             raise TypeError("All coordinates in datum must be numbers.")
     
-    @staticmethod
-    def validate_current_collector_material(material: Type) -> None:
-        """
-        Validate the current collector material.
-
-        Parameters
-        ----------
-        material : str
-            The material to validate.
-
-        Raises
-        ------
-        ValueError
-            If the material is not a valid current collector material.
-        """
-        from steer_materials.CellMaterials.Base import CurrentCollectorMaterial
-
-        if type(material) is not CurrentCollectorMaterial:
-
-            raise ValueError(f"Invalid current collector material: {material}. "
-                             "Must be an instance of CurrentCollectorMaterial.")
-
-    @staticmethod
-    def validate_weld_tab(tab) -> None:
-        """
-        Validate the weld tab.
-
-        Parameters
-        ----------
-        tab : WeldTab
-            The weld tab to validate.
-
-        Raises
-        ------
-        ValueError
-            If the weld tab is not valid.
-        """
-        from steer_opencell_design.Components.CurrentCollectors import WeldTab
-        
-        if not isinstance(tab, WeldTab):
-            raise ValueError(f"Invalid weld tab: {tab}. Must be an instance of WeldTab.")
-
     @staticmethod
     def validate_positive_float(value: float, name: str) -> None:
         """
@@ -382,39 +242,3 @@ class ValidationMixin:
         if len(value) == 0:
             raise ValueError(f"{name} must not be an empty list. Provided: {value}.")
         
-
-class DataMixin:
-    """
-    A mixin class to handle data processing and validation for electrode materials.
-    Provides methods to calculate properties, check curve directions, and process half-cell curves.
-    """
-    @staticmethod
-    def enforce_monotonicity(array: np.ndarray) -> np.ndarray:
-        """
-        Enforces a monotonic version of the input array.
-        If the array is not monotonic, it is smoothed using cumulative max/min.
-        """
-        x = np.arange(len(array))
-        diff = np.diff(array)
-
-        if np.all(diff >= 0):
-            return array  # Already monotonic increasing
-
-        if np.all(diff <= 0):
-            return array  # Already monotonic decreasing, reverse it
-
-        # Determine general trend (ascending or descending)
-        ascending = array[-1] >= array[0]
-
-        # Sort by x so that PCHIP works (PCHIP requires increasing x)
-        # We'll smooth the array using PCHIP, then enforce monotonicity
-        interpolator = PchipInterpolator(x, array, extrapolate=False)
-        new_array = interpolator(x)
-
-        # Enforce strict monotonicity post-smoothing
-        if ascending:
-            new_array = np.maximum.accumulate(new_array)
-        else:
-            new_array = np.minimum.accumulate(new_array)
-
-        return new_array

steer_core/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.10"
+__version__ = "0.1.11"

{steer_core-0.1.10.dist-info → steer_core-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: steer-core
-Version: 0.1.10
+Version: 0.1.11
 Summary: Modelling energy storage from cell to site - STEER OpenCell Design
 Home-page: https://github.com/nicholas9182/steer-core/
 Author: Nicholas Siemons

{steer_core-0.1.10.dist-info → steer_core-0.1.11.dist-info}/RECORD

@@ -1,5 +1,5 @@
 steer_core/DataManager.py,sha256=KKpN8GiVHm8xfUmjHKgfLt_xRXT--dhNX8gxs022VHs,11156
-steer_core/__init__.py,sha256=z0zCHFTcKSR0tJ6h5qrpNmRVP21QIPP8N0p7quCnnm0,23
+steer_core/__init__.py,sha256=nllDrH0jyChMuuYrK0CC55iTBKUNTUjejtcwxyUF2EQ,23
 steer_core/Apps/ContextManagers.py,sha256=p3_m6cio2bobP0gg03Iu18XRPHTeIsoZasf5TnLsvZg,1810
 steer_core/Apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 steer_core/Apps/Components/MaterialSelectors.py,sha256=KVDhOK5c0LT-2z9_o_QYdk6wsDjPEZ0Wb4xHXOjZvNc,31715
@@ -15,19 +15,19 @@ steer_core/Constants/Universal.py,sha256=5FWdrex5NiI2DResDmwO7GIvGN2B0DNtdlG1l-y
 steer_core/Constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 steer_core/ContextManagers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 steer_core/Data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-steer_core/Data/database.db,sha256=tPRIFjJeazk4VVtySkKvY9CaJf7nIA5EtVP7YtyFWZo,12795904
+steer_core/Data/database.db,sha256=R2r_jtXnP_ywNScbGuZgMdlmHxcMZto19Ap0eSCY8n0,13615104
 steer_core/Decorators/Coordinates.py,sha256=qo79PlA8ZZ6QY-VvH9YGg27gqpVJ2-Xa3blyoQVCp7A,1436
 steer_core/Decorators/Electrochemical.py,sha256=fAy89aw3zspBu_8UPa5kEhUpvO-bYpM0xH1r6O6mSiA,985
 steer_core/Decorators/General.py,sha256=-Wu-kTC9JAokicgt_nvANR7zpbCBPNR1kDmY6jzHfy4,966
 steer_core/Decorators/Objects.py,sha256=xiQfFgyTY2k8MF4lWojHMWbUMzojpyt8fRGl5bTNze8,503
 steer_core/Decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 steer_core/Mixins/Colors.py,sha256=rJnXyUb9hdy3SkzrPV9dXvnBFZ1funYRF8Q0EZr3vZA,1152
-steer_core/Mixins/Coordinates.py,sha256=L5-OqG30lpqLjJd4SDhSxF_W2G4q5vsLMFfxTZjNzcg,12937
+steer_core/Mixins/Coordinates.py,sha256=lxToydRFDiRkHdA2sOJKZnu44ztbNfURV6aza5eMGtE,12969
 steer_core/Mixins/Data.py,sha256=wdNedZHS5Q7B-pCIoEbqTWMcxsC91CVn9pbQ2Zszg3w,1363
 steer_core/Mixins/Serializer.py,sha256=x-aX8BcFSh5egZdkKinYMmIHLqZymCnETNUld3hzgnk,1039
-steer_core/Mixins/Validators.py,sha256=VmWmv1M8YqTzaIyc95TOvNEJScG7o8rQezQNor84DEc,12933
 steer_core/Mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-steer_core-0.1.10.dist-info/METADATA,sha256=eJrB0lxEXEtff8IWG70vGtIzvyyZq5n-PUQHobaR0LM,704
-steer_core-0.1.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-steer_core-0.1.10.dist-info/top_level.txt,sha256=6LFpGCSDE_SqRoT7raeM3Ax7KTBKQnyXLXxM9kXtw5M,11
-steer_core-0.1.10.dist-info/RECORD,,
+steer_core/Mixins/validators.py,sha256=3GwRJeC30JNpRYavkirdMsGlZxPrGVxe4cX0wxj8dG8,7449
+steer_core-0.1.11.dist-info/METADATA,sha256=HKNtfkr6KVQlibYFgDNfIFc0CldmTf-j8-2kUvruXzk,704
+steer_core-0.1.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+steer_core-0.1.11.dist-info/top_level.txt,sha256=6LFpGCSDE_SqRoT7raeM3Ax7KTBKQnyXLXxM9kXtw5M,11
+steer_core-0.1.11.dist-info/RECORD,,