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

fix update_records

Browse Source
This commit is contained in:
Sander Roosendaal
2023-09-11 21:08:42 +02:00
parent a6fd61099c
commit d361c05f09
3 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
rowers/courseutils.py
View File

@@ -1,5 +1,5 @@
import time
from rowers.utils import dologging
# low level methods
def coordinate_in_path(latitude, longitude, p):
@@ -32,47 +32,26 @@ def time_in_path(df, p, maxmin='max', getall=False, name='unknown', logfile=None
if len(df[b == 2]):
if logfile is not None: # pragma: no cover
t = time.localtime()
timestamp = bytes('{t}'.format(
t=time.strftime('%b-%d-%Y_%H%M', t)), 'utf-8')
with open(logfile, 'ab') as f:
f.write(b'\n')
f.write(timestamp)
f.write(b' ')
f.write(bytes(name, 'utf-8'))
f.write(b' ')
f.write(bytes(maxmin, 'utf-8'))
f.write(b' ')
f.write(bytes(str(getall), 'utf-8'))
f.write(b' ')
f.write(bytes(str(len(df[b == 2])), 'utf-8'))
f.write(b' ')
if len(df[b == 2]) > 1:
f.write(b' passes found')
else:
f.write(b' pass found')
s = '{name} {maxmin} {getall} {nrpasses} passes found'.format(
name = name,
maxmin = maxmin,
getall = getall,
nrpasses = len(df[b==2]),
)
dologging(logfile,s)
if getall: # pragma: no cover
return df[b == 2]['time'], df[b == 2]['cum_dist']
else:
return df[b == 2]['time'].min(), df[b == 2]['cum_dist'].min()
if logfile is not None: # pragma: no cover
t = time.localtime()
timestamp = bytes('{t}'.format(
t=time.strftime('%b-%d-%Y_%H%M', t)), 'utf-8')
with open(logfile, 'ab') as f:
f.write(b'\n')
f.write(timestamp)
f.write(b' ')
f.write(bytes(name, 'utf-8'))
f.write(b' ')
f.write(bytes(maxmin, 'utf-8'))
f.write(b' ')
f.write(bytes(str(getall), 'utf-8'))
f.write(b' ')
f.write(bytes(str(len(df[b == 2])), 'utf-8'))
f.write(b' ')
f.write(b' pass not found')
s = '{name} {maxmin} {getall} {nrpasses} pass not found'.format(
name = name,
maxmin = maxmin,
getall = getall,
nrpasses = len(df[b==2])
)
dologging(logfile,s)
raise InvalidTrajectoryError(
"Trajectory doesn't go through path") # pragma: no cover