worklab 2.3.8__tar.gz → 2.3.9__tar.gz

{worklab-2.3.8 → worklab-2.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: worklab
-Version: 2.3.8
+Version: 2.3.9
 Summary: Basic scripts for worklab devices
 Author-email: Sophie de Klerk <r.de.klerk@pl.hanze.nl>, Thomas Rietveld <t.rietveld@lboro.ac.uk>, Rowie Janssen <r.j.f.janssen@umcg.nl>, Jelmer Braaksma <j.braaksma01@umcg.nl>
 License:                     GNU GENERAL PUBLIC LICENSE

{worklab-2.3.8 → worklab-2.3.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "worklab"
-version = "2.3.8"
+version = "2.3.9"
 description = "Basic scripts for worklab devices"
 readme = "README.md"
 requires-python = ">=3.7"

{worklab-2.3.8 → worklab-2.3.9}/worklab/ana.py

@@ -554,7 +554,7 @@ def ana_sprint(data, data_pbp, half=5, title=None):
     return fig, outcomes
 
 
-def ana_submax(data_ergo, data_pbp, data_spiro):
+def ana_submax(data_ergo, data_pbp, data_spiro=None):
     """
     Sub maximal test analyse. Saves important outcomes
 
@@ -572,8 +572,6 @@ def ana_submax(data_ergo, data_pbp, data_spiro):
     outcomes : pd.DataFrame
 
     """
-    mean_spiro = calc_weighted_average(data_spiro[["RER", "EE", "HR", "VO2"]], data_spiro["weights"])
-    mean_spiro = pd.DataFrame(mean_spiro).T
 
     mean_ergo = [
         {
@@ -581,8 +579,10 @@ def ana_submax(data_ergo, data_pbp, data_spiro):
             "meanpower": data_ergo["mean"]["power"].mean(),
             "ptime_l": data_pbp["left"]["ptime"].mean(),
             "ptime_r": data_pbp["right"]["ptime"].mean(),
+            "ptime": data_pbp['mean']['ptime'].mean(),
             "ctime_l": data_pbp["left"]["ctime"].mean(),
             "ctime_r": data_pbp["right"]["ctime"].mean(),
+            "ctime": data_pbp['mean']['ctime'].mean(),
             "ca_l": data_pbp["left"]["cangle_deg"].mean(),
             "ca_r": data_pbp["right"]["cangle_deg"].mean(),
             "meanpowerperpush": data_pbp["mean"]["meanpower"].mean(),
@@ -591,13 +591,22 @@ def ana_submax(data_ergo, data_pbp, data_spiro):
             "slope": data_pbp["mean"]["slope"].mean(),
             "smoothness": data_pbp["mean"]["smoothness"].mean(),
             "freq": 1 / data_pbp["mean"]["ctime"].mean(),
+            "pushes": len(data_pbp["mean"]),
         }
     ]
 
     mean_ergo = pd.DataFrame(mean_ergo)
 
-    outcomes = pd.concat([mean_ergo, mean_spiro], axis=1)
-    outcomes["me"] = (outcomes["meanpower"] / outcomes["EE"]) * 100
+    if data_spiro is not None:
+        if data_spiro["HR"].isna().all():
+            mean_spiro = calc_weighted_average(data_spiro[["RER", "EE", "VO2"]], data_spiro["weights"])
+        else:
+            mean_spiro = calc_weighted_average(data_spiro[["RER", "EE", "HR", "VO2"]], data_spiro["weights"])
+        mean_spiro = pd.DataFrame(mean_spiro).T
+        outcomes = pd.concat([mean_ergo, mean_spiro], axis=1)
+        outcomes["me"] = (outcomes["meanpower"] / outcomes["EE"]) * 100
+    else:
+        outcomes = mean_ergo
     return outcomes
 
 

{worklab-2.3.8 → worklab-2.3.9}/worklab/com.py

@@ -243,7 +243,10 @@ def load_spiro_metamax(filename, sheet_name=0):
     data["VO2"] = data["VO2"].astype(float)
     data["EE"] = ((4.94 * data["RER"] + 16.04) * (1000 * data["VO2"])) / 60
     data["weights"] = np.insert(np.diff(data["time"]), 0, 0)  # used for calculating weighted average
-    data["HR"] = (np.nan if "HR" not in data else data["HR"]).astype(int)  # missing when sensor is not detected
+    if "HR" not in data or data["HR"].isna().all():
+        data["HR"] = np.nan
+    else:
+        data["HR"] = data["HR"].astype(float)
     data["O2pulse"] = data["VO2"] / data["HR"]
     data["VCO2"].replace(0, 0.01, inplace=True)
     data["VO2"].replace(0, 0.01, inplace=True)

{worklab-2.3.8 → worklab-2.3.9}/worklab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: worklab
-Version: 2.3.8
+Version: 2.3.9
 Summary: Basic scripts for worklab devices
 Author-email: Sophie de Klerk <r.de.klerk@pl.hanze.nl>, Thomas Rietveld <t.rietveld@lboro.ac.uk>, Rowie Janssen <r.j.f.janssen@umcg.nl>, Jelmer Braaksma <j.braaksma01@umcg.nl>
 License:                     GNU GENERAL PUBLIC LICENSE