-
Notifications
You must be signed in to change notification settings - Fork 641
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
Expansion of dihedrals analysis module #2033
Merged
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
93e6017
Added Janin class to dihedrals.py
e03fd0d
updated test_dihedrals for Janin class, added test data to datafiles.py
c8f5d82
cleaned up janin class
8eadbe8
Made Janin class a subclass of Ramachandran
8c873c8
Added general Dihedral class, with tests and test data
8002d04
fixed selections returning none in the middle of a protein
5efef65
updated to deal with selection failures
92c99b7
Updated test_dihedrals.py for new features
b72815b
updated docstring for dihedrals.py
6a6ec1b
updated CHANGELOG
2dd296f
Added reference plots for Ramachandran and Janin classes
556cf41
changed test_janin to check fewer decimals
4a52cc2
Fixed Janin plot method
44d48ad
moved ref plot data to new analysis/data directory, updated setup.py
e321165
updated docstring and added comments
f887f76
Fixed test_dihedrals, made analysis.data module
3814fc5
Added docs for analysis.data
8d94491
Updated docstrings and CHANGELOG
7c4a700
Added image directory for documentation
b4f8484
added ref=True to tests to increase coverage
80533cc
integrate Ramachandran and Janin plots into docs and updated references
orbeckst File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Empty file.
This file contains 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 |
---|---|---|
@@ -0,0 +1,59 @@ | ||
# -*- Mode: python; tab-width: 4; indent-tabs-mode:nil; coding:utf-8 -*- | ||
# vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 fileencoding=utf-8 | ||
# | ||
# MDAnalysis --- https://www.mdanalysis.org | ||
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors | ||
# (see the file AUTHORS for the full list of names) | ||
# | ||
# Released under the GNU Public Licence, v2 or any higher version | ||
# | ||
# Please cite your use of MDAnalysis in published work: | ||
# | ||
# R. J. Gowers, M. Linke, J. Barnoud, T. J. E. Reddy, M. N. Melo, S. L. Seyler, | ||
# D. L. Dotson, J. Domanski, S. Buchoux, I. M. Kenney, and O. Beckstein. | ||
# MDAnalysis: A Python package for the rapid analysis of molecular dynamics | ||
# simulations. In S. Benthall and S. Rostrup editors, Proceedings of the 15th | ||
# Python in Science Conference, pages 102-109, Austin, TX, 2016. SciPy. | ||
# | ||
# N. Michaud-Agrawal, E. J. Denning, T. B. Woolf, and O. Beckstein. | ||
# MDAnalysis: A Toolkit for the Analysis of Molecular Dynamics Simulations. | ||
# J. Comput. Chem. 32 (2011), 2319--2327, doi:10.1002/jcc.21787 | ||
# | ||
""" | ||
Analysis data files | ||
=================== | ||
|
||
:mod:`MDAnalysis.analysis.data` contains data files that are used as part of | ||
analysis. These can be experimental or theoretical data. Files are stored | ||
inside the package and made accessible via variables in | ||
:mod:`MDAnalysis.analysis.data.filenames`. These variables are documented | ||
below, including references to the literature and where they are used | ||
inside :mod:`MDAnalysis.analysis`. | ||
|
||
Data files | ||
---------- | ||
|
||
.. data:: Rama_ref | ||
|
||
Reference Ramachandran histogram for :class:`MDAnalysis.analysis.dihedrals.Ramachandran`. | ||
The data were calculated on a data set of 500 PDB structures taken from [Lovell2003]_. | ||
|
||
.. data:: Janin_ref | ||
|
||
Reference Ramachandran histogram for :class:`MDAnalysis.analysis.dihedrals.Ramachandran`. | ||
The data were calculated on a data set of 500 PDB structures taken from [Lovell2003]_. | ||
|
||
""" | ||
from __future__ import absolute_import | ||
|
||
__all__ = [ | ||
"Rama_ref", "Janin_ref" # reference plots for Ramachandran and Janin classes | ||
] | ||
|
||
from pkg_resources import resource_filename | ||
|
||
Rama_ref = resource_filename(__name__, 'rama_ref_data.npy') | ||
Janin_ref = resource_filename(__name__, 'janin_ref_data.npy') | ||
|
||
# This should be the last line: clean up namespace | ||
del resource_filename |
Binary file not shown.
Binary file not shown.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
data
directory also needs an empty file__init__.py
to mark it as an importable module. Just add it withThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The absence of the file is the reason for the test failures.