-
Notifications
You must be signed in to change notification settings - Fork 10
Automated Dihedral Analysis #217
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
Merged
Merged
Changes from all commits
Commits
Show all changes
182 commits
Select commit
Hold shift + click to select a range
e71456d
developing back end run methods
cadeduckworth 6c67ec1
condensed backend run methods
cadeduckworth 9914675
Initial adding of automation functionality to dihedral.py
cadeduckworth f9b6646
moved directory_paths function to reside within the DihedralAnalysis …
cadeduckworth 7bcdf49
Addressed change requests by Oliver
cadeduckworth a87cb11
fixed indentation error for _single_frame() block
cadeduckworth 7edde0d
reverting previous tab issue, necessary for normal function
cadeduckworth 48016c5
fixed errors previously reverted for testing
cadeduckworth 59c819c
Merge branch 'develop' into ensemble_run_update
cadeduckworth 6b1be1b
restored original dihedral.py file
cadeduckworth 2ddea0e
created automation/dihedral subdirectory under mdpow/analysis/ to hou…
cadeduckworth ad6db6e
updated docstrings and added examples for directory_paths.py
cadeduckworth 848dd87
added docstrings and examples for directory_iteration.py
cadeduckworth 6394d7a
added initial draft of docstrings and examples for all functions cont…
cadeduckworth d8f3ca3
added the option to save the DihedralAnalysis results DataFrame as cs…
cadeduckworth d8137cb
removed redundant DataFrame saving pattern from automated_dihedral_an…
cadeduckworth 29477ab
Merge remote-tracking branch 'origin/ensemble_run_update' into automa…
cadeduckworth 642e87e
merged updates from PR #216 and PR #218
cadeduckworth 4814376
Merge branch 'develop' into automated-dihedral-analysis
orbeckst f333ee8
Merge branch 'develop' into automated-dihedral-analysis
orbeckst 6f16b84
resolved conflicts to merge updates in from develop from PR#216
cadeduckworth ddffbdf
adding data for testing automated dihedral analysis
cadeduckworth c850448
added starting framework for testing automated dihedral analysis
cadeduckworth 69b0351
reorganized automation directory into workflows directory
cadeduckworth 4cf176d
added preliminary simple core tests for automated dihedral analysis
cadeduckworth 97c4a73
initial reformatting of existing docs for sphinx markup compatibility
cadeduckworth 930d54e
fix errors in docs for workflows
cadeduckworth 84536ff
added imports for automated dihedral analysis tests
cadeduckworth f01b2a4
added init file for workflows module
cadeduckworth 61ff494
added logging functionality for workflows modules
cadeduckworth f7b3f53
sphinx markup corrections for workflow modules
cadeduckworth d16dc7d
redo of reduced testing data for GAFF SM25 from original full dataset…
cadeduckworth bcfa10f
sphinx docs automodule test
cadeduckworth b8c309d
sphinx docs test base.txt
cadeduckworth 837f53e
docs
cadeduckworth 44db567
docs
cadeduckworth e53dfb6
docs
cadeduckworth 5f28b46
edit docs
cadeduckworth e58703a
edit docs
cadeduckworth bbcb5de
edit docs
cadeduckworth 45892b6
edit docs
cadeduckworth eaf767a
edit docs
cadeduckworth f19f32e
update py.path to pathlib in test_automated_dihedral_analysis
cadeduckworth 41166a4
update reference testing values for new reduced dataset, test_automat…
cadeduckworth 1de662e
change syntax in test_automated_dihedral_analysis to compare objects …
cadeduckworth 4eafa23
update assert_almost_equal to pytest.approx
cadeduckworth 4833a45
bounce redundant function calls to a pytest.fixture for use with mult…
cadeduckworth 5be6684
add bz2 compression for dataframe storage of automated dihedral analy…
cadeduckworth ef750f1
Update ci.yaml
cadeduckworth 4c9251b
added functionality for user input of alternative SMARTS string selec…
cadeduckworth 187632b
Merge branch 'automated-dihedral-analysis' of github.com:Becksteinlab…
cadeduckworth 7abb0bc
add tests for automated directory iteration of dihedral analysis, wor…
cadeduckworth 372a205
add tests for saving dataframes and saving figures, which covers the …
cadeduckworth 39518c2
add test for directory iteration of fully automated dihedral analysis
cadeduckworth 37eb085
moved location of rdkit install used for testing/pytest
cadeduckworth 85b54f3
remove misplaced hbonds documentation
cadeduckworth 1e5aadc
relocate test data for workflows and change test scripts accordingly
cadeduckworth edc0a9a
removed unnecessary .ipynb, .lock, and .npz files
cadeduckworth eb41100
simplified keyword specification for default and user input of SMARTS…
cadeduckworth b91240e
fixed plotting issue for solvents (name and order)
cadeduckworth fbca70d
variable name issue in testing module, user_SMARTS -> SMARTS
cadeduckworth b0081ef
Delete dir.csv
cadeduckworth 0520ffa
import syntax
cadeduckworth 77df0ee
sphinx docs
cadeduckworth 17a0b4a
Merge branch 'automated-dihedral-analysis' of github.com:Becksteinlab…
cadeduckworth 7359319
docs
cadeduckworth 8f8f26c
docs
cadeduckworth c452475
docs
cadeduckworth 3dd1b31
docs
cadeduckworth cecd928
docs
cadeduckworth 5b87e83
docs
cadeduckworth 86804d8
docs
cadeduckworth 0ab0299
docs
cadeduckworth 3964a44
docs
cadeduckworth dfb7e8e
docs
cadeduckworth be86754
docs
cadeduckworth f6330cb
docs
cadeduckworth ab6800e
docs
cadeduckworth 6bdc521
docs
cadeduckworth 0a7963d
docs
cadeduckworth 1866d43
docs
cadeduckworth 495546c
docs
cadeduckworth 956b359
docs
cadeduckworth 0ad73db
docs
cadeduckworth f6beebb
docs
cadeduckworth 036d939
docs
cadeduckworth 58f33c3
docs
cadeduckworth d704f95
moving workflows location, subsequent doc changes
cadeduckworth 02e10e5
import changed to reflect moving workflows module
cadeduckworth 891782e
docs
cadeduckworth 148e56f
add requirements for sphinx build
cadeduckworth a03951c
add requirements for sphinx build
cadeduckworth 31291f1
add requirements for sphinx build
cadeduckworth 652e788
add requirements for sphinx build
cadeduckworth 48c7e88
add requirements for sphinx build
cadeduckworth ba17ceb
docs
cadeduckworth 68cbc9c
docs
cadeduckworth 8c5c2ec
docs structure
cadeduckworth 8d29f91
consistent keyword names in tests
cadeduckworth 24f6c00
imports and docs
cadeduckworth 63e3de4
imports
cadeduckworth 104bf93
imports
cadeduckworth 1ad6b8c
generalizing automation base module for use with other analyses
cadeduckworth b0585ef
workflows base module cleanup
cadeduckworth 498dfe1
split dihedrals.dihedral_indices and dihedrals.dihedral_groups into s…
cadeduckworth 3f518ba
cleanup imports and naming conventions in workflows base module
cadeduckworth 4b9dd90
new tests for new functions made from splitting dihedrals.dihedral_in…
cadeduckworth 40d4d22
Merge branch 'develop' into automated-dihedral-analysis
orbeckst 75e2614
Merge branch 'develop' into automated-dihedral-analysis
orbeckst 86909d8
added skip for testing pytest=7.2.0, build=py37h89c1867_0
cadeduckworth e8573c6
Merge branch 'automated-dihedral-analysis' of github.com:Becksteinlab…
cadeduckworth 9672ad1
cleanup unnecessary files and remove workflows base module/move to ne…
cadeduckworth e8a7c65
remove workflows base import not needed for test
cadeduckworth 76d34b3
Apply suggestions from code review
orbeckst 93cce20
new reduced dataset for testing resources (SM25 & SM26)
cadeduckworth 49478e0
Merge branch 'automated-dihedral-analysis' of github.com:Becksteinlab…
cadeduckworth a523969
merged add_hydrogens into rdkit_conversion, removed unnecessary tests
cadeduckworth c1789d2
move default SMARTS string from kwarg to module level, SMARTS_DEFAULT…
cadeduckworth 9fe35ec
fix bz2 compression for results dataframe and added a return of file/…
cadeduckworth c10369e
bug fixes while building tutorial
cadeduckworth 0d159e5
Merge branch 'develop' into automated-dihedral-analysis
cadeduckworth 87e34be
init workflows-dihedrals tutorial (ipynb) and tutorials subdirectory …
cadeduckworth 458230a
Merge branch 'develop' into automated-dihedral-analysis
cadeduckworth 2f3b3e0
save accurate return of where results csv file is stored (naming conv…
cadeduckworth 5b63fb6
add seaborn to test_env.yaml
cadeduckworth 7dea2d8
add matplotlib, seaborn, rdkit to setup.py (install_requires)
cadeduckworth 2f7e99b
SMARTS string documentation formatting test
cadeduckworth 1076442
Merge branch 'automated-dihedral-analysis' of github.com:Becksteinlab…
cadeduckworth 8189df6
fix unexpected indent in docs for SMARTS
cadeduckworth 78d8877
testing SMARTS docs alternatives
cadeduckworth 5b82ee2
remove the bit about workflows.base, not included in this PR
cadeduckworth 52b3bc5
SMARTS docs
cadeduckworth e2202c8
SMARTS docs
cadeduckworth 9f44b12
SMARTS docs unexpected indent
cadeduckworth 0aaa993
SMARTS docs unexpected indent
cadeduckworth 5394d6b
SMARTS docs
cadeduckworth 0ad76b8
SMARTS docs
cadeduckworth d29821b
SMARTS docs
cadeduckworth 89df6dc
final SMARTS docs cleanup
cadeduckworth 1fafe83
:returns: doc tests, MDA Universe class ~link`
cadeduckworth 4dcf023
more :returns: docs attempts
cadeduckworth 9319531
docs, :returns:, :rubric:, formatting
cadeduckworth 9c33e3c
:rubric: workflow examples formatting
cadeduckworth 5578646
width and padding kwarg docs, accuracy and consistency
cadeduckworth f039bbe
full module review and adding in-line # comments for reminders and to…
cadeduckworth 7da781b
remove unnecessary tests and add in-line comments as reminders/questions
cadeduckworth 8ac9549
docs, :class: method for referencing MDA Universe
cadeduckworth a340053
docs and kwargs
cadeduckworth af14ad7
remove incorrect continue pattern
cadeduckworth bad175f
rearrange top level automated_dihedral_analysis function for datafram…
cadeduckworth 18b33fb
new tests for dataframe input and logger.info/.warning
cadeduckworth c085cdf
docs test reference for MDA Universe class
cadeduckworth 824a110
docs: some tests with cross-refs for external packages
cadeduckworth 7d6250e
docs: some tests with cross-refs for external packages
cadeduckworth 22ef778
remove broken test
cadeduckworth b9a1363
fixed string check method for logger info in tests and dihedrals module
cadeduckworth 2d1f3da
update docs for workflows dihedrals
cadeduckworth 403154a
nearly completed docs for workflows.dihedrals
cadeduckworth d009abe
changed method for testing logger INFO/WARNING
cadeduckworth 153ea71
use caplog pytest fixture for logger.INFO and logger.WARNING
cadeduckworth 525f2cf
Update test_automated_dihedral_analysis.py
cadeduckworth 1b13feb
removed unnecessary components from save_df and made df_save_dir kwar…
cadeduckworth 998d5b0
changed global kwargs to all caps formatting
cadeduckworth ad2ed7a
removed another unnecessary logger.info for save_df
cadeduckworth cc08976
add MDAnalysis, RDKit, Pandas links for intersphinx mapping
cadeduckworth 32ac646
preliminary changes to docs to test intersphinx links and format changes
cadeduckworth dfd1098
fix logger.info and associated tests
cadeduckworth 4ac89a2
move or change comments in test module
cadeduckworth 118f4cf
add skipif for figure generating and figure saving tests that rely on…
cadeduckworth 87d0334
cleanup and format docs, add seaborn intersphinx mapping
cadeduckworth 9b0e737
doc formatting
cadeduckworth 800d36f
fix minor docs format
cadeduckworth ea1b1a8
calculate new numerical values for testing from recently reduced test…
cadeduckworth 530abf9
clean up new scipy.stats data and associated description
cadeduckworth 8e3b37f
cleanup test comments/docs and properly describe fixtures and skipifs
cadeduckworth cf8d562
fix incorrect assertion for test_save_df_info
cadeduckworth 41258f2
fix plot assertion to use isinstance() to check for seaborn.axisgrid.…
cadeduckworth 4e2fdb7
cleanup doc formatting and inline comments
cadeduckworth 5053a30
test doc indent levels
cadeduckworth 73aa472
format docs indentations
cadeduckworth d02da1a
format docs, reST typo
cadeduckworth ac8c8a7
update CHANGES
orbeckst File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,3 +12,6 @@ dist | |
| doc/examples/benzene/Equilibrium/ | ||
| .coverage | ||
| coverage.xml | ||
| *.lock | ||
| *.npz | ||
| dir.csv | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,3 +6,6 @@ pyyaml | |
| GromacsWrapper>=0.5.1 | ||
| alchemlyb | ||
| mdanalysis | ||
| rdkit | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add to PR#229 workflows-base |
||
| seaborn | ||
| matplotlib | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,12 +20,11 @@ all FEP simulations. They then make data available (typically, as a | |
| :class:`pandas.DataFrame`). | ||
|
|
||
| .. toctree:: | ||
| :maxdepth: 1 | ||
| :maxdepth: 2 | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. revert changes |
||
|
|
||
| analysis/solvation | ||
| analysis/dihedral | ||
|
|
||
|
|
||
| .. _framework: | ||
|
|
||
| Ensemble Analysis Framework | ||
|
|
@@ -45,10 +44,9 @@ in more detail in [Lescoulie2021]_. | |
| .. toctree:: | ||
| :maxdepth: 1 | ||
|
|
||
| analysis/ensemble_analysis | ||
| analysis/ensemble_analysis | ||
| analysis/ensemble | ||
|
|
||
|
|
||
| References | ||
| ---------- | ||
| .. [Lescoulie2021] A. Lescoulie, "SPIDAL Summer REU 2021: Upgrading MDPOW and | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.