Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

developing back end run methods #216

Merged
merged 31 commits into from
Dec 12, 2022
Merged
Changes from 2 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
e71456d
developing back end run methods
cadeduckworth Sep 15, 2022
6c67ec1
condensed backend run methods
cadeduckworth Sep 15, 2022
7bcdf49
Addressed change requests by Oliver
cadeduckworth Oct 22, 2022
a87cb11
fixed indentation error for _single_frame() block
cadeduckworth Oct 22, 2022
7edde0d
reverting previous tab issue, necessary for normal function
cadeduckworth Oct 22, 2022
48016c5
fixed errors previously reverted for testing
cadeduckworth Oct 23, 2022
59c819c
Merge branch 'develop' into ensemble_run_update
cadeduckworth Oct 23, 2022
fb58f27
doc string format/syntax issue
cadeduckworth Oct 25, 2022
1f7f2d1
checkout from alt repository
cadeduckworth Oct 25, 2022
179603f
changed base class function definitions from pass to raise NotImpleme…
cadeduckworth Oct 28, 2022
46d3cf2
Merge branch 'ensemble_run_update' of github.com:Becksteinlab/MDPOW i…
cadeduckworth Oct 28, 2022
f47c806
adding preliminary test for try-except pattern addition to backend ru…
cadeduckworth Nov 2, 2022
5e02322
removed # pragma: no cover from _single_frame() and _single_universe()
cadeduckworth Nov 4, 2022
2fc9135
changed dihedral atom group selection strings in test_dihedral.py to …
cadeduckworth Nov 4, 2022
37cd1d7
changed dihedral atom group selection order in test_dataframe to matc…
cadeduckworth Nov 4, 2022
0dc7e32
several changes and updates to test_dihedral.py, resulting in passing…
cadeduckworth Nov 12, 2022
a0de2d9
relocating test to external branch, 214_dihedral issue
cadeduckworth Nov 12, 2022
273c1af
moved raise NotImplementedError test for _single_universe() for Dihed…
cadeduckworth Nov 12, 2022
8212d11
Merge remote-tracking branch 'origin/214_dihedralanalysis-test-issues…
cadeduckworth Nov 12, 2022
653210e
added explicit backend run method tests for EnsembleAnalysis
cadeduckworth Nov 17, 2022
7eff11f
test_dihedral.py reflects same changes as PR#218
cadeduckworth Nov 17, 2022
67261cb
Merge branch 'develop' into ensemble_run_update
orbeckst Nov 17, 2022
2f63c3a
Merge branch 'develop' into ensemble_run_update
orbeckst Nov 17, 2022
ce02b3b
Merge branch 'develop' into ensemble_run_update
orbeckst Nov 18, 2022
cf4bd40
updated source and html docs and CHANGELOG to reflect changes made fo…
cadeduckworth Dec 8, 2022
f45fc6b
merge with origin changes
cadeduckworth Dec 8, 2022
1a90ed8
split EnsembleAnalysis run method test, one test for _single_frame, o…
cadeduckworth Dec 8, 2022
7054bb5
minor change to run method tests for proper use of example EnsembleAn…
cadeduckworth Dec 8, 2022
19f7c84
added and corrected use of sphinx markup for documentation, edited ve…
cadeduckworth Dec 8, 2022
40381aa
changes to docs for sphinx markup
cadeduckworth Dec 8, 2022
8870e39
whitespace and docstring formatting
cadeduckworth Dec 11, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions mdpow/analysis/ensemble.py
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ def _conclude_ensemble(self):
pass # pragma: no cover

def run(self, start=None, stop=None, step=None):
"""Runs _single_universe on each system and _single_frame
"""Runs _single_universe on each system or _single_frame
on each frame in the system.

First iterates through keys of ensemble, then runs _setup_system
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add markup

:meth:`_setup_system`

Expand All @@ -516,16 +516,17 @@ def run(self, start=None, stop=None, step=None):
self._prepare_ensemble()
for self._key in ProgressBar(self._ensemble.keys(), verbose=True):
self._setup_system(self._key, start=start, stop=stop, step=step)
self._prepare_universe()
self._single_universe()
for i, ts in enumerate(ProgressBar(self._trajectory[self.start:self.stop:self.step], verbose=True,
try:
self._single_universe()
except NotImplementedError:
orbeckst marked this conversation as resolved.
Show resolved Hide resolved
for i, ts in enumerate(ProgressBar(self._trajectory[self.start:self.stop:self.step], verbose=True,
postfix=f'running system {self._key}')):
self._frame_index = i
self._ts = ts
self.frames[i] = ts.frame
self.times[i] = ts.time
self._single_frame()
self._conclude_universe()
raise
orbeckst marked this conversation as resolved.
Show resolved Hide resolved
logger.info("Moving to next universe")
logger.info("Finishing up")
self._conclude_ensemble()
Expand Down