Commit 51a52722 authored by vdberg's avatar vdberg
Browse files

fix

parent d91f75b8
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ output = output[output['name'] != 'Ryan']
#print('Arg-0 only {}:'.format(df.shape))

# combine output
output['sent_id'] = output['sent_id'].astype(int)
sent['sent_id'] = sent['sent_id'].astype(int)
output['sent_id'] = output['sent_id'].astype(float)
sent['sent_id'] = sent['sent_id'].astype(float)
df = pd.merge(output, sent, on=['sent_id'])
namlabs_df, namlabs = load_nameslab()
df = pd.merge(df, namlabs_df, on=['name'])