sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fixes

Browse Source
This commit is contained in:
Sander Roosendaal
2024-07-29 18:31:32 +02:00
parent ce22e0ebd5
commit 041077f0e6
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/dataprep.py
View File

@@ -766,8 +766,12 @@ def fetchcp_new(rower, workouts):
if len(data) > 1: if len(data) > 1:
df = pl.concat(data) df = pl.concat(data)
try: try:
df = df.group_by(pl.col("delta")).agg(pl.max("cp"), pl.max("workout"), pl.max("url")).sort("delta") #df = df.group_by(pl.col("delta")).agg(pl.max("cp"), pl.max("workout"), pl.max("url")).sort("delta")
df = df.groupby('delta').agg([
pl.all().sort_by('cp').last(),
])
except (KeyError, ColumnNotFoundError): # pragma: no cover except (KeyError, ColumnNotFoundError): # pragma: no cover
return pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64), 0, pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64) return pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64), 0, pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64)

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.

9
rowers/utils.py
View File

@@ -361,9 +361,12 @@ def isbreakthrough(delta, cpvalues, p0, p1, p2, p3, ratio):
pwr *= ratio pwr *= ratio
delta = delta.cast(pl.Int32) try:
cpvalues = cpvalues.cast(pl.Int32) delta = delta.cast(pl.Int32)
pwr = pwr.cast(pl.Int32) cpvalues = cpvalues.cast(pl.Int32)
pwr = pwr.cast(pl.Int32)
except:
return False, pl.DataFrame(), False
btdf = pl.DataFrame({ btdf = pl.DataFrame({
'delta': delta, 'delta': delta,