Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use dataframe.groupby instead of iterating #61

Merged
merged 17 commits into from
Dec 2, 2019
Merged

Use dataframe.groupby instead of iterating #61

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b56cd33
version bump
cheind Jul 10, 2018
ae83b5a
fix realease readme
cheind Jul 10, 2018
125304f
Merge branch 'release/1.1.3'
cheind Jul 10, 2018
fbe6ed0
Add test for empty predictions
Nov 15, 2019
08ab6d3
Add support for empty predictions.
Nov 15, 2019
30e88c2
Pass list to loc[] to ensure DataFrame is returned
Nov 15, 2019
a866ac4
Add both-empty test. Re-factor tests.
Nov 15, 2019
5fbcf16
Fix event dataframe creator for zero events
Nov 15, 2019
0487b9c
Merge branch 'master' into develop
Nov 15, 2019
f5876ae
Add _qdiv to produce nans silently
Nov 15, 2019
a0d89d8
Use warnings.catch_warnings for suppression
Nov 15, 2019
eb08800
Use single groupby() call to count events
Nov 28, 2019
84487d7
Fix mistake in row and column indexing
Nov 29, 2019
54393a4
Separate counts from computing metrics
Nov 29, 2019
bfb3b62
Merge remote-tracking branch 'cheindl/develop' into develop
Nov 30, 2019
aebc2c3
Merge branch 'dataframe' into develop
Nov 30, 2019
e931a9e
Remove commented-out lines
Nov 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix mistake in row and column indexing
  • Loading branch information
Jack Valmadre committed Nov 29, 2019
commit 84487d73ffac2b54e6dedda2521592cb09b25db5
4 changes: 3 additions & 1 deletion motmetrics/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ def id_global_assignment(df, ana = None):
#st1 = time.time()
oids = df.full['OId'].dropna().unique()
hids = df.full['HId'].dropna().unique()
oids_idx = dict((o,i) for i,o in enumerate(oids))
hids_idx = dict((h,i) for i,h in enumerate(hids))
#print('----'*2, '1', time.time()-st1)
flat = df.raw.reset_index()
Expand Down Expand Up @@ -514,7 +515,8 @@ def id_global_assignment(df, ana = None):
fpmatrix[c+no,c] = hc

#print('----'*2, '5', time.time()-st1)
for (r, c), ex in tpcs.items():
for (oid, hid), ex in tpcs.items():
r, c = oids_idx[oid], hids_idx[hid]
fpmatrix[r,c] -= ex
fnmatrix[r,c] -= ex

Expand Down