-
Notifications
You must be signed in to change notification settings - Fork 825
Add in analysis function to calculate MSDs #2619
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
136 commits
Select commit
Hold shift + click to select a range
826b2ad
added msd class
6540de2
added in msd types and dimension factors
hmacdope f50622c
fill out framework to calculate msd
hmacdope aa29d3b
fill out framework to calculate msd
hmacdope 6e72bd4
fix merge conflict
hmacdope 671e537
skeleton algorithm for naieve MSD algorithm
hmacdope b0e296b
add in fft algorithm skeleton
hmacdope 67fc0d0
naieve algorithm complete
hmacdope 3018a62
added in fft compute and tests
hmacdope 44407e4
cleaned up tests and started working on docs
hmacdope 4711fb6
ready to open WIP opull request
hmacdope f9f7dd9
worked on documentation and examples
hmacdope 2358a11
more work on docs
hmacdope a8d400a
doc and example improvements
hmacdope 0a960e4
improved numerical performance of FFT based algorithm
hmacdope cc11cc6
added in tidynamics tests
hmacdope e9b17fe
clean up deps
hmacdope 09b5458
added tidynamics to test deps
hmacdope a06294b
test tidynymaics in test block and updated docs
hmacdope 4cf63fd
try and fix install
hmacdope e5e3629
fix single failed build
hmacdope 2c469f0
change travis and appveyor settings
hmacdope 546f7f2
fix .appveyor
hmacdope e02dd09
Merge branch 'develop' into add_msd
hmacdope 033273b
relax to decimal=3 tol for FFT step_traj test due to failing numpy=1.…
hmacdope dd5b25d
Merge branch 'add_msd' of github.com:hmacdope/mdanalysis into add_msd
hmacdope 83be862
switch .indices for .ix for proper indexing of coordinate array
hmacdope d318a91
implement reccomended changes and improve docs
hmacdope 10e3fc2
add small test to ensure selection is working
hmacdope 089a2bd
add capability to pull out MSDs per particle
hmacdope d108453
fix typo in per particle tests
hmacdope 8ebc233
add in test to show numerical error in constan tvelocity trajectory.
hmacdope e2d383d
replaced own fft code with tidynamics
hmacdope 73bc1f7
add duecredit citation
hmacdope c71f5e6
add FCA citation
hmacdope ddbc4e3
update requires and fix docs build
hmacdope 523f81f
update citation
hmacdope 6eb76e2
Merge branch 'develop' into add_msd
hmacdope 86d59bb
fix appveyor and travis yml, removing duplication
hmacdope a934882
fix typo in travis.yml
hmacdope 7759da7
fix failing numpy=1.13 nets and update CHANGELOG
hmacdope 851daa3
Update package/CHANGELOG
hmacdope d23ee0e
Update package/MDAnalysis/analysis/msd.py
hmacdope 49fbd86
Merge branch 'develop' into add_msd
hmacdope 9af111a
clean up imports and typos
hmacdope 19625f0
Merge branch 'add_msd' of github.com:hmacdope/mdanalysis into add_msd
hmacdope 0f637dd
framework moved to subclass AnalysisBase
hmacdope 4c5f487
AnalysisBase compatible and passing tests
hmacdope 78f7d4f
fix msd_by_particle and corresponding tests
hmacdope b458ae8
removed some inline comments that were useless
hmacdope 09416cb
changed parse_msd_type to a clearer selection syntax
hmacdope 60f0cca
remove fstring causing failed builds
hmacdope 38da36e
fix typo in fstring removal
hmacdope 0e22adf
fix another typo in fstring removal
hmacdope 504e19c
clean up half changes to select kwarg
hmacdope e805403
clean up references
hmacdope 3ba54a0
Merge remote-tracking branch 'upstream/develop' into add_msd
hmacdope 6f70f06
fix docstring references
hmacdope 4894bbd
improve docs and add image
hmacdope 3a48b61
spelling in docs
hmacdope 0d34487
remove inner loop over n_particles in simple MSD algorithm
hmacdope 4ca2bf7
add seeding for np.random.randint
hmacdope 8249a65
add pytest.mark.parametrize and move global vars to pytest.fixtures
hmacdope 63b8fff
refactor constant velocity test using pytest.mark.parametrize
hmacdope 0fc07f7
add tidynamics versioning
hmacdope 0d69b65
move tidynamics to out of CONDA_MIN_DEPENDENCIES
hmacdope 98d4b48
Update package/MDAnalysis/analysis/msd.py
hmacdope 7d530eb
change docs markup
hmacdope 2c760eb
spelling
hmacdope a7136c0
spelling
hmacdope ef6b6f4
caps
hmacdope f4aeaea
spelling
hmacdope 121ac17
spelling
hmacdope 09bedac
phrasing
hmacdope e070fb8
spelling
hmacdope d8c81cd
spelling
hmacdope 1ac4086
spelling
hmacdope 7a58d73
spelling
hmacdope c3ae32b
markup
hmacdope 7764f9e
spelling
hmacdope 9005ad5
change dimensions of base array
hmacdope e898226
keep dim of _position_array consistent
hmacdope b370a27
Merge branch 'develop' into add_msd
hmacdope 3f5f5f3
pep8 lint
hmacdope e4e46ba
fix PEP8 compliance for line length
hmacdope d09f79c
update docs for PEP8 compliance
hmacdope cff23b0
add more references and tidy docs
hmacdope ba6f37a
removed repetitive structure in self.msd
hmacdope 42720d8
clean up and PEP8 tests
hmacdope 0f5a009
fix typo
hmacdope cc53e1b
refactor to only use the right dimension
hmacdope 79f93a4
change docs for array sizing
hmacdope e9f4cf4
authroship note
hmacdope b909aad
move tidynamics to try except import
hmacdope bac625b
typo
hmacdope 1aef299
lag time to lag-time
hmacdope 2648d05
add start stop step tests
hmacdope a5a9716
Merge branch 'develop' into add_msd
hmacdope eccc5ea
fix start stop step tests
hmacdope f27b0da
fix test offsets
hmacdope 33a8907
change docs
hmacdope fb7f458
clean up extra variables
hmacdope ac3a525
Merge branch 'add_msd' of github.com:hmacdope/mdanalysis into add_msd
hmacdope 5e8c17f
fix docs
hmacdope 41dde3f
fix import Error
hmacdope 269ea05
Update package/MDAnalysis/analysis/msd.py
hmacdope ae5b93b
Merge branch 'add_msd' of https://github.com/hmacdope/mdanalysis into…
orbeckst 2feb81e
corrected indentation and updated CHANGELOG
orbeckst 141dca8
EinsteinMSD: also document run() method
orbeckst d007ac9
reorganized analysis docs toc for structure
orbeckst e1dbbbe
Update package/MDAnalysis/analysis/msd.py
hmacdope 923e161
Update package/MDAnalysis/analysis/msd.py
hmacdope 607e228
Update package/MDAnalysis/analysis/msd.py
hmacdope e983f83
fix
hmacdope 7d4e54f
typo
hmacdope 8498f1a
change import
hmacdope e39433e
change import error
hmacdope 50b9f11
Update package/MDAnalysis/analysis/msd.py
hmacdope af5cedf
newline
hmacdope e76f164
Revert "newline"
hmacdope 1d62c0c
change docs
hmacdope a55ad30
change docs
hmacdope 491da98
change docs
hmacdope 09fb909
Merge branch 'add_msd' of github.com:hmacdope/mdanalysis into add_msd
hmacdope 4d9c2d5
confusion over revert
hmacdope 0cf1882
change author notes etc
hmacdope f1c7bd2
small edits
hmacdope 7321bb6
rip out docstrings for internal functions
hmacdope 18eb09c
fix docstrings and line conts
hmacdope 353ae3e
remove extra dtypes
hmacdope 78911b8
more dtypes removed
hmacdope e8478ba
Merge branch 'develop' into add_msd
hmacdope 6513f8b
remove select from kwargs
hmacdope 38eeb15
Merge branch 'add_msd' of github.com:hmacdope/mdanalysis into add_msd
hmacdope fe02375
Merge remote-tracking branch 'upstream/develop' into add_msd
hmacdope 16dca64
fix docs build error
hmacdope 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
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.