From 26a815e81320a6e96aeb542770e95da78c2377b7 Mon Sep 17 00:00:00 2001
From: hyunp2 <42776897+hyunp2@users.noreply.github.com>
Date: Tue, 26 Sep 2023 14:15:11 -0500
Subject: [PATCH] Update filter_and_merge.py

---
 utils/filter_and_merge.py | 70 ++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/utils/filter_and_merge.py b/utils/filter_and_merge.py
index b4b5ebd6..1558380d 100644
--- a/utils/filter_and_merge.py
+++ b/utils/filter_and_merge.py
@@ -10,7 +10,7 @@
 from src.datasets import read_sdf
 
 
-def run(input_dir, output_dir, template, n):
+def run(input_dir, output_dir, template):
 
     os.makedirs(output_dir, exist_ok=True)
     out_table_path = os.path.join(output_dir, f'{template}_table.csv')
@@ -23,43 +23,45 @@ def run(input_dir, output_dir, template, n):
     full_fragments = []
     full_linkers = []
 
-    for idx in range(n):
-        mol_path = os.path.join(input_dir, f'{template}_mol_{idx}.sdf')
-        frag_path = os.path.join(input_dir, f'{template}_frag_{idx}.sdf')
-        link_path = os.path.join(input_dir, f'{template}_link_{idx}.sdf')
-        table_path = os.path.join(input_dir, f'{template}_table_{idx}.csv')
+    
+    # for idx in range(n):
+    mol_path = os.path.join(input_dir, f'{template}_mol.sdf')
+    frag_path = os.path.join(input_dir, f'{template}_frag.sdf')
+    link_path = os.path.join(input_dir, f'{template}_link.sdf')
+    table_path = os.path.join(input_dir, f'{template}_table.csv')
 
-        table = pd.read_csv(table_path)
-        table['idx'] = table.index
-        grouped_table = (
-            table
-            .groupby(['molecule', 'fragments', 'linker', 'anchor_1', 'anchor_2'])
-            .min()
-            .reset_index()
-            .sort_values(by='idx')
-        )
-        idx_to_keep = set(grouped_table['idx'].unique())
-        table['keep'] = table['idx'].isin(idx_to_keep)
+    table = pd.read_csv(table_path)
+    table['idx'] = table.index
+    grouped_table = (
+        table
+        .groupby(['molecule', 'fragments', 'linker', 'anchor_1', 'anchor_2'])
+        .min()
+        .reset_index()
+        .sort_values(by='idx')
+    )
+    idx_to_keep = set(grouped_table['idx'].unique())
+    table['keep'] = table['idx'].isin(idx_to_keep)
 
-        generator = tqdm(
-            zip(table.iterrows(), read_sdf(mol_path), read_sdf(frag_path), read_sdf(link_path)),
-            total=len(table),
-            desc=str(idx),
-        )
-        try:
-            for (_, row), molecule, fragments, linker in generator:
-                if row['keep']:
-                    if molecule.GetProp('_Name') != row['molecule']:
-                        print('Molecule _Name:', molecule.GetProp('_Name'), row['molecule'])
-                        continue
+    generator = tqdm(
+        zip(table.iterrows(), read_sdf(mol_path), read_sdf(frag_path), read_sdf(link_path)),
+        total=len(table),
+        desc='Full data',
+    )
+    try:
+        for (_, row), molecule, fragments, linker in generator:
+            if row['keep']:
+                if molecule.GetProp('_Name') != row['molecule']:
+                    print('Molecule _Name:', molecule.GetProp('_Name'), row['molecule'])
+                    continue
 
-                    full_table.append(row)
-                    full_molecules.append(molecule)
-                    full_fragments.append(fragments)
-                    full_linkers.append(linker)
-        except:
-            pass
+                full_table.append(row)
+                full_molecules.append(molecule)
+                full_fragments.append(fragments)
+                full_linkers.append(linker)
+    except:
+        pass
 
+    
     full_table = pd.DataFrame(full_table)
     full_table.to_csv(out_table_path, index=False)
     with Chem.SDWriter(open(out_mol_path, 'w')) as writer: