PyDPEET 0.3.0__tar.gz → 0.3.1__tar.gz

{pydpeet-0.3.0/src/PyDPEET.egg-info → pydpeet-0.3.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: PyDPEET
-Version: 0.3.0
+Version: 0.3.1
 Summary: Python package to read, unify, and convert battery measurement data from arbitrary battery cyclers to Parquet files. This package also provides functions to process, evaluate, and visualise the standardised data.
-Author: Alexander Günter Hinrichsen, Jan Kalisch, Daniel Schröder, Cataldo De Simone
-Author-email: Anton Schlösser <a.schloesser@tu-berlin.de>, Martin Otto <m.otto.1@tu-berlin.de>
+Author: Anton Schlösser, Martin Otto, Alexander Günter Hinrichsen, Jan Kalisch, Daniel Schröder, Cataldo De Simone
+Maintainer-email: PyDPEET Team <pydpeet@eet.tu-berlin.de>
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENCE.md
@@ -11,7 +11,7 @@ License-File: AUTHORS.md
 Requires-Dist: pandas==2.2.3
 Requires-Dist: numpy==2.2.4
 Requires-Dist: pyarrow==19.0.1
-Requires-Dist: python-calamine==0.3.1
+Requires-Dist: python-calamine>=0.3.1
 Requires-Dist: numba==0.64.0
 Requires-Dist: matplotlib==3.10.8
 Requires-Dist: scipy==1.17.1

{pydpeet-0.3.0 → pydpeet-0.3.1}/pyproject.toml

@@ -4,21 +4,26 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "PyDPEET"
-version = "0.3.0"
+version = "0.3.1"
 description = "Python package to read, unify, and convert battery measurement data from arbitrary battery cyclers to Parquet files. This package also provides functions to process, evaluate, and visualise the standardised data."
 authors = [
-    { name = "Anton Schlösser", email = "a.schloesser@tu-berlin.de"},
-    { name = "Martin Otto", email = "m.otto.1@tu-berlin.de"},
+    { name = "Anton Schlösser" },
+    { name = "Martin Otto" },
     { name = "Alexander Günter Hinrichsen" },
     { name = "Jan Kalisch" },
     { name = "Daniel Schröder" },
     { name = "Cataldo De Simone" },
 ]
+
+maintainers = [
+    { name = "PyDPEET Team", email = "pydpeet@eet.tu-berlin.de" },
+]
+
 dependencies = [
     "pandas==2.2.3",
     "numpy==2.2.4",
     "pyarrow==19.0.1",
-    "python-calamine==0.3.1",
+    "python-calamine>=0.3.1",
     "numba==0.64.0",
     "matplotlib==3.10.8",
     "scipy==1.17.1",

{pydpeet-0.3.0 → pydpeet-0.3.1/src/PyDPEET.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: PyDPEET
-Version: 0.3.0
+Version: 0.3.1
 Summary: Python package to read, unify, and convert battery measurement data from arbitrary battery cyclers to Parquet files. This package also provides functions to process, evaluate, and visualise the standardised data.
-Author: Alexander Günter Hinrichsen, Jan Kalisch, Daniel Schröder, Cataldo De Simone
-Author-email: Anton Schlösser <a.schloesser@tu-berlin.de>, Martin Otto <m.otto.1@tu-berlin.de>
+Author: Anton Schlösser, Martin Otto, Alexander Günter Hinrichsen, Jan Kalisch, Daniel Schröder, Cataldo De Simone
+Maintainer-email: PyDPEET Team <pydpeet@eet.tu-berlin.de>
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENCE.md
@@ -11,7 +11,7 @@ License-File: AUTHORS.md
 Requires-Dist: pandas==2.2.3
 Requires-Dist: numpy==2.2.4
 Requires-Dist: pyarrow==19.0.1
-Requires-Dist: python-calamine==0.3.1
+Requires-Dist: python-calamine>=0.3.1
 Requires-Dist: numba==0.64.0
 Requires-Dist: matplotlib==3.10.8
 Requires-Dist: scipy==1.17.1

{pydpeet-0.3.0 → pydpeet-0.3.1}/src/PyDPEET.egg-info/requires.txt

@@ -1,7 +1,7 @@
 pandas==2.2.3
 numpy==2.2.4
 pyarrow==19.0.1
-python-calamine==0.3.1
+python-calamine>=0.3.1
 numba==0.64.0
 matplotlib==3.10.8
 scipy==1.17.1

{pydpeet-0.3.0 → pydpeet-0.3.1}/src/pydpeet/io/device/digatron_4_20_6_236/reader.py

@@ -1,3 +1,5 @@
+import logging
+
 import pandas as pd
 
 
@@ -14,7 +16,7 @@ def to_dataframe(input_path: str) -> tuple[pd.DataFrame, str]:
     metadata = []
 
     # Open the file and process lines
-    with open(input_path, encoding="us-ascii") as file:
+    with open(input_path, encoding="iso-8859-1") as file:
         # Read metadata until the header line is found
         line = file.readline()
         while not line.startswith("Zeitstempel"):
@@ -22,11 +24,11 @@ def to_dataframe(input_path: str) -> tuple[pd.DataFrame, str]:
             line = file.readline()
 
         # Extract headers and remaining data
-        headers = line.strip().split(";")
-        data_lines = [row.strip().split(";") for row in file if row.strip()]
+        headers = line.strip().split(",")
+        data_lines = [row.strip().split(",") for row in file if row.strip()]
 
         # appending first string from datalines
-        metadata.append(";".join(data_lines.pop(0)))
+        metadata.append(",".join(data_lines.pop(0)))
 
     # Join metadata into a single string
     metadata_str = "\n".join(metadata)
@@ -37,9 +39,21 @@ def to_dataframe(input_path: str) -> tuple[pd.DataFrame, str]:
     # Convert numeric columns to appropriate types
     for col in headers:
         try:
+            # Handle duplicate column names by appending an index to duplicates
+            cols = pd.Series(df.columns)
+            for dup in df.columns[df.columns.duplicated(keep=False)]:
+                cols[df.columns.get_loc(dup)] = [
+                    f"{dup}_{d_idx}" if d_idx != 0 else dup for d_idx in range(df.columns.get_loc(dup).sum())
+                ]
+            df.columns = cols
+
             df[col] = pd.to_numeric(df[col])
         except ValueError:
             # Leave non-numeric columns as is
             pass
 
+    if "T_Batt" not in df.columns:
+        df["T_Batt"] = None
+        logging.warning("Column 'T_Batt' not found in the data. Filling with None values.")
+
     return df, metadata_str