Remove xlsx files from tracking, replace with Parquet
Browse files- Convert remaining xlsx files to parquet: db-polymer-properties,
db-D-interp-37-clean, db-D-interp-50-clean
- Update quantity_module/functions.py to read new parquet files
- Untrack all xlsx files from git and add *.xlsx to .gitignore
- Update convert_to_parquet.py to include newly converted files
Co-Authored-By: Claude Code <noreply@anthropic.com>
- .gitignore +1 -0
- convert_to_parquet.py +3 -0
- data/{db-polymer-properties-and-categories.xlsx → db-polymer-properties-and-categories.parquet} +2 -2
- mp/model-opera-knn-alldata.xlsx +0 -3
- qrf/db-D-interp-allT-semiclean.xlsx +0 -3
- qrf/mordred-descriptors.xlsx +0 -3
- qrf/qrf_x.xlsx +0 -3
- quantity_module/data/data-descriptors-mordred-numconfs51.xlsx +0 -3
- qrf/qrf_y.xlsx → quantity_module/data/db-D-interp-37-clean.parquet +2 -2
- quantity_module/data/db-D-interp-37-clean.xlsx +0 -3
- qrf/qrf_parameters_allT.xlsx → quantity_module/data/db-D-interp-50-clean.parquet +2 -2
- quantity_module/data/db-D-interp-50-clean.xlsx +0 -3
- quantity_module/data/db-D-interp-allT-clean.xlsx +0 -3
- quantity_module/data/solvent-viscosity.xlsx +0 -3
- quantity_module/data/vrentas-duda-params.xlsx +0 -3
- quantity_module/functions.py +3 -3
.gitignore
CHANGED
|
@@ -11,4 +11,5 @@ color_module/static/.DS_Store
|
|
| 11 |
*.bkup
|
| 12 |
tools/
|
| 13 |
chris.tar.gz
|
|
|
|
| 14 |
|
|
|
|
| 11 |
*.bkup
|
| 12 |
tools/
|
| 13 |
chris.tar.gz
|
| 14 |
+
*.xlsx
|
| 15 |
|
convert_to_parquet.py
CHANGED
|
@@ -13,6 +13,9 @@ files = [
|
|
| 13 |
('quantity_module/data/vrentas-duda-params.xlsx', 'quantity_module/data/vrentas-duda-params-solutes.parquet', {'sheet_name': 'Solutes'}),
|
| 14 |
('quantity_module/data/vrentas-duda-params.xlsx', 'quantity_module/data/vrentas-duda-params-polymers.parquet', {'sheet_name': 'Polymers'}),
|
| 15 |
('qrf/qrf_parameters_allT.xlsx', 'qrf/qrf_parameters_allT.parquet', {}),
|
|
|
|
|
|
|
|
|
|
| 16 |
]
|
| 17 |
|
| 18 |
for src, dst, kwargs in files:
|
|
|
|
| 13 |
('quantity_module/data/vrentas-duda-params.xlsx', 'quantity_module/data/vrentas-duda-params-solutes.parquet', {'sheet_name': 'Solutes'}),
|
| 14 |
('quantity_module/data/vrentas-duda-params.xlsx', 'quantity_module/data/vrentas-duda-params-polymers.parquet', {'sheet_name': 'Polymers'}),
|
| 15 |
('qrf/qrf_parameters_allT.xlsx', 'qrf/qrf_parameters_allT.parquet', {}),
|
| 16 |
+
('data/db-polymer-properties-and-categories.xlsx', 'data/db-polymer-properties-and-categories.parquet', {}),
|
| 17 |
+
('quantity_module/data/db-D-interp-37-clean.xlsx', 'quantity_module/data/db-D-interp-37-clean.parquet', {}),
|
| 18 |
+
('quantity_module/data/db-D-interp-50-clean.xlsx', 'quantity_module/data/db-D-interp-50-clean.parquet', {}),
|
| 19 |
]
|
| 20 |
|
| 21 |
for src, dst, kwargs in files:
|
data/{db-polymer-properties-and-categories.xlsx → db-polymer-properties-and-categories.parquet}
RENAMED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:36247c7305dad04c700ab49ff2f19ab1295b695062e8c98738e6f7e595b4e690
|
| 3 |
+
size 27591
|
mp/model-opera-knn-alldata.xlsx
DELETED
|
@@ -1,3 +0,0 @@
|
|
| 1 |
-
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:52547e54fc469bb5899c71c8ac12167a9661dfccb6a769799e4b0e89da30015e
|
| 3 |
-
size 6551311
|
|
|
|
|
|
|
|
|
|
|
|
qrf/db-D-interp-allT-semiclean.xlsx
DELETED
|
@@ -1,3 +0,0 @@
|
|
| 1 |
-
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:6c5c4399929d0bb5f72e3fee3896058e7accfbf68d63df155e409a4c2b6b87a2
|
| 3 |
-
size 13087796
|
|
|
|
|
|
|
|
|
|
|
|
qrf/mordred-descriptors.xlsx
DELETED
|
@@ -1,3 +0,0 @@
|
|
| 1 |
-
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:121f72b88fa46a0f16af6a1244af761ee6b9d679af7ab2e32d545538f8b5c5b5
|
| 3 |
-
size 10251595
|
|
|
|
|
|
|
|
|
|
|
|
qrf/qrf_x.xlsx
DELETED
|
@@ -1,3 +0,0 @@
|
|
| 1 |
-
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:98ea75f2a01564c9b1d998b699bbd11ee22954e5971c95addf8bb8a87e43fbd1
|
| 3 |
-
size 195153
|
|
|
|
|
|
|
|
|
|
|
|
quantity_module/data/data-descriptors-mordred-numconfs51.xlsx
DELETED
|
@@ -1,3 +0,0 @@
|
|
| 1 |
-
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:121f72b88fa46a0f16af6a1244af761ee6b9d679af7ab2e32d545538f8b5c5b5
|
| 3 |
-
size 10251595
|
|
|
|
|
|
|
|
|
|
|
|
qrf/qrf_y.xlsx → quantity_module/data/db-D-interp-37-clean.parquet
RENAMED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:62039c3f5ad8001aa162770345788fa5055f6a20af8c458cad62c6b90847f7e8
|
| 3 |
+
size 210568
|
quantity_module/data/db-D-interp-37-clean.xlsx
DELETED
|
@@ -1,3 +0,0 @@
|
|
| 1 |
-
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:5c046f45ede6419629615b2e7397d74dc22c19db8556853638dd0c54ef9fad3f
|
| 3 |
-
size 546002
|
|
|
|
|
|
|
|
|
|
|
|
qrf/qrf_parameters_allT.xlsx → quantity_module/data/db-D-interp-50-clean.parquet
RENAMED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:1393f14023049e5e0cd5abac4827cfcbc4aa2501b1361725ba5aefe50bf4501c
|
| 3 |
+
size 140776
|
quantity_module/data/db-D-interp-50-clean.xlsx
DELETED
|
@@ -1,3 +0,0 @@
|
|
| 1 |
-
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:2086bf5769a47fb6ff95f4f1dc4368788f03d6365300e5c40f6631798929116d
|
| 3 |
-
size 314780
|
|
|
|
|
|
|
|
|
|
|
|
quantity_module/data/db-D-interp-allT-clean.xlsx
DELETED
|
@@ -1,3 +0,0 @@
|
|
| 1 |
-
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:b34934f1be324e95766d57b156ee29822b1ed282b3f0b4402e5405a8752c8acd
|
| 3 |
-
size 10436853
|
|
|
|
|
|
|
|
|
|
|
|
quantity_module/data/solvent-viscosity.xlsx
DELETED
|
@@ -1,3 +0,0 @@
|
|
| 1 |
-
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:1981623bba77ebda97107ece1e0b4d6b638a633cb5a91ed6a88a1a1bf26f513b
|
| 3 |
-
size 13815
|
|
|
|
|
|
|
|
|
|
|
|
quantity_module/data/vrentas-duda-params.xlsx
DELETED
|
@@ -1,3 +0,0 @@
|
|
| 1 |
-
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:56a52df0ca74da211a93de2ca5e7c735a1265026bf954f967ea21a01831bd8bb
|
| 3 |
-
size 23473
|
|
|
|
|
|
|
|
|
|
|
|
quantity_module/functions.py
CHANGED
|
@@ -46,8 +46,8 @@ df_visc = pd.read_parquet('quantity_module/data/solvent-viscosity.parquet')
|
|
| 46 |
df_desc = pd.read_parquet('quantity_module/data/data-descriptors-mordred-numconfs51.parquet', columns=['Solute_InChIKey', 'Vabc','VMcGowan'])
|
| 47 |
if not use_new:
|
| 48 |
## clean data
|
| 49 |
-
df_final_37 = pd.
|
| 50 |
-
df_final_50 = pd.
|
| 51 |
# convert all T to K
|
| 52 |
df_final_37['T'] = df_final_37['T'] + 273.15
|
| 53 |
df_final_37['Polymer_Tg'] = df_final_37['Polymer_Tg'] + 273.15
|
|
@@ -183,7 +183,7 @@ df_vd_solv = pd.read_parquet('quantity_module/data/vrentas-duda-params-solutes.p
|
|
| 183 |
df_vd_solv.drop_duplicates(keep='first', inplace=True, ignore_index=True) # drop exact duplicates
|
| 184 |
df_vd_poly = pd.read_parquet('quantity_module/data/vrentas-duda-params-polymers.parquet')
|
| 185 |
df_vd_poly.drop_duplicates(keep='first', inplace=True, ignore_index=True) # drop exact duplicates
|
| 186 |
-
df_props = pd.
|
| 187 |
df_vd_poly = pd.merge(df_vd_poly, df_props[['Polymer_Name','Polymer_Tg','Polymer_Tm', 'CHRIS Class', 'New Class']], how='left', on='Polymer_Name')
|
| 188 |
df_vd_poly['New Class'] = df_vd_poly['New Class'].fillna('none')
|
| 189 |
df_vd_poly['CHRIS Class'] = df_vd_poly['CHRIS Class'].fillna('none')
|
|
|
|
| 46 |
df_desc = pd.read_parquet('quantity_module/data/data-descriptors-mordred-numconfs51.parquet', columns=['Solute_InChIKey', 'Vabc','VMcGowan'])
|
| 47 |
if not use_new:
|
| 48 |
## clean data
|
| 49 |
+
df_final_37 = pd.read_parquet('quantity_module/data/db-D-interp-37-clean.parquet')
|
| 50 |
+
df_final_50 = pd.read_parquet('quantity_module/data/db-D-interp-50-clean.parquet')
|
| 51 |
# convert all T to K
|
| 52 |
df_final_37['T'] = df_final_37['T'] + 273.15
|
| 53 |
df_final_37['Polymer_Tg'] = df_final_37['Polymer_Tg'] + 273.15
|
|
|
|
| 183 |
df_vd_solv.drop_duplicates(keep='first', inplace=True, ignore_index=True) # drop exact duplicates
|
| 184 |
df_vd_poly = pd.read_parquet('quantity_module/data/vrentas-duda-params-polymers.parquet')
|
| 185 |
df_vd_poly.drop_duplicates(keep='first', inplace=True, ignore_index=True) # drop exact duplicates
|
| 186 |
+
df_props = pd.read_parquet('data/db-polymer-properties-and-categories.parquet')
|
| 187 |
df_vd_poly = pd.merge(df_vd_poly, df_props[['Polymer_Name','Polymer_Tg','Polymer_Tm', 'CHRIS Class', 'New Class']], how='left', on='Polymer_Name')
|
| 188 |
df_vd_poly['New Class'] = df_vd_poly['New Class'].fillna('none')
|
| 189 |
df_vd_poly['CHRIS Class'] = df_vd_poly['CHRIS Class'].fillna('none')
|