ddi-fw 0.0.33__py3-none-any.whl → 0.0.35__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/core.py +2 -2
- ddi_fw/datasets/ddi_mdl/base.py +2 -2
- {ddi_fw-0.0.33.dist-info → ddi_fw-0.0.35.dist-info}/METADATA +1 -1
- {ddi_fw-0.0.33.dist-info → ddi_fw-0.0.35.dist-info}/RECORD +6 -6
- {ddi_fw-0.0.33.dist-info → ddi_fw-0.0.35.dist-info}/WHEEL +0 -0
- {ddi_fw-0.0.33.dist-info → ddi_fw-0.0.35.dist-info}/top_level.txt +0 -0
ddi_fw/datasets/core.py
CHANGED
@@ -363,7 +363,7 @@ class BaseDataset(ABC):
|
|
363
363
|
# return np.hstack(
|
364
364
|
# (value[row['id1']], value[row['id2']]), dtype=np.float16)
|
365
365
|
|
366
|
-
def x_fnc(row,
|
366
|
+
def x_fnc(row, embedding_column):
|
367
367
|
v1 = self.embedding_dict[embedding_column][row['id1']]
|
368
368
|
v2 = self.embedding_dict[embedding_column][row['id2']]
|
369
369
|
return np.float16(np.hstack(
|
@@ -380,7 +380,7 @@ class BaseDataset(ABC):
|
|
380
380
|
print(f"concat {embedding_column} embeddings")
|
381
381
|
# column_embeddings_dict = embedding_values[embedding_column]
|
382
382
|
self.ddis_df[embedding_column+'_embedding'] = self.ddis_df.apply(
|
383
|
-
x_fnc, args=(
|
383
|
+
x_fnc, args=(embedding_column), axis=1)
|
384
384
|
|
385
385
|
self.dataframe = self.ddis_df.copy()
|
386
386
|
self.dataframe['class'] = list(classes)
|
ddi_fw/datasets/ddi_mdl/base.py
CHANGED
@@ -8,7 +8,7 @@ HERE = pathlib.Path(__file__).resolve().parent
|
|
8
8
|
|
9
9
|
|
10
10
|
class DDIMDLDataset(BaseDataset):
|
11
|
-
def __init__(self, embedding_dict,
|
11
|
+
def __init__(self, embedding_dict, ner_df, chemical_property_columns=['enzyme',
|
12
12
|
'target',
|
13
13
|
'pathway',
|
14
14
|
'smile'],
|
@@ -16,7 +16,7 @@ class DDIMDLDataset(BaseDataset):
|
|
16
16
|
ner_columns=[],
|
17
17
|
**kwargs):
|
18
18
|
|
19
|
-
super().__init__(embedding_dict,
|
19
|
+
super().__init__(embedding_dict,ner_df, chemical_property_columns, embedding_columns,
|
20
20
|
ner_columns, **kwargs)
|
21
21
|
|
22
22
|
# kwargs = {'index_path': str(HERE.joinpath('indexes'))}
|
@@ -1,12 +1,12 @@
|
|
1
1
|
ddi_fw/datasets/__init__.py,sha256=gkzHCU9-BL_bOU-RvvwdOIp_DhKRfXKU5SvgfQLVTds,505
|
2
|
-
ddi_fw/datasets/core.py,sha256=
|
2
|
+
ddi_fw/datasets/core.py,sha256=DbNTZmGxn4oeSSAPdhH8zf6g-5VgoPivfQwAtBYdcAg,18090
|
3
3
|
ddi_fw/datasets/db_utils.py,sha256=OTsa3d-Iic7z3HmzSQK9UigedRbHDxYChJk0s4GfLnw,6191
|
4
4
|
ddi_fw/datasets/embedding_generator.py,sha256=Jqrlv88RCu0Lg812KsA12X0cSaZuxbckJ4LNRKNy_qw,2173
|
5
5
|
ddi_fw/datasets/embedding_generator_new.py,sha256=GExjmBysPWkmFxTZQPs2yEmDdFllZ-qC9lhZeRQAfbQ,4320
|
6
6
|
ddi_fw/datasets/feature_vector_generation.py,sha256=dxTHvp6uTkao9PdThs116Q3bWw_WTo9T8WigVL4G01s,3245
|
7
7
|
ddi_fw/datasets/idf_helper.py,sha256=_Gd1dtDSLaw8o-o0JugzSKMt9FpeXewTh4wGEaUd4VQ,2571
|
8
8
|
ddi_fw/datasets/setup_._py,sha256=khYVJuW5PlOY_i_A16F3UbSZ6s6o_ljw33Byw3C-A8E,1047
|
9
|
-
ddi_fw/datasets/ddi_mdl/base.py,sha256=
|
9
|
+
ddi_fw/datasets/ddi_mdl/base.py,sha256=zKwxVXI-vVB2FcSHcgiXH-vfVjFPJsbm6c_ZZ1tqyvg,2473
|
10
10
|
ddi_fw/datasets/ddi_mdl/readme.md,sha256=WC6lpmsEKvIISnZqENY7TWtzCQr98HPpE3oRsBl8pIw,625
|
11
11
|
ddi_fw/datasets/ddi_mdl/data/event.db,sha256=cmlSsf9MYjRzqR-mw3cUDnTnfT6FkpOG2yCl2mMwwew,30580736
|
12
12
|
ddi_fw/datasets/ddi_mdl/indexes/test_indexes.txt,sha256=XVlDqYATckrQwNSXqMSKVBqyoN_Hg8SK6CL-XMdLADY,102176
|
@@ -80,7 +80,7 @@ ddi_fw/utils/enums.py,sha256=19eJ3fX5eRK_xPvkYcukmug144jXPH4X9zQqtsFBj5A,671
|
|
80
80
|
ddi_fw/utils/py7zr_helper.py,sha256=rWhz3Trj6bk6B24hMuff1fKdRbC0yuvaHFlL8-eaAhg,4450
|
81
81
|
ddi_fw/utils/utils.py,sha256=Na6Y8mY-CFbQjrgd9xC8agcrjVvTj_7KIXqFm1H_3qU,3549
|
82
82
|
ddi_fw/utils/zip_helper.py,sha256=YRZA4tKZVBJwGQM0_WK6L-y5MoqkKoC-nXuuHK6CU9I,5567
|
83
|
-
ddi_fw-0.0.
|
84
|
-
ddi_fw-0.0.
|
85
|
-
ddi_fw-0.0.
|
86
|
-
ddi_fw-0.0.
|
83
|
+
ddi_fw-0.0.35.dist-info/METADATA,sha256=_VVWhz49MppA95FRWQctsYfT8koX9VF2xnNBqrphL3w,1563
|
84
|
+
ddi_fw-0.0.35.dist-info/WHEEL,sha256=5Mi1sN9lKoFv_gxcPtisEVrJZihrm_beibeg5R6xb4I,91
|
85
|
+
ddi_fw-0.0.35.dist-info/top_level.txt,sha256=PMwHICFZTZtcpzQNPV4UQnfNXYIeLR_Ste-Wfc1h810,7
|
86
|
+
ddi_fw-0.0.35.dist-info/RECORD,,
|
File without changes
|
File without changes
|