Skip to content

Commit 8cabf12

Browse files
authored
Merge pull request #12 from ocean-tracking-network/main
update dev from main
2 parents 48a4e4f + 7c05aea commit 8cabf12

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

resonate/filters.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ def filter_detections(detections: pd.DataFrame, suspect_file=None,
145145
dm_mandatory_columns - set(detections.columns)))
146146
if add_column:
147147
output_dict['filtered'].loc[:, 'passed_detection_filter'] = True
148-
output_dict['suspect'].loc[output_dict['suspect'].index, 'passed_detection_filter'] = False
148+
if not output_dict['suspect'].empty:
149+
output_dict['suspect'].loc[output_dict['suspect'].index, 'passed_detection_filter'] = False
149150
output_df = pd.concat(output_dict.values()).reset_index(drop=True)
150151
if distance_matrix:
151152
return {'detections': output_df, 'dist_mtrx': output_dict['dist_mtrx']}

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
description='resonate data analysis package',
1717
long_description=readme,
1818
long_description_content_type='text/markdown',
19-
author='Ryan Gosse',
19+
author='Jon Pye',
2020
include_package_data=True,
21-
author_email='ryan.gosse@dal.ca',
21+
author_email='jonpye@gmail.com',
2222
url='https://github.com/ocean-tracking-network/resonATe',
2323
download_url='https://github.com/ocean-tracking-network/resonATe',
2424
license='GPLv2',

0 commit comments

Comments
 (0)