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

[WIP] Analysis #38

Closed
wants to merge 39 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
6773912
added rms
lilyminium Dec 28, 2019
d05c657
undid ignore notebooks
lilyminium Dec 28, 2019
31aed4d
added note boxes
lilyminium Dec 28, 2019
48d939d
added psa
lilyminium Jan 22, 2020
1f425d2
added trajectory similarity
lilyminium Jan 23, 2020
43d3a63
added rst
lilyminium Jan 23, 2020
aa5452f
reduce menu level
lilyminium Jan 23, 2020
2b27a53
updated hes
lilyminium Jan 23, 2020
cc0f568
added more analysis
lilyminium Jan 27, 2020
b986abc
started rdf
lilyminium Jan 27, 2020
116abe5
more rdf
lilyminium Jan 27, 2020
ce03523
added gifs
lilyminium Jan 30, 2020
9661bb2
wrote script to execute and clean notebooks
lilyminium Feb 6, 2020
e60dc5f
reorganised notebooks
lilyminium Feb 6, 2020
971774f
fixed merge conflict
lilyminium Feb 6, 2020
286b07c
updated trajectories to html
lilyminium Feb 7, 2020
ced30dd
refresh transformations notebook
lilyminium Feb 7, 2020
2b73a88
moved transformations back
lilyminium Feb 7, 2020
dcd4316
updated rmsf to use equilibrium data
lilyminium Feb 10, 2020
e8627ec
updated dependencies
lilyminium Feb 10, 2020
a51f97a
added hole
lilyminium Feb 10, 2020
2bee421
updated hole
lilyminium Feb 17, 2020
1888f12
updated hole2, added density_analysis, started blurb on diffusionmap
lilyminium Feb 19, 2020
893ebe1
switched trajectory transformation order
lilyminium Feb 19, 2020
c7e838c
saved density nglview
lilyminium Feb 19, 2020
fd9596d
Merge branch 'master' into distances
lilyminium Feb 19, 2020
dbcbdc9
fixed hole link
lilyminium Feb 20, 2020
ad26988
Merge branch 'distances' of github.com:MDAnalysis/UserGuide into dist…
lilyminium Feb 20, 2020
a434db7
started dmap
lilyminium Feb 22, 2020
1b1d66f
added dmap entry
lilyminium Feb 22, 2020
90accb4
saved widget state
lilyminium Feb 22, 2020
975474a
added plotly js to nbsphinx
lilyminium Feb 22, 2020
89ca0f3
fixed notebook typos
lilyminium Feb 23, 2020
701bfa8
updated hole nb
lilyminium Feb 29, 2020
91a2120
updated pore gif
lilyminium Feb 29, 2020
fe7fc98
updated pairwise tutorial
lilyminium Feb 29, 2020
418a226
added dssp
lilyminium Mar 10, 2020
87c4484
added helanal
lilyminium Mar 13, 2020
791774f
added helanal images
lilyminium Mar 13, 2020
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
15 changes: 12 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,23 @@ doc/build

# ignore generated files
*.vmd
*.crd
*.dcd
*.xyz
*.pdb
*.trr
*.ndx
*.xtc
*.pkl
*.dat

# example files
doc/source/examples/*
!doc/source/examples/*.ipynb
!doc/source/examples/analysis/*.ipynb
doc/source/examples/**/*.*
!doc/source/examples/**/*.ipynb
!doc/source/examples/**/*.rst
!doc/source/examples/**/*.gif
!doc/source/examples/**/*.png

# backup files
doc/source/examples/**/.*.ipynb

41 changes: 0 additions & 41 deletions doc/source/analysis.rst

This file was deleted.

45 changes: 30 additions & 15 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# import os
# import sys

from collections import OrderedDict
import MDAnalysis as mda
# import subprocess
import sphinx_rtd_theme
Expand All @@ -28,11 +29,11 @@
# Get Travis to regenerate txt tables by re-running scripts
# before deploying docs.
# Turned off for now as 0.21.0 not released yet.
# This allows us to gitignore .txt files as well as
# This allows us to gitignore .txt files as well as
# auto-recreate tables for each deployment.
# Turn off if using sphinx_autobuild as this will autobuild
# Turn off if using sphinx_autobuild as this will autobuild
# to infinity.
#
#
# subprocess.call('./scripts/generate_all.sh')

# -- General configuration ---------------------------------------------------
Expand All @@ -53,7 +54,8 @@
'nbsphinx',
'sphinx_rtd_theme',
'IPython.sphinxext.ipython_console_highlighting',
'IPython.sphinxext.ipython_directive'
'IPython.sphinxext.ipython_directive',
'sphinxcontrib.bibtex',
]

pygments_style = 'default'
Expand All @@ -70,7 +72,10 @@
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', '.ipynb_checkpoints', '**/.ipynb_checkpoints', 'scripts', '.*.ipynb']

exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store',
'.ipynb_checkpoints', '**/.ipynb_checkpoints', 'scripts', '.*.ipynb']


# -- Options for HTML output -------------------------------------------------

Expand All @@ -90,9 +95,8 @@
color = {'orange': '#FF9200',
'gray': '#808080',
'white': '#FFFFFF',
'black': '#000000',}
'black': '#000000', }

from collections import OrderedDict
extra_nav_links = OrderedDict()
extra_nav_links['MDAnalysis'] = 'http://mdanalysis.org'
extra_nav_links['docs'] = 'http://docs.mdanalysis.org'
Expand All @@ -107,11 +111,11 @@
'display_version': True,
'prev_next_buttons_location': 'bottom',
'style_external_links': False,
'style_nav_header_background': 'white', #'#e76900', # dark orange
'style_nav_header_background': 'white', # '#e76900', # dark orange
# Toc options
'collapse_navigation': True,
'sticky_navigation': True,
'navigation_depth': 5,
'navigation_depth': 4,
'includehidden': True,
'titles_only': False,
}
Expand All @@ -120,14 +124,14 @@
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
html_favicon = "_static/logos/mdanalysis-logo.ico"
html_logo = '_static/logos/user_guide.png'
html_logo = '_static/logos/user_guide.png'


# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
html_css_files = ['custom.css']#, 'readable.css']
html_css_files = ['custom.css'] # , 'readable.css']

# Custom sidebar templates, maps document names to template names.
# alabaster sidebars
Expand All @@ -150,14 +154,25 @@

# nbsphinx
html_js_files = [
'https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js',
DEFAULT_EMBED_REQUIREJS_URL,
# 'https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js',
# DEFAULT_EMBED_REQUIREJS_URL,
]

nbsphinx_prolog = r"""
.. raw:: html

<script src='http://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.10/require.min.js'></script>
<script>require=requirejs;</script>


"""

ipython_warning_is_error = False

# substitutions
MDAnalysis_version = '0.20.1'
MDAnalysis_version = '1.0.0'

# rst-epilog implements substitutions
rst_epilog = """
.. |MDAnalysis_version| replace:: {0}
""".format(MDAnalysis_version)
""".format(MDAnalysis_version)
29 changes: 29 additions & 0 deletions doc/source/examples/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

========
Examples
========

MDAnalysis maintains a collection of Jupyter notebooks as examples of what the code can do. Each notebook can be downloaded from the source repository to run on your own computer, or viewed as an online tutorial on the user guide.


.. toctree::
:maxdepth: 1
:caption: General

constructing_universe
transformations/README
parmed_sim

.. toctree::
:maxdepth: 2
:caption: Analysis

analysis/alignment_and_rms/README
analysis/distances_and_contacts/README
analysis/trajectory_similarity/README
analysis/hydrogen_bonding/README
analysis/structure/README
analysis/reduced_dimensions/README
analysis/polymers_and_membranes/README
analysis/volumetric/README

54 changes: 54 additions & 0 deletions doc/source/examples/analysis/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
.. -*- coding: utf-8 -*-
.. _analysis:

========
Analysis
========

The :mod:`~MDAnalysis.analysis` module of MDAnalysis provides the tools needed to analyse your data.
Several analyses are included with the package. These range from standard algorithms
(e.g. :ref:`calculating root mean squared quantities <alignment-and-rms>`) to unique algorithms such as
the `path similarity analysis <examples/analysis/trajectory_similarity/psa.ipynb>`__.

Generally these bundled analyses are contributed by various researchers who use the code for their own work.
Please refer to the individual module documentation or relevant user guide tutorials for additional
references and citation information.

If you need functionality that is not already provided in MDAnalysis, there are
`several ways to write your own analysis <examples/analysis/custom_trajectory_analysis.ipynb>`__.



Imports and dependencies
========================

Analysis modules are not imported by default. In order to use them, you will need to import
them separately, e.g.::

from MDAnalysis.analysis import align

.. note::

Several modules in :mod:`MDAnalysis.analysis` require additional Python packages.
For example, :mod:`~MDAnalysis.analysis.encore` makes use of `scikit-learn <http://scikit-learn.org/>`__.
The Python packages are not automatically installed with `pip`, although they are with `conda`.

Other modules require external programs. For example, :mod:`~MDAnalysis.analysis.hole` requires
the `HOLE <http://www.holeprogram.org/>`_ programs. You will need to install these yourself.


.. include:: /examples/analysis/alignment_and_rms/README.rst

.. include:: /examples/analysis/distances_and_contacts/README.rst

.. include:: /examples/analysis/trajectory_similarity/README.rst

.. include:: /examples/analysis/hydrogen_bonding/README.rst

.. include:: /examples/analysis/structure/README.rst

.. include:: /examples/analysis/volumetric/README.rst

.. include:: /examples/analysis/reduced_dimensions/README.rst

.. include:: /examples/analysis/polymers_and_membranes/README.rst
26 changes: 26 additions & 0 deletions doc/source/examples/analysis/alignment_and_rms/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
.. -*- coding: utf-8 -*-

.. _alignment-and-rms:

==========================
Alignments and RMS fitting
==========================

The :mod:`MDAnalysis.analysis.align` and :mod:`MDAnalysis.analysis.rms` modules contain the functions used for aligning structures, aligning trajectories, and calculating root mean squared quantities.

.. note::

These modules use the fast QCP algorithm to calculate the root mean
square distance (RMSD) between two coordinate sets :cite:`theobald_rapid_2005` and
the rotation matrix *R* that minimizes the RMSD :cite:`liu_fast_2009`. Please
cite these references when using these modules.

.. toctree::
:maxdepth: 1

/examples/analysis/alignment_and_rms/aligning_structure_to_another
/examples/analysis/alignment_and_rms/aligning_trajectory_to_first_frame
/examples/analysis/alignment_and_rms/aligning_trajectory
/examples/analysis/alignment_and_rms/rmsd
/examples/analysis/alignment_and_rms/pairwise_rmsd
/examples/analysis/alignment_and_rms/rmsf
Loading