ddi-fw 0.0.117__py3-none-any.whl → 0.0.118__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- ddi_fw/datasets/ddi_mdl/base.py +14 -4
- {ddi_fw-0.0.117.dist-info → ddi_fw-0.0.118.dist-info}/METADATA +1 -1
- {ddi_fw-0.0.117.dist-info → ddi_fw-0.0.118.dist-info}/RECORD +5 -5
- {ddi_fw-0.0.117.dist-info → ddi_fw-0.0.118.dist-info}/WHEEL +0 -0
- {ddi_fw-0.0.117.dist-info → ddi_fw-0.0.118.dist-info}/top_level.txt +0 -0
ddi_fw/datasets/ddi_mdl/base.py
CHANGED
|
@@ -60,7 +60,7 @@ class DDIMDLDataset(BaseDataset):
|
|
|
60
60
|
embedding_columns.append(column)
|
|
61
61
|
elif column in list_of_ner_columns:
|
|
62
62
|
ner_columns.append(column)
|
|
63
|
-
elif column == 'smile_2':
|
|
63
|
+
elif column == 'smile_2' or columns=='smile_3':
|
|
64
64
|
continue
|
|
65
65
|
else:
|
|
66
66
|
raise Exception(f"{column} is not related this dataset")
|
|
@@ -90,18 +90,22 @@ class DDIMDLDataset(BaseDataset):
|
|
|
90
90
|
sim_matrix_gen = SimilarityMatrixGenerator()
|
|
91
91
|
jaccard_sim_dict["smile_2"] = sim_matrix_gen.create_jaccard_similarity_matrices(
|
|
92
92
|
self.drugs_df["smile_2"].to_list())
|
|
93
|
+
jaccard_sim_dict["smile_3"] = sim_matrix_gen.create_jaccard_similarity_matrices(
|
|
94
|
+
self.drugs_df["smile_3"].to_list())
|
|
93
95
|
|
|
94
96
|
similarity_matrices = {}
|
|
95
97
|
drugbank_ids = self.drugs_df['id'].to_list()
|
|
96
98
|
new_columns = {}
|
|
97
|
-
for idx in range(len(drugbank_ids)):
|
|
98
|
-
new_columns[idx] = drugbank_ids[idx]
|
|
99
99
|
for idx in range(len(drugbank_ids)):
|
|
100
100
|
new_columns[idx] = drugbank_ids[idx]
|
|
101
101
|
new_df = pd.DataFrame.from_dict(jaccard_sim_dict["smile_2"])
|
|
102
102
|
new_df = new_df.rename(index=new_columns, columns=new_columns)
|
|
103
103
|
similarity_matrices["smile_2"] = new_df
|
|
104
104
|
|
|
105
|
+
new_df_2 = pd.DataFrame.from_dict(jaccard_sim_dict["smile_3"])
|
|
106
|
+
new_df_2 = new_df.rename(index=new_columns, columns=new_columns)
|
|
107
|
+
similarity_matrices["smile_3"] = new_df_2
|
|
108
|
+
|
|
105
109
|
def lambda_fnc(row, value):
|
|
106
110
|
if row['id1'] in value and row['id2'] in value:
|
|
107
111
|
return np.float16(np.hstack(
|
|
@@ -705,7 +709,13 @@ class DDIMDLDataset(BaseDataset):
|
|
|
705
709
|
|
|
706
710
|
dict_df = pd.DataFrame(list(d.items()), columns=['id', 'smile_3'])
|
|
707
711
|
df = pd.merge(df, dict_df, on='id', how='left')
|
|
708
|
-
|
|
712
|
+
df['smile_3'] = df['smile_3'].apply(lambda x:
|
|
713
|
+
np.fromstring(
|
|
714
|
+
x.replace(
|
|
715
|
+
'\n', '')
|
|
716
|
+
.replace('[', '')
|
|
717
|
+
.replace(']', '')
|
|
718
|
+
.replace(' ', ' '), sep=','))
|
|
709
719
|
|
|
710
720
|
return df
|
|
711
721
|
|
|
@@ -5,7 +5,7 @@ ddi_fw/datasets/embedding_generator.py,sha256=Jqrlv88RCu0Lg812KsA12X0cSaZuxbckJ4
|
|
|
5
5
|
ddi_fw/datasets/feature_vector_generation.py,sha256=gvjpEzkgVV8dp4V8NMMv59u0v-1tNAJ7v83R-keWGoA,4748
|
|
6
6
|
ddi_fw/datasets/idf_helper.py,sha256=_Gd1dtDSLaw8o-o0JugzSKMt9FpeXewTh4wGEaUd4VQ,2571
|
|
7
7
|
ddi_fw/datasets/setup_._py,sha256=khYVJuW5PlOY_i_A16F3UbSZ6s6o_ljw33Byw3C-A8E,1047
|
|
8
|
-
ddi_fw/datasets/ddi_mdl/base.py,sha256=
|
|
8
|
+
ddi_fw/datasets/ddi_mdl/base.py,sha256=1pbnPZHWRe1qW75-ZwbI7EkrDUtc_Ilac_a-uO5qLuI,1031566
|
|
9
9
|
ddi_fw/datasets/ddi_mdl/readme.md,sha256=WC6lpmsEKvIISnZqENY7TWtzCQr98HPpE3oRsBl8pIw,625
|
|
10
10
|
ddi_fw/datasets/ddi_mdl/data/event.db,sha256=cmlSsf9MYjRzqR-mw3cUDnTnfT6FkpOG2yCl2mMwwew,30580736
|
|
11
11
|
ddi_fw/datasets/ddi_mdl/indexes/test_indexes.txt,sha256=XVlDqYATckrQwNSXqMSKVBqyoN_Hg8SK6CL-XMdLADY,102176
|
|
@@ -91,7 +91,7 @@ ddi_fw/utils/package_helper.py,sha256=erl8_onmhK-41zQoaED2qyDUV9GQxmT9sdoyRp9_q5
|
|
|
91
91
|
ddi_fw/utils/py7zr_helper.py,sha256=gOqaFIyJvTjUM-btO2x9AQ69jZOS8PoKN0wetYIckJw,4747
|
|
92
92
|
ddi_fw/utils/utils.py,sha256=szwnxMTDRrZoeNRyDuf3aCbtzriwtaRk4mHSH3asLdA,4301
|
|
93
93
|
ddi_fw/utils/zip_helper.py,sha256=YRZA4tKZVBJwGQM0_WK6L-y5MoqkKoC-nXuuHK6CU9I,5567
|
|
94
|
-
ddi_fw-0.0.
|
|
95
|
-
ddi_fw-0.0.
|
|
96
|
-
ddi_fw-0.0.
|
|
97
|
-
ddi_fw-0.0.
|
|
94
|
+
ddi_fw-0.0.118.dist-info/METADATA,sha256=P3APpabRa4BiRrRVvTFcR-_V0Q4aWrmSzPYEDKgXpZE,1967
|
|
95
|
+
ddi_fw-0.0.118.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
|
|
96
|
+
ddi_fw-0.0.118.dist-info/top_level.txt,sha256=PMwHICFZTZtcpzQNPV4UQnfNXYIeLR_Ste-Wfc1h810,7
|
|
97
|
+
ddi_fw-0.0.118.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|