fix

Baylife5 · Jan 26, 2021 · bb8659d · bb8659d
1 parent 5aaf2c9
commit bb8659d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/19_blastomatic/solution1_manual.py b/19_blastomatic/solution1_manual.py
@@ -96,12 +96,13 @@ def main():
             if info := annots.get(seq_id):
                 num_written += 1
                 args.outfile.write(
-                    args.delimiter.join([
-                        seq_id,
-                        hit.get('pident'),
-                        info.get('depth'),
-                        '"{}"'.format(info.get('lat_lon')),
-                    ]) + '\n')
+                    args.delimiter.join(
+                        map(lambda s: f'"{s}"', [
+                            seq_id,
+                            hit.get('pident'),
+                            info.get('depth'),
+                            info.get('lat_lon')
+                        ])) + '\n')
 
     args.outfile.close()
     print(f'Exported {num_written:,} to "{args.outfile.name}".')

diff --git a/19_blastomatic/solution4_pandas_join.py b/19_blastomatic/solution4_pandas_join.py
@@ -73,7 +73,7 @@ def main():
     """ Make a jazz noise here """
 
     args = get_args()
-    annots = pd.read_csv(args.annotations)
+    annots = pd.read_csv(args.annotations, index_col='seq_id')
     hits = pd.read_csv(args.hits,
                        delimiter=',',
                        names=[
@@ -82,8 +82,9 @@ def main():
                            'evalue', 'bitscore'
                        ])
 
-    joined = hits[hits['pident'] >= args.pctid].join(
-        annots.set_index('seq_id'), on='qseqid', how='inner')
+    joined = hits[hits['pident'] >= args.pctid].join(annots,
+                                                     on='qseqid',
+                                                     how='inner')
 
     # joined = pd.merge(hits[hits['pident'] >= args.pctid],
     #                   annots,