From f7d2890ebab79626a303dfee263aa1b52766b83a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 27 Apr 2021 19:43:44 +0200 Subject: [PATCH] fixing some more copywarnings --- rowers/courseutils.py | 8 ++++---- rowers/views/analysisviews.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rowers/courseutils.py b/rowers/courseutils.py index b39a6042..64630b08 100644 --- a/rowers/courseutils.py +++ b/rowers/courseutils.py @@ -133,14 +133,14 @@ def coursetime_paths(data,paths,finalmaxmin='min',polygons=[],logfile=None): if len(paths) > 1: try: time,dist = time_in_path(data, paths[0],name=polygons[0][1],logfile=logfile) - data = data[data['time']>time] - data['time'] = data['time']-time - data['cum_dist'] = data['cum_dist']-dist + data2 = data[data['time']>time].copy() + data2['time'] = data2['time'].apply(lambda x:x-time) + data2['cum_dist'] = data2['cum_dist'].apply(lambda x:x-dist) ( timenext, distnext, coursecompleted - ) = coursetime_paths(data,paths[1:],polygons=polygons[1:],logfile=logfile) + ) = coursetime_paths(data2,paths[1:],polygons=polygons[1:],logfile=logfile) return time+timenext, dist+distnext,coursecompleted except InvalidTrajectoryError: # pragma: no cover entrytime = data['time'].max() diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 5a531521..607ebdba 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -433,12 +433,12 @@ def trendflexdata(workouts, options,userid=0): if groupby != 'date': try: df['groupval'] = groups.mean()[groupby] - df['groupval'].loc[mask] = np.nan + df.loc[mask,'groupval'] = np.nan groupcols = df['groupval'] except (ValueError, AttributeError): # pragma: no cover df['groupval'] = groups.mean()[groupby].fillna(value=0) - df['groupval'].loc[mask] = np.nan + df.loc[mask,'groupval'] = np.nan groupcols = df['groupval'] except KeyError: # pragma: no cover messages.error(request,'Data selection error')