Skip to content

Commit 1fb8566

Browse files
committed
Some cleanup
1 parent 3915f27 commit 1fb8566

1 file changed

Lines changed: 10 additions & 18 deletions

File tree

openmm_septop/septop_analysis.ipynb

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
{
4040
"cell_type": "code",
41-
"execution_count": 5,
41+
"execution_count": 2,
4242
"id": "f47af914-150a-4a57-8837-c12e14cb8802",
4343
"metadata": {},
4444
"outputs": [],
@@ -48,7 +48,7 @@
4848
},
4949
{
5050
"cell_type": "code",
51-
"execution_count": 2,
51+
"execution_count": 3,
5252
"id": "c185164a-f1c6-483b-b013-f4d499889570",
5353
"metadata": {},
5454
"outputs": [],
@@ -93,7 +93,7 @@
9393
},
9494
{
9595
"cell_type": "code",
96-
"execution_count": 3,
96+
"execution_count": 4,
9797
"id": "3733c540-de62-45a0-ba66-268397a38b49",
9898
"metadata": {},
9999
"outputs": [],
@@ -153,7 +153,7 @@
153153
},
154154
{
155155
"cell_type": "code",
156-
"execution_count": 4,
156+
"execution_count": 5,
157157
"id": "08afcbcf-34a8-4450-a967-eb4ed5800ee1",
158158
"metadata": {},
159159
"outputs": [],
@@ -191,16 +191,14 @@
191191
"metadata": {},
192192
"outputs": [],
193193
"source": [
194-
"def _generate_raw(legs:dict, allow_partial=True) -> None:\n",
194+
"def _generate_raw(legs:dict) -> None:\n",
195195
" \"\"\"\n",
196196
" Write out all legs found and their DG values, or indicate that they have failed.\n",
197197
"\n",
198198
" Parameters\n",
199199
" ----------\n",
200200
" legs : dict\n",
201201
" Dict of legs to write out.\n",
202-
" allow_partial : bool, optional\n",
203-
" Unused for this function, since all results will be included.\n",
204202
" \"\"\"\n",
205203
" data = []\n",
206204
" for ligpair, results in sorted(legs.items()):\n",
@@ -230,16 +228,13 @@
230228
"metadata": {},
231229
"outputs": [],
232230
"source": [
233-
"def _generate_ddg(legs:dict, allow_partial:bool) -> None:\n",
231+
"def _generate_ddg(legs:dict) -> None:\n",
234232
" \"\"\"Compute and write out DDG values for the given legs.\n",
235233
"\n",
236234
" Parameters\n",
237235
" ----------\n",
238236
" legs : dict\n",
239237
" Dict of legs to write out.\n",
240-
" allow_partial : bool\n",
241-
" If ``True``, no error will be thrown for incomplete or invalid results,\n",
242-
" and DDGs will be reported for whatever valid results are found.\n",
243238
" \"\"\"\n",
244239
" data = []\n",
245240
" for ligpair, results in sorted(legs.items()):\n",
@@ -265,22 +260,19 @@
265260
"metadata": {},
266261
"outputs": [],
267262
"source": [
268-
"def _generate_dg_mle(legs: dict, allow_partial: bool) -> None:\n",
263+
"def _generate_dg_mle(legs: dict) -> None:\n",
269264
" \"\"\"Compute and write out DG values for the given legs.\n",
270265
"\n",
271266
" Parameters\n",
272267
" ----------\n",
273268
" legs : dict\n",
274269
" Dict of legs to write out.\n",
275-
" allow_partial : bool\n",
276-
" If ``True``, no error will be thrown for incomplete or invalid results,\n",
277-
" and DGs will be reported for whatever valid results are found.\n",
278270
" \"\"\"\n",
279271
" import networkx as nx\n",
280272
" import numpy as np\n",
281273
" from cinnabar.stats import mle\n",
282274
"\n",
283-
" DDGs = _generate_ddg(legs, allow_partial=allow_partial)\n",
275+
" DDGs = _generate_ddg(legs)\n",
284276
" MLEs = []\n",
285277
" expected_ligs = []\n",
286278
"\n",
@@ -417,7 +409,7 @@
417409
"metadata": {},
418410
"outputs": [],
419411
"source": [
420-
"df_ddg = _generate_ddg(ddgs, allow_partial=True)\n",
412+
"df_ddg = _generate_ddg(ddgs)\n",
421413
"df_ddg.to_csv('ddg.tsv', sep=\"\\t\", lineterminator=\"\\n\", index=False)"
422414
]
423415
},
@@ -519,7 +511,7 @@
519511
"metadata": {},
520512
"outputs": [],
521513
"source": [
522-
"df_dg = _generate_dg_mle(ddgs, allow_partial=True)\n",
514+
"df_dg = _generate_dg_mle(ddgs)\n",
523515
"df_dg.to_csv('dg.tsv', sep=\"\\t\", lineterminator=\"\\n\", index=False)"
524516
]
525517
},

0 commit comments

Comments
 (0)