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

Add in analysis function to calculate MSDs #2619

Merged
merged 136 commits into from
Jun 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
826b2ad
added msd class
Mar 2, 2020
6540de2
added in msd types and dimension factors
hmacdope Mar 2, 2020
f50622c
fill out framework to calculate msd
hmacdope Mar 2, 2020
aa29d3b
fill out framework to calculate msd
hmacdope Mar 2, 2020
6e72bd4
fix merge conflict
hmacdope Mar 2, 2020
671e537
skeleton algorithm for naieve MSD algorithm
hmacdope Mar 3, 2020
b0e296b
add in fft algorithm skeleton
hmacdope Mar 3, 2020
67fc0d0
naieve algorithm complete
hmacdope Mar 4, 2020
3018a62
added in fft compute and tests
hmacdope Mar 11, 2020
44407e4
cleaned up tests and started working on docs
hmacdope Mar 11, 2020
4711fb6
ready to open WIP opull request
hmacdope Mar 13, 2020
f9f7dd9
worked on documentation and examples
hmacdope Mar 13, 2020
2358a11
more work on docs
hmacdope Mar 13, 2020
a8d400a
doc and example improvements
hmacdope Mar 14, 2020
0a960e4
improved numerical performance of FFT based algorithm
hmacdope Mar 14, 2020
cc11cc6
added in tidynamics tests
hmacdope Mar 15, 2020
e9b17fe
clean up deps
hmacdope Mar 15, 2020
09b5458
added tidynamics to test deps
hmacdope Mar 15, 2020
a06294b
test tidynymaics in test block and updated docs
hmacdope Mar 15, 2020
4cf63fd
try and fix install
hmacdope Mar 15, 2020
e5e3629
fix single failed build
hmacdope Mar 15, 2020
2c469f0
change travis and appveyor settings
hmacdope Mar 15, 2020
546f7f2
fix .appveyor
hmacdope Mar 15, 2020
e02dd09
Merge branch 'develop' into add_msd
hmacdope Mar 15, 2020
033273b
relax to decimal=3 tol for FFT step_traj test due to failing numpy=1.…
hmacdope Mar 15, 2020
dd5b25d
Merge branch 'add_msd' of github.com:hmacdope/mdanalysis into add_msd
hmacdope Mar 15, 2020
83be862
switch .indices for .ix for proper indexing of coordinate array
hmacdope Mar 15, 2020
d318a91
implement reccomended changes and improve docs
hmacdope Mar 16, 2020
10e3fc2
add small test to ensure selection is working
hmacdope Mar 16, 2020
089a2bd
add capability to pull out MSDs per particle
hmacdope Mar 16, 2020
d108453
fix typo in per particle tests
hmacdope Mar 16, 2020
8ebc233
add in test to show numerical error in constan tvelocity trajectory.
hmacdope May 15, 2020
e2d383d
replaced own fft code with tidynamics
hmacdope May 17, 2020
73bc1f7
add duecredit citation
hmacdope May 17, 2020
c71f5e6
add FCA citation
hmacdope May 17, 2020
ddbc4e3
update requires and fix docs build
hmacdope May 17, 2020
523f81f
update citation
hmacdope May 17, 2020
6eb76e2
Merge branch 'develop' into add_msd
hmacdope May 18, 2020
86d59bb
fix appveyor and travis yml, removing duplication
hmacdope May 18, 2020
a934882
fix typo in travis.yml
hmacdope May 18, 2020
7759da7
fix failing numpy=1.13 nets and update CHANGELOG
hmacdope May 18, 2020
851daa3
Update package/CHANGELOG
hmacdope May 18, 2020
d23ee0e
Update package/MDAnalysis/analysis/msd.py
hmacdope May 18, 2020
49fbd86
Merge branch 'develop' into add_msd
hmacdope May 18, 2020
9af111a
clean up imports and typos
hmacdope May 19, 2020
19625f0
Merge branch 'add_msd' of github.com:hmacdope/mdanalysis into add_msd
hmacdope May 20, 2020
0f637dd
framework moved to subclass AnalysisBase
hmacdope May 20, 2020
4c5f487
AnalysisBase compatible and passing tests
hmacdope May 20, 2020
78f7d4f
fix msd_by_particle and corresponding tests
hmacdope May 20, 2020
b458ae8
removed some inline comments that were useless
hmacdope May 20, 2020
09416cb
changed parse_msd_type to a clearer selection syntax
hmacdope May 20, 2020
60f0cca
remove fstring causing failed builds
hmacdope May 20, 2020
38da36e
fix typo in fstring removal
hmacdope May 20, 2020
0e22adf
fix another typo in fstring removal
hmacdope May 20, 2020
504e19c
clean up half changes to select kwarg
hmacdope May 20, 2020
e805403
clean up references
hmacdope May 20, 2020
3ba54a0
Merge remote-tracking branch 'upstream/develop' into add_msd
hmacdope May 20, 2020
6f70f06
fix docstring references
hmacdope May 21, 2020
4894bbd
improve docs and add image
hmacdope May 22, 2020
3a48b61
spelling in docs
hmacdope May 22, 2020
0d34487
remove inner loop over n_particles in simple MSD algorithm
hmacdope May 23, 2020
4ca2bf7
add seeding for np.random.randint
hmacdope May 23, 2020
8249a65
add pytest.mark.parametrize and move global vars to pytest.fixtures
hmacdope May 25, 2020
63b8fff
refactor constant velocity test using pytest.mark.parametrize
hmacdope May 25, 2020
0fc07f7
add tidynamics versioning
hmacdope May 25, 2020
0d69b65
move tidynamics to out of CONDA_MIN_DEPENDENCIES
hmacdope May 25, 2020
98d4b48
Update package/MDAnalysis/analysis/msd.py
hmacdope Jun 1, 2020
7d530eb
change docs markup
hmacdope Jun 1, 2020
2c760eb
spelling
hmacdope Jun 1, 2020
a7136c0
spelling
hmacdope Jun 1, 2020
ef6b6f4
caps
hmacdope Jun 1, 2020
f4aeaea
spelling
hmacdope Jun 1, 2020
121ac17
spelling
hmacdope Jun 1, 2020
09bedac
phrasing
hmacdope Jun 1, 2020
e070fb8
spelling
hmacdope Jun 1, 2020
d8c81cd
spelling
hmacdope Jun 1, 2020
1ac4086
spelling
hmacdope Jun 1, 2020
7a58d73
spelling
hmacdope Jun 1, 2020
c3ae32b
markup
hmacdope Jun 1, 2020
7764f9e
spelling
hmacdope Jun 1, 2020
9005ad5
change dimensions of base array
hmacdope Jun 1, 2020
e898226
keep dim of _position_array consistent
hmacdope Jun 1, 2020
b370a27
Merge branch 'develop' into add_msd
hmacdope Jun 1, 2020
3f5f5f3
pep8 lint
hmacdope Jun 1, 2020
e4e46ba
fix PEP8 compliance for line length
hmacdope Jun 2, 2020
d09f79c
update docs for PEP8 compliance
hmacdope Jun 3, 2020
cff23b0
add more references and tidy docs
hmacdope Jun 3, 2020
ba6f37a
removed repetitive structure in self.msd
hmacdope Jun 3, 2020
42720d8
clean up and PEP8 tests
hmacdope Jun 3, 2020
0f5a009
fix typo
hmacdope Jun 3, 2020
cc53e1b
refactor to only use the right dimension
hmacdope Jun 3, 2020
79f93a4
change docs for array sizing
hmacdope Jun 3, 2020
e9f4cf4
authroship note
hmacdope Jun 3, 2020
b909aad
move tidynamics to try except import
hmacdope Jun 3, 2020
bac625b
typo
hmacdope Jun 3, 2020
1aef299
lag time to lag-time
hmacdope Jun 3, 2020
2648d05
add start stop step tests
hmacdope Jun 3, 2020
a5a9716
Merge branch 'develop' into add_msd
hmacdope Jun 10, 2020
eccc5ea
fix start stop step tests
hmacdope Jun 10, 2020
f27b0da
fix test offsets
hmacdope Jun 10, 2020
33a8907
change docs
hmacdope Jun 10, 2020
fb7f458
clean up extra variables
hmacdope Jun 10, 2020
ac3a525
Merge branch 'add_msd' of github.com:hmacdope/mdanalysis into add_msd
hmacdope Jun 10, 2020
5e8c17f
fix docs
hmacdope Jun 10, 2020
41dde3f
fix import Error
hmacdope Jun 10, 2020
269ea05
Update package/MDAnalysis/analysis/msd.py
hmacdope Jun 10, 2020
ae5b93b
Merge branch 'add_msd' of https://github.com/hmacdope/mdanalysis into…
orbeckst Jun 11, 2020
2feb81e
corrected indentation and updated CHANGELOG
orbeckst Jun 11, 2020
141dca8
EinsteinMSD: also document run() method
orbeckst Jun 11, 2020
d007ac9
reorganized analysis docs toc for structure
orbeckst Jun 11, 2020
e1dbbbe
Update package/MDAnalysis/analysis/msd.py
hmacdope Jun 11, 2020
923e161
Update package/MDAnalysis/analysis/msd.py
hmacdope Jun 11, 2020
607e228
Update package/MDAnalysis/analysis/msd.py
hmacdope Jun 11, 2020
e983f83
fix
hmacdope Jun 11, 2020
7d4e54f
typo
hmacdope Jun 11, 2020
8498f1a
change import
hmacdope Jun 11, 2020
e39433e
change import error
hmacdope Jun 11, 2020
50b9f11
Update package/MDAnalysis/analysis/msd.py
hmacdope Jun 11, 2020
af5cedf
newline
hmacdope Jun 11, 2020
e76f164
Revert "newline"
hmacdope Jun 11, 2020
1d62c0c
change docs
hmacdope Jun 11, 2020
a55ad30
change docs
hmacdope Jun 11, 2020
491da98
change docs
hmacdope Jun 11, 2020
09fb909
Merge branch 'add_msd' of github.com:hmacdope/mdanalysis into add_msd
hmacdope Jun 11, 2020
4d9c2d5
confusion over revert
hmacdope Jun 11, 2020
0cf1882
change author notes etc
hmacdope Jun 11, 2020
f1c7bd2
small edits
hmacdope Jun 11, 2020
7321bb6
rip out docstrings for internal functions
hmacdope Jun 12, 2020
18eb09c
fix docstrings and line conts
hmacdope Jun 12, 2020
353ae3e
remove extra dtypes
hmacdope Jun 12, 2020
78911b8
more dtypes removed
hmacdope Jun 12, 2020
e8478ba
Merge branch 'develop' into add_msd
hmacdope Jun 12, 2020
6513f8b
remove select from kwargs
hmacdope Jun 12, 2020
38eeb15
Merge branch 'add_msd' of github.com:hmacdope/mdanalysis into add_msd
hmacdope Jun 12, 2020
fe02375
Merge remote-tracking branch 'upstream/develop' into add_msd
hmacdope Jun 14, 2020
16dca64
fix docs build error
hmacdope Jun 14, 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
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cache:
environment:
global:
CONDA_CHANNELS: conda-forge
CONDA_DEPENDENCIES: pip setuptools wheel cython mock six biopython networkx joblib matplotlib scipy vs2015_runtime pytest mmtf-python GridDataFormats hypothesis pytest-cov codecov chemfiles tqdm
CONDA_DEPENDENCIES: pip setuptools wheel cython mock six biopython networkx joblib matplotlib scipy vs2015_runtime pytest mmtf-python GridDataFormats hypothesis pytest-cov codecov chemfiles tqdm tidynamics>=1.0.0
PIP_DEPENDENCIES: gsd==1.9.3 duecredit parmed
DEBUG: "False"
MINGW_64: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
- SETUP_CMD="${PYTEST_FLAGS}"
- BUILD_CMD="pip install -e package/ && (cd testsuite/ && python setup.py build)"
- CONDA_MIN_DEPENDENCIES="mmtf-python mock six biopython networkx cython matplotlib scipy griddataformats hypothesis gsd codecov"
- CONDA_DEPENDENCIES="${CONDA_MIN_DEPENDENCIES} seaborn>=0.7.0 clustalw=2.1 netcdf4 scikit-learn joblib>=0.12 chemfiles tqdm>=4.43.0"
- CONDA_DEPENDENCIES="${CONDA_MIN_DEPENDENCIES} seaborn>=0.7.0 clustalw=2.1 netcdf4 scikit-learn joblib>=0.12 chemfiles tqdm>=4.43.0 tidynamics>=1.0.0"
- CONDA_CHANNELS='biobuilds conda-forge'
- CONDA_CHANNEL_PRIORITY=True
- PIP_DEPENDENCIES="duecredit parmed"
Expand Down
3 changes: 2 additions & 1 deletion package/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The rules for this file:
* release numbers follow "Semantic Versioning" http://semver.org

------------------------------------------------------------------------------
??/??/?? richardjgowers, IAlibay
??/??/?? richardjgowers, IAlibay, hmacdope

* 2.0.0

Expand All @@ -22,6 +22,7 @@ Fixes
(Issues #2449, #2651)

Enhancements
orbeckst marked this conversation as resolved.
Show resolved Hide resolved
* Added computation of Mean Squared Displacements (#2438, PR #2619)

Changes
* Removes deprecated density_from_Universe, density_from_PDB, Bfactor2RMSF,
Expand Down
Loading