cellpy 1.0.2.post4__tar.gz → 1.0.2.post6__tar.gz

{cellpy-1.0.2.post4 → cellpy-1.0.2.post6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cellpy
-Version: 1.0.2.post4
+Version: 1.0.2.post6
 Summary: Extract and manipulate data from battery data testers.
 Home-page: https://github.com/jepegit/cellpy
 Author: Jan Petter Maehlen

cellpy-1.0.2.post6/cellpy/_version.py

@@ -0,0 +1 @@
+__version__ = "1.0.2post6"

{cellpy-1.0.2.post4 → cellpy-1.0.2.post6}/cellpy/readers/cellreader.py

@@ -5312,26 +5312,68 @@ class CellpyCell:
     # TODO: @jepe - this method might be valuable for users and could be made
     #  public when it is fixed:
     def _select_without(self, exclude_types=None, exclude_steps=None, replace_nan=True):
+        """Filter and modify cell cycling data by excluding specific step types and steps.
+        
+        This method processes raw cell cycling data by:
+        1. Selecting the last data point for each cycle
+        2. Excluding specified step types and step numbers
+        3. Adjusting the raw data values by subtracting the contributions from excluded steps
+        
+        Parameters
+        ----------
+        exclude_types : str or list of str, optional
+            Step types to exclude (e.g., 'charge', 'discharge'). If None, no step types are excluded.
+        exclude_steps : int or list of int, optional
+            Step numbers to exclude. If None, no specific steps are excluded.
+        replace_nan : bool, default True
+            Whether to replace NaN values with 0.0 in the resulting dataframe.
+            
+        Returns
+        -------
+        pandas.DataFrame
+            A filtered and modified dataframe containing the cell cycling data with excluded
+            steps removed and their contributions subtracted from the raw values.
+
+        
+        """
+
+        # summary_no_cv = self.make_summary(selector_type="non-cv", create_copy=True).data.summary
+        # summary_only_cv = self.make_summary(selector_type="only-cv", create_copy=True).data.summary
+        # if selector is None:
+        #     if selector_type == "non-cv":
+        #         exclude_types = ["cv_"]
+        #     elif selector_type == "non-rest":
+        #         exclude_types = ["rest_"]
+        #     elif selector_type == "non-ocv":
+        #         exclude_types = ["ocv_"]
+        #     elif selector_type == "only-cv":
+        #         exclude_types = ["charge", "discharge"]
+        #     selector = functools.partial(
+        #         self._select_without,
+        #         exclude_types=exclude_types,
+        #         exclude_steps=exclude_steps,
+        #     )
+
         steps = self.data.steps
         raw = self.data.raw.copy()
 
         # unravel the headers:
-        d_n_txt = self.headers_normal.data_point_txt
-        v_n_txt = self.headers_normal.voltage_txt
-        c_n_txt = self.headers_normal.cycle_index_txt
-        s_n_txt = self.headers_normal.step_index_txt
-        i_n_txt = self.headers_normal.current_txt
-        ch_n_txt = self.headers_normal.charge_capacity_txt
-        dch_n_txt = self.headers_normal.discharge_capacity_txt
-
-        d_st_txt = self.headers_step_table.point
-        v_st_txt = self.headers_step_table.voltage
-        c_st_txt = self.headers_step_table.cycle
-        i_st_txt = self.headers_step_table.current
-        ch_st_txt = self.headers_step_table.charge
-        dch_st_txt = self.headers_step_table.discharge
-        t_st_txt = self.headers_step_table.type
-        s_st_txt = self.headers_step_table.step
+        hdrn_data_point = self.headers_normal.data_point_txt
+        hdrn_voltage = self.headers_normal.voltage_txt
+        hdrn_cycle_index = self.headers_normal.cycle_index_txt
+        hdrn_step_index = self.headers_normal.step_index_txt
+        hdrn_current = self.headers_normal.current_txt
+        hdrn_charge_capacity = self.headers_normal.charge_capacity_txt
+        hdrn_discharge_capacity = self.headers_normal.discharge_capacity_txt
+
+        hdrst_data_point = self.headers_step_table.point
+        hdrst_voltage = self.headers_step_table.voltage
+        hdrst_cycle = self.headers_step_table.cycle
+        hdrst_current = self.headers_step_table.current
+        hdrst_charge = self.headers_step_table.charge
+        hdrst_discharge = self.headers_step_table.discharge
+        hdrst_type = self.headers_step_table.type
+        hdrst_step = self.headers_step_table.step
 
         _first = "_first"
         _last = "_last"
@@ -5347,41 +5389,50 @@ class CellpyCell:
         # TODO: @jepe - this method might be a bit slow for large datasets - consider using
         #  more "native" pandas methods and get rid of all looping (need some timing to check first)
 
-        last_data_points = steps.loc[:, [c_st_txt, d_st_txt + _last]].groupby(c_st_txt).last().values.ravel()
-        last_items = raw[d_n_txt].isin(last_data_points)
+        last_data_points = steps.loc[:, [hdrst_cycle, hdrst_data_point + _last]].groupby(hdrst_cycle).last().values.ravel()
+        last_items = raw[hdrn_data_point].isin(last_data_points)
         selected = raw[last_items]
 
         if exclude_types is None and exclude_steps is None:
             return selected
 
         if not isinstance(exclude_types, (list, tuple)):
-            exclude_types = [exclude_types]
+            if exclude_types is None:
+                exclude_types = []
+            else:
+                exclude_types = [exclude_types]
 
         if not isinstance(exclude_steps, (list, tuple)):
-            exclude_steps = [exclude_steps]
+            if exclude_steps is None:
+                exclude_steps = []
+            else:
+                exclude_steps = [exclude_steps]
+
+        if not exclude_types and not exclude_steps:
+            return selected
 
+        # create the selector for the not excluded steps (selecting ~q will then select the data points that are excluded):
         q = None
         for exclude_type in exclude_types:
-            # check if it contains the type at all
-            steps[t_st_txt].str.startswith(exclude_type)
-            _q = ~steps[t_st_txt].str.startswith(exclude_type, na=False)
+            _q = ~steps[hdrst_type].str.startswith(exclude_type, na=False)
             q = _q if q is None else q & _q
 
         if exclude_steps:
-            _q = ~steps[t_st_txt].isin(exclude_steps, na=False)
+            _q = ~steps[hdrst_step].isin(exclude_steps)
             q = _q if q is None else q & _q
 
+        # create the deltas (to be subtracted from the raw data) due to the excluded steps:
         _delta_columns = [
-            i_st_txt,
-            v_st_txt,
-            ch_st_txt,
-            dch_st_txt,
+            hdrst_current,
+            hdrst_voltage,
+            hdrst_charge,
+            hdrst_discharge,
         ]
         _raw_columns = [
-            i_n_txt,
-            v_n_txt,
-            ch_n_txt,
-            dch_n_txt,
+            hdrn_current,
+            hdrn_voltage,
+            hdrn_charge_capacity,
+            hdrn_discharge_capacity,
         ]
         _diff_columns = [f"{col}{_delta_label}" for col in _delta_columns]
 
@@ -5389,21 +5440,22 @@ class CellpyCell:
         delta_last = [f"{col}{_last}" for col in _delta_columns]
         delta_columns = delta_first + delta_last
 
-        delta = steps.loc[~q, [c_st_txt, d_st_txt + _last, *delta_columns]].copy()
+        # select the data points that are excluded:
+        delta = steps.loc[~q, [hdrst_type, hdrst_cycle, hdrst_data_point + _last, *delta_columns]].copy()
 
         for col in _delta_columns:
             delta[col + _delta_label] = delta[col + _last] - delta[col + _first]
         delta = delta.drop(columns=delta_columns)
-        delta = delta.groupby(c_st_txt).sum()
+        delta = delta.groupby(hdrst_cycle).sum()
         delta = delta.reset_index()
 
-        selected = selected.merge(delta, how="left", left_on=c_n_txt, right_on=c_st_txt)
+        selected = selected.merge(delta, how="left", left_on=hdrn_cycle_index, right_on=hdrst_cycle)
         if replace_nan:
             selected = selected.fillna(0.0)
 
         for col_n, col_diff in zip(_raw_columns, _diff_columns):
             selected[col_n] -= selected[col_diff]
-        selected = selected.drop(columns=_diff_columns)
+        selected = selected.drop(columns=_diff_columns + [hdrst_cycle, hdrst_data_point + _last, hdrst_type])
 
         return selected
 

{cellpy-1.0.2.post4 → cellpy-1.0.2.post6}/cellpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cellpy
-Version: 1.0.2.post4
+Version: 1.0.2.post6
 Summary: Extract and manipulate data from battery data testers.
 Home-page: https://github.com/jepegit/cellpy
 Author: Jan Petter Maehlen

{cellpy-1.0.2.post4 → cellpy-1.0.2.post6}/pyproject.toml

@@ -1,10 +1,11 @@
 [build-system]
+# This section defines the build system requirements
 requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [tool.pytest.ini_options]
 minversion = "6.0"
-addopts = "--durations=0 -v -m \"not slowtest and not smoketest and not unimportant and not unfinished and not onlylocal\""
+addopts = "--durations=0 --capture=fd -v -m \"not slowtest and not smoketest and not unimportant and not unfinished and not onlylocal\""
 markers = [
     "slowtest: marks tests as slow (deselect with '-m \"not slow\"')",
     "serial",
@@ -14,7 +15,7 @@ markers = [
 line-length = 120
 
 [tool.bumpver]
-current_version = "1.0.2post4"
+current_version = "1.0.2post6"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAG][NUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

cellpy-1.0.2.post4/cellpy/_version.py

@@ -1 +0,0 @@
-__version__ = "1.0.2post4"