Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
515 commits
Select commit Hold shift + click to select a range
98c8370
Updated residue selection of function, added test files
Jul 17, 2018
1fbd155
fixes for pylint 2
richardjgowers Jul 17, 2018
5f151b4
pylint changes for testsuite
richardjgowers Jul 17, 2018
41bed97
don't allow pylint to fail any more
richardjgowers Jul 17, 2018
d7cfc27
Merge pull request #1994 from MDAnalysis/pylint2
richardjgowers Jul 17, 2018
feebb7d
Modified input type to undo_augment, added documentation stub
ayushsuhane Jul 18, 2018
49882ff
Simple test that checks for the known Survival Probability.
bieniekmateusz Jul 18, 2018
ad4e598
Updated docstring of dihedrals.py
Jul 18, 2018
5bd2e0b
Defined dataset for the test case t0 != 0. The code will be correct i…
bieniekmateusz Jul 18, 2018
d194cee
t0 testcase covers also tf. If one too many frames is used, wrong res…
bieniekmateusz Jul 18, 2018
56c0b03
moved _dot, _cross, _norm to _cutil.pyx, modified document structure …
ayushsuhane Jul 19, 2018
7ef48ef
removed augment.rst
ayushsuhane Jul 19, 2018
238904d
Merge pull request #1977 from ayushsuhane/augment
richardjgowers Jul 19, 2018
4dabf32
Switched to distances.calc_dihedrals and simplified plot function
Jul 19, 2018
f0d8030
Fixed imports
Jul 19, 2018
15c2bd9
Added six to imports
Jul 19, 2018
3b79336
Fixed zip function
Jul 20, 2018
bfc75c9
Updated test references and added them to __all__
Jul 20, 2018
c5fcfb8
Removed identical frames test, switched to assert_almost_equal
Jul 20, 2018
a2090fa
First commit to replace Biopython with Scipy KDTree along with tests …
ayushsuhane Jul 16, 2018
c9a615f
recover accidently deleted test from PeriodicKDTree
ayushsuhane Jul 16, 2018
fae1bee
changed the tuple sorting
ayushsuhane Jul 18, 2018
0d35aef
modified the tests and module a/c to returns of augment, added more t…
ayushsuhane Jul 20, 2018
4812dc0
Updated docstrings of dihedrals.py, added files to docs
Jul 20, 2018
610368e
Updated CHANGELOG
Jul 20, 2018
60b1667
Fixed plotting in dihedrals.py, added more tests to test_dihedrals.py
Jul 20, 2018
000f1e7
fixed issue with rotation from non-origin point calculation
davidercruz Jul 21, 2018
4f23420
rotaateby now behaves as rotate, updated tests to use transform(matrix)
davidercruz Jul 21, 2018
d25e6e5
removed the dependency of Bio.KDtree and PeriodicKDTree from lib, and…
ayushsuhane Jul 22, 2018
5f54fec
Modified selections to change KDtree selections from Biopython to scipy
ayushsuhane Jul 22, 2018
6cffae9
rotateby now accepts weights
davidercruz Jul 22, 2018
b2092cd
completely removed Biopython.KDTree and wrapper around it, replaced t…
ayushsuhane Jul 22, 2018
83f6cf2
TST: test_unique_int_1d now enforces int64 type
tylerjereddy Jul 22, 2018
9ba25f1
fixed typos
davidercruz Jul 22, 2018
9e5db30
code cleanup
davidercruz Jul 22, 2018
f8d49fb
added checks for direction ; added tests for direction
davidercruz Jul 22, 2018
dfadeff
Modified search pair to check the number of bonds
ayushsuhane Jul 23, 2018
2a6f1f6
Merge pull request #2002 from MDAnalysis/issue_1962_cutil
richardjgowers Jul 23, 2018
87cce21
Trailing lines
bieniekmateusz Jul 23, 2018
cc4db35
Author and changelog updated.
bieniekmateusz Jul 23, 2018
e83bd9a
Fixed imports and docstring
Jul 23, 2018
7561232
Fixed docstring
Jul 23, 2018
c166ab2
Documentation and requested changes PR #1995.
bieniekmateusz Jul 24, 2018
505f549
Tests adjusted to the new interface.
bieniekmateusz Jul 24, 2018
affc0ab
Conforming to the run() interface defined in #1463.
bieniekmateusz Jul 24, 2018
193e503
Fixed imports of test_dihedral.py
Jul 24, 2018
eadcf3f
modified the sorting, and made pbc a property
ayushsuhane Jul 24, 2018
a064686
Backward compatibility (and priority) with warnings.
bieniekmateusz Jul 25, 2018
666370e
removed set_cutoff, and modified the pbc property definition
ayushsuhane Jul 25, 2018
182d867
removed set_cutoff from Neighboursearch as well
ayushsuhane Jul 25, 2018
b50c6f0
Merge pull request #1997 from hfmull/dihedrals
kain88-de Jul 25, 2018
917dbec
pair sorting before picking out the unique pairs. Previously resultin…
ayushsuhane Jul 26, 2018
f1e72ab
BUG: fix several Windows test failures with int64 type enforcement fo…
tylerjereddy Jul 27, 2018
461aadf
Merge pull request #2009 from MDAnalysis/unique_int_1d_win
richardjgowers Jul 27, 2018
b827bc0
The windows size tau + t was already accounted for in _getMeanOnePoin…
bieniekmateusz Jun 21, 2018
cdcd942
Use reverse search for number of survivors. Stop search if no survivors.
bieniekmateusz Jun 21, 2018
351fc5d
Optimised calculation of survival probability.
Jun 22, 2018
6d35ed9
Syntax errors
bieniekmateusz Jun 22, 2018
99ada4d
Changed expected output from 0.0 to Nan.
bieniekmateusz Jun 29, 2018
522e717
Minor changes:
bieniekmateusz Jul 1, 2018
da0f594
Switch the nested loops. Looping only once over the entire trajectory…
bieniekmateusz Jul 1, 2018
cd2abb9
No need to check t+tau for any tau if at t it is empty.
bieniekmateusz Jul 1, 2018
054228b
If there is no atom at t, this does not need to be checked for each t…
bieniekmateusz Jul 1, 2018
3928107
Should the first data point be always 1? In that case first tau = 0. …
bieniekmateusz Jul 1, 2018
3cc426d
Using the set.intersection argument unpacking: easier to read, neater
bieniekmateusz Jul 3, 2018
01e6fec
Returning the survival probability and the values of tau as
Jul 3, 2018
7cf8318
Adjusting the tests because the return function gives back taus too.
bieniekmateusz Jul 3, 2018
d8f4a60
Moving the checks to the constructor.
bieniekmateusz Jul 3, 2018
b5d07e9
verbose mode added + better documentation.
bieniekmateusz Jul 3, 2018
d348cc7
The tf is inclusive.
bieniekmateusz Jul 3, 2018
0ef1057
Storing a set of atom ids at each timestep, rather than a set containing
Jul 5, 2018
8470c4c
tiny bug
bieniekmateusz Jul 5, 2018
40e926d
Check if all tau == 1 when the same atom IDs are returned at each frame
bieniekmateusz Jul 17, 2018
c66f3db
Mock data for the test case.
bieniekmateusz Jul 17, 2018
ab21e39
Simple test that checks for the known Survival Probability.
bieniekmateusz Jul 18, 2018
a53a673
Defined dataset for the test case t0 != 0. The code will be correct i…
bieniekmateusz Jul 18, 2018
9a20846
t0 testcase covers also tf. If one too many frames is used, wrong res…
bieniekmateusz Jul 18, 2018
9f8c677
Trailing lines
bieniekmateusz Jul 23, 2018
c01c994
Author and changelog updated.
bieniekmateusz Jul 23, 2018
036ccc6
Documentation and requested changes PR #1995.
bieniekmateusz Jul 24, 2018
4b1ee14
Tests adjusted to the new interface.
bieniekmateusz Jul 24, 2018
2c36f37
Conforming to the run() interface defined in #1463.
bieniekmateusz Jul 24, 2018
5988f96
Backward compatibility (and priority) with warnings.
bieniekmateusz Jul 25, 2018
46a7f69
Rebased and resolved conflict with CHANGELOG
bieniekmateusz Jul 28, 2018
e60b268
Improved docs; test point and vector in 2 shapes
davidercruz Jul 28, 2018
8536d54
Conforming to MDAnalysis overall API design. PR #1995
bieniekmateusz Jul 28, 2018
82c8488
BUG: fix Windows file permission setting in test_universe
tylerjereddy Jul 29, 2018
eb3cc94
BUG: test_persistent_offsets_readonly Windows fix
tylerjereddy Jul 29, 2018
50f4300
Merge pull request #2014 from MDAnalysis/windows_test_universe_file_perm
richardjgowers Jul 29, 2018
5455500
Merge pull request #2015 from MDAnalysis/test_persistent_offsets_read…
richardjgowers Jul 29, 2018
2a1df89
Merge branch 'survivalprobability' of github.com:bieniekmateusz/mdana…
bieniekmateusz Jul 31, 2018
3331c8d
Merge pull request #1990 from ayushsuhane/scipyKDTree
richardjgowers Aug 2, 2018
441d5ba
Updated comments
bieniekmateusz Aug 3, 2018
c00a04a
removed use of pytest.approx (#2019)
richardjgowers Aug 4, 2018
2c9d6c5
Use stricter type for pkdtree indices (#2025)
jbarnoud Aug 5, 2018
fe792a1
BUG: Force 64-bit storage for xdr file offsets
tylerjereddy Aug 5, 2018
bf424a5
Merge pull request #2000 from davidercruz/rotation-transform
jbarnoud Aug 5, 2018
6b74bac
Using Self Capped distance function in guess_bonds (#2006)
ayushsuhane Aug 5, 2018
f92ec5d
Around keyword can use KDTree for periodic boundary conditions (#2022)
ayushsuhane Aug 5, 2018
c04301a
First commit for gridded method
ayushsuhane Jun 26, 2018
c3e227a
removed the parallel handler to remove hard dependency on omp.h, can …
ayushsuhane Jun 26, 2018
007d47d
added the license header
ayushsuhane Jun 30, 2018
fc61e5e
Added MDAnalysis header file to c_gridsearch.pyx
seb-buch Jul 1, 2018
4b273a9
Corrected C (de)allocation in c_gridsearch.pyx. Should fix memory leak
seb-buch Jul 1, 2018
02b5819
Added Tests for grid search. Added grid in MDAnalysis.lib.__init__
seb-buch Jul 1, 2018
0f35031
Removed pointer to nsgrid structure to avoid need to free it
seb-buch Jul 4, 2018
bdad5e3
Removed abort() from c_gridsearch.pyx
seb-buch Jul 4, 2018
f65e32b
grid allocation moved to FastNS method
seb-buch Jul 7, 2018
ff33b2f
NSResults object added to store results from NS. Started documentation
seb-buch Jul 8, 2018
579fa00
Corrected Memory Leak
seb-buch Jul 8, 2018
0239d14
Added MDAnalysis/lib/c_search.pyx for Grid NS search
ayushsuhane Jun 26, 2018
5e9fe31
removed the parallel handler to remove hard dependency on omp.h, can …
ayushsuhane Jun 26, 2018
97d07fe
Added MDAnalysis header file to c_gridsearch.pyx
seb-buch Jul 1, 2018
a26f437
Corrected C (de)allocation in c_gridsearch.pyx. Should fix memory leak
seb-buch Jul 1, 2018
2855400
Removed pointer to nsgrid structure to avoid need to free it
seb-buch Jul 1, 2018
4d4a415
Removed abort() from c_gridsearch.pyx and grid allocation moved to Fa…
seb-buch Jul 4, 2018
c6339c5
NSResults object added to store results from NS. Started documentation
seb-buch Jul 8, 2018
7f4a176
Memory allocation changed to PyMem to enhance speed in c_gridsearch.pyx
seb-buch Jul 8, 2018
8650509
Unneeded code removed from c_gridsearch.pyx
seb-buch Jul 16, 2018
1a0e150
Module MDAnalysis/lib/c_gridsearch.pyx renamed to nsgrid.pyx
seb-buch Jul 18, 2018
a1e03dd
Tests written for FastNS
seb-buch Jul 18, 2018
8a75a5f
Removed all references to c_gridsearch.pyx/grid module that reappeare…
seb-buch Jul 18, 2018
7b0c56c
remove unused code
kain88-de Jul 21, 2018
3765868
make init_callable twice
kain88-de Jul 21, 2018
f230008
use OK and ERROR as return codes
kain88-de Jul 21, 2018
a738fa9
remove dead code
kain88-de Jul 21, 2018
89f0b89
remove possible memory leak
kain88-de Jul 21, 2018
08de29b
added the capped function, modified the nsgrid to use box, coordinate…
ayushsuhane Jul 27, 2018
9d52ac9
recovering accidently removed augment in setupd during rebase
ayushsuhane Jul 27, 2018
8b8ea74
corrected name in documentation
ayushsuhane Jul 28, 2018
e71b671
minor corrections to remove pylint error
ayushsuhane Jul 28, 2018
a5d1355
Used vectors in place of lists and dict, cleaned code and modified fu…
ayushsuhane Jul 31, 2018
46f9030
removed dict from buffers for speedup and modified tests
ayushsuhane Jul 31, 2018
2c83681
mend
ayushsuhane Jul 31, 2018
b05e243
reverted tests, removed sorting from get_indices, get_distances, modi…
ayushsuhane Aug 1, 2018
4f1e729
minor changes for failing tests
ayushsuhane Aug 1, 2018
7fd1f80
added hack to handle NoPBC, tests to follow
ayushsuhane Aug 1, 2018
57e9d55
conform tests a/c to modifications in API
ayushsuhane Aug 1, 2018
a7264ec
removed python functions, added no pbc handle using python min, max
ayushsuhane Aug 2, 2018
929fbf5
docs unchecked
ayushsuhane Aug 3, 2018
c817b39
returning list for get_indices, checked Docs
ayushsuhane Aug 4, 2018
66d94e5
removed parallel libraries
ayushsuhane Aug 4, 2018
e28c70a
solved contiguous issue, fixed tests, and added checks in API
ayushsuhane Aug 6, 2018
76c81cf
Added self_capped for nsgrid, moved no pbc box handling outside nsgri…
ayushsuhane Aug 6, 2018
bf03cd4
fixed Issue #2001 - support for Tinker periodic boundary box (#2011)
micaela-matta Aug 6, 2018
10e16c0
Merge pull request #2024 from MDAnalysis/issue_2021_filesize_bytes
jbarnoud Aug 6, 2018
e90dfd2
TST: Windows tests now xfail where needed (#2027)
tylerjereddy Aug 6, 2018
2a0b01f
updated CHANGELOG
ayushsuhane Aug 7, 2018
0cde1de
added sebastien to authors
ayushsuhane Aug 7, 2018
b7751d1
merged develop
ayushsuhane Aug 7, 2018
8dc6894
Assigning positions on memory reader is persistent
jbarnoud Aug 4, 2018
e2c2b56
Merge pull request #2008 from ayushsuhane/cappedgrid
richardjgowers Aug 7, 2018
cca00f7
doc updates/fixes for MemoryReader and Timestep
orbeckst Aug 7, 2018
0f18f48
updated selection.rst to match groups.py docstring
Aug 7, 2018
0f24b89
Fixed some typos in coordinates.memory
zemanj Aug 8, 2018
15fa3b3
added leading underscore to internal-only method `memory.Timestep._re…
zemanj Aug 8, 2018
10fb62d
Merge pull request #2023 from MDAnalysis/issue-2018-memory-assignation
zemanj Aug 8, 2018
dbad72c
Allow read in of VERY large pdb files (#1978)
Aug 10, 2018
388346d
additional PSA tests (#2036)
orbeckst Aug 10, 2018
93e6017
Added Janin class to dihedrals.py
Aug 1, 2018
e03fd0d
updated test_dihedrals for Janin class, added test data to datafiles.py
Aug 1, 2018
c8f5d82
cleaned up janin class
Aug 1, 2018
8eadbe8
Made Janin class a subclass of Ramachandran
Aug 1, 2018
8c873c8
Added general Dihedral class, with tests and test data
Aug 2, 2018
8002d04
fixed selections returning none in the middle of a protein
Aug 7, 2018
5efef65
updated to deal with selection failures
Aug 8, 2018
92c99b7
Updated test_dihedrals.py for new features
Aug 8, 2018
b72815b
updated docstring for dihedrals.py
Aug 8, 2018
6a6ec1b
updated CHANGELOG
Aug 8, 2018
2dd296f
Added reference plots for Ramachandran and Janin classes
Aug 9, 2018
556cf41
changed test_janin to check fewer decimals
Aug 9, 2018
4a52cc2
Fixed Janin plot method
Aug 9, 2018
44d48ad
moved ref plot data to new analysis/data directory, updated setup.py
Aug 9, 2018
e321165
updated docstring and added comments
Aug 10, 2018
f887f76
Fixed test_dihedrals, made analysis.data module
Aug 10, 2018
3814fc5
Added docs for analysis.data
Aug 10, 2018
8d94491
Updated docstrings and CHANGELOG
Aug 10, 2018
7c4a700
Added image directory for documentation
Aug 10, 2018
b4f8484
added ref=True to tests to increase coverage
Aug 11, 2018
80533cc
integrate Ramachandran and Janin plots into docs and updated references
orbeckst Aug 13, 2018
85ec60a
Merge pull request #2033 from hfmull/general_dihedrals
orbeckst Aug 13, 2018
67d064a
corrected time_guess_bonds, and added individual guess function in to…
ayushsuhane Aug 13, 2018
d2e22ff
Uses faster distance evaluations in Individual methods in Capped Func…
ayushsuhane Aug 13, 2018
8106a6c
Merge branch 'develop' into survivalprobability
richardjgowers Aug 13, 2018
e396630
Using Capped distance in distance selections (#2035)
ayushsuhane Aug 14, 2018
6f34d3c
TST: add codecov to appveyor CI run.
tylerjereddy Aug 12, 2018
5cf8c55
Merge pull request #1995 from bieniekmateusz/survivalprobability
richardjgowers Aug 14, 2018
6cee1c1
remove unused lib.mdamath.one_to_many_pointers() function
orbeckst Aug 14, 2018
353f220
removed testsuite/__init__.py
orbeckst Aug 14, 2018
57d77d8
Merge pull request #2051 from MDAnalysis/remove-unused
richardjgowers Aug 14, 2018
e9ee6be
Modified the distance function in RDF (#2013)
ayushsuhane Aug 15, 2018
825ee05
tests and updated docs for analysis.data (#2047)
orbeckst Aug 16, 2018
5eebb18
Simplified code in `lib.distances` a bit (#2048)
zemanj Aug 18, 2018
232bcd9
Added Cython implementation of fragment finding
richardjgowers Aug 6, 2018
62c35d4
Replaced kdtree in neighborsearch with capped distances (#2054)
ayushsuhane Aug 20, 2018
bf36624
more verbose docstring of `find_fragments()`
zemanj Aug 20, 2018
40865ce
use `bonds_view` instead of bondlist to initialize `bondmap` in `find…
zemanj Aug 20, 2018
2feaaa9
test_find_fragments now ensures array_like input works with `find_fra…
zemanj Aug 20, 2018
d73b653
Merge pull request #2028 from MDAnalysis/fast_fragments
zemanj Aug 20, 2018
d487aa3
added missing CHANGELOG entry for PR #2048
zemanj Aug 20, 2018
6d9e3ea
ensured `lib.distances.distance_array()` always returns an array
zemanj Aug 20, 2018
fd80f31
Merge branch 'develop' into issue-2046-lib-distances-rework
zemanj Aug 20, 2018
35440bf
deprecate flags
richardjgowers Aug 22, 2018
9cecdc9
Merge pull request #2056 from MDAnalysis/deprecate_flags
jbarnoud Aug 25, 2018
8cd8f55
fixed Cython 0.26 not liking to call len inside nogil block
richardjgowers Aug 25, 2018
b89c23d
Merge pull request #2058 from MDAnalysis/fix_cython_026
jbarnoud Aug 27, 2018
6fcadc0
Use capped_distance instead of distance_array
VOD555 Aug 29, 2018
5fb8de8
Merge pull request #2059 from VOD555/enh_rdf_s
orbeckst Aug 31, 2018
bb55d16
improved docstrings in lib/_augment.pyx
zemanj Sep 3, 2018
59860e7
improved docstrings in lib/_augment.pyx
zemanj Sep 3, 2018
b719705
Merge branch 'develop' into issue-2046-lib-distances-rework
zemanj Sep 3, 2018
280efad
improved docstrings in lib/_augment.pyx
zemanj Sep 3, 2018
cd58ce0
Improved docstrings in lib/_augment.pyx (#2062)
zemanj Sep 7, 2018
4e0cf0f
pin numpy version for Python 3.4
orbeckst Sep 10, 2018
ddb598c
auto-update conda in appveyor builds
zemanj Sep 10, 2018
b01f7f3
use conda.exe to build testing env
zemanj Sep 10, 2018
94a8920
fixed .appveyor.yml
zemanj Sep 10, 2018
e0a2b16
Merge pull request #2067 from MDAnalysis/ci-python34-bandaid-2066
zemanj Sep 10, 2018
bf18cda
improved all docstrings in lib/distances.py
zemanj Sep 11, 2018
63c0a96
Merge branch 'develop' into issue-2046-lib-distances-rework
zemanj Sep 11, 2018
1552a8b
Introduces user defined grid for density calculations (#2005)
IAlibay Sep 11, 2018
b5ba583
Fix SETTLE in TPR parser (#2068)
jbarnoud Sep 11, 2018
73ef0eb
added back autofunction entries in MDAnalysis/lib/distances.py and re…
zemanj Sep 12, 2018
791ecd9
use numpydoc `See Also` sections instead of `.. seealso::`
zemanj Sep 12, 2018
c9567dc
numpydoc selections for parameters with fixed value sets
zemanj Sep 12, 2018
4caeea2
moved nsgrid import to top of lib/distances.py
zemanj Sep 12, 2018
6741d1a
Merge pull request #2070 from zemanj/issue-2046-lib-distances-rework
zemanj Sep 12, 2018
ec8dd20
Adding bond/angle reading to PARM7 TOPParser.py (#2052)
IAlibay Sep 12, 2018
fdd3261
removed obsolete functions calc_distance(), calc_angle(), and calc_di…
zemanj Sep 13, 2018
ef0ee31
replaced obsolete functions calc_distance -> calc_bonds, calc_angle -…
zemanj Sep 13, 2018
0a9105e
transformed tests for obsolete functions calc_distance, calc_angle, a…
zemanj Sep 13, 2018
eb875da
improved docstrings of calc_bonds, calc_angles, and calc_dihedrals in…
zemanj Sep 13, 2018
16011c4
updated changelog (issue #2072)
zemanj Sep 13, 2018
52ba2ca
removed `.. autofunction` entries of obsolete functions in lib/distan…
zemanj Sep 13, 2018
f92e072
improved docstring of lib.distances.calc_dihedrals
zemanj Sep 13, 2018
cdcf093
reduced precision in angle and dihedral tests to 4 decimals
zemanj Sep 13, 2018
bab34da
moved all tests from utils/test_distances.py to lib/test_distances.py
zemanj Sep 13, 2018
ec246c5
allow import of WaterBridgeAnalysis from analysis.hbonds (#2071)
orbeckst Sep 13, 2018
259f778
Merge pull request #2073 from zemanj/issue-2072-lib-distances
zemanj Sep 13, 2018
55e7475
fixes #1795 (#2074)
richardjgowers Sep 21, 2018
00cf3b7
removed quiet in favour of verbose
richardjgowers Aug 22, 2018
8918d42
Merge pull request #2055 from MDAnalysis/issue-1975-nomorequiet
orbeckst Sep 21, 2018
edb1643
bug fixes in lib.distances (#2083)
zemanj Sep 29, 2018
80560da
made GSD unsupported in Windows (#2090)
richardjgowers Oct 8, 2018
d37f87b
fixed Gowers2016 reference (#2094)
orbeckst Oct 9, 2018
97db6d1
Added optional forces and velocities to MemoryReader (#2080)
richardjgowers Oct 9, 2018
fc9e5d3
finished version 0.19.0
richardjgowers Oct 9, 2018
bd83af7
Merge branch 'develop'
richardjgowers Oct 9, 2018
bd3ff77
fixed compilation of cpp sources
richardjgowers Oct 9, 2018
d9e58f2
Updated c/cpp sources for 0.19
richardjgowers Oct 9, 2018
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
71 changes: 71 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# config based on examples from SciPy & NumPy repositories, which
# themselves credit an original example by Olivier Grisel at
# https://github.com/ogrisel/python-appveyor-demo/blob/master/appveyor.yml
clone_depth: 50
max_jobs: 100

cache:
- '%LOCALAPPDATA%\pip\Cache'

image:
- Visual Studio 2015

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
PIP_DEPENDENCIES: gsd==1.5.2 duecredit
DEBUG: "False"
MINGW_64: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin
OPENBLAS_64: https://3f23b170c54c2533c070-1c8a9b3114517dc5fe17b7c3f8c63a43.ssl.cf2.rackcdn.com/openblas-5f998ef_gcc7_1_0_win64.zip
APPVEYOR_SAVE_CACHE_ON_ERROR: true
APPVEYOR_SKIP_FINALIZE_ON_EXIT: true
TEST_TIMEOUT: 1000
PYTHON: "C:\\conda"
MINICONDA_VERSION: "latest"

matrix:
- PYTHON_VERSION: 3.6
PYTHON_ARCH: 64
MSVC_VERSION: "Visual Studio 10 Win64"

init:
- ps: Write-Host ${env:PYTHON} ${env:PYTHON_VERSION} ${env:PYTHON_ARCH}
- ps: Write-Host ${env:APPVEYOR_SCHEDULED_BUILD}
# cancel build if newer one is submitted; complicated
# details for getting this to work are credited to JuliaLang
# developers
- ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
raise "There are newer queued builds for this pull request, skipping build."
}

install:
# set up a conda env
- ps: git clone -q --depth 1 git://github.com/astropy/ci-helpers.git
- ps: ci-helpers/appveyor/install-miniconda.ps1
- ps: $env:PATH = "${env:PYTHON};${env:PYTHON}\Scripts;" + $env:PATH
# deal with missing stdint.h as previously described
# see https://github.com/swistakm/pyimgui/blob/master/.appveyor.yml
- ps: cp "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\stdint.h" "C:\Users\appveyor\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC\include\stdint.h"
- ps: activate test

build_script:
- cmd: cd package
- cmd: C:\conda\envs\test\python.exe setup.py develop --no-deps --user 3>&1

test_script:
- cmd: cd ..\testsuite
- cmd: C:\conda\envs\test\python.exe setup.py develop --no-deps --user 3>&1
- cmd: cd MDAnalysisTests
- cmd: C:\conda\envs\test\Scripts\pytest.exe --cov=MDAnalysis --disable-pytest-warnings 3>&1
- cmd: codecov

after_build:
# cache cleanup
- C:\cygwin\bin\find "%LOCALAPPDATA%\pip" -type f -mtime +360 -delete
- C:\cygwin\bin\find "%LOCALAPPDATA%\pip" -type f -size +10M -delete
- C:\cygwin\bin\find "%LOCALAPPDATA%\pip" -empty -delete
# Show size of cache
- C:\cygwin\bin\du -hs "%LOCALAPPDATA%\pip\Cache"
2 changes: 2 additions & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
service_name: travis-pro
repo_token: wTp3SXSqCNiZPb5xMojbKrADQXVgbrQFT
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Thanks for contributing to MDAnalysis!

If you've found a defect with MDAnalysis we'd love to know so we can fix it. Please follow the Issue template so we can quickly diagnose the problem, in particular the piece of code that causes the problem.

If your issue isn't a defect with the code and instead you require help using MDAnalysis, drop by the [discussion board](http://help.mdanalysis.org).
If your issue isn't a defect with the code and instead you require help using MDAnalysis, drop by the [discussion board](https://groups.google.com/forum/#!forum/mdnalysis-discussion).

#### Contributing code

If you're contributing code, please check out the [Style guide](https://github.com/MDAnalysis/mdanalysis/wiki/Style-Guide).

MDAnalysis devs are most easily reached through the [development board](http://developers.mdanalysis.org).
MDAnalysis devs are most easily reached through the [development board](https://groups.google.com/forum/#!forum/mdnalysis-devel).
29 changes: 29 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
<!--

If you have a QUESTION such as

- how to use MDAnalysis in general
- how to accomplish something specific,
- what output means
- ... or similar questions related to USING MDAnalysis

then please *ask this question on the user mailing list*

https://groups.google.com/forum/#!forum/mdnalysis-discussion

The issue tracker is meant for DEFECTS ("BUGS"), new FEATURES, and
decisions on the API. In order to keep the volume of work on the issue
tracker manageable for our volunteer developers, we will IMMEDIATELY
CLOSE ISSUES THAT ARE BETTER ANSWERED ON THE USER MAILINGLIST.

We really appreciate you as a user getting in touch with us --- no
matter what you want to discuss. But we need your help keeping the
amount of work manageable so please use the mailing list for questions
and the issue tracker for code-related issues.

Thank you!

The MDAnalysis Development Team

-->
### Expected behaviour


Expand All @@ -17,3 +45,4 @@ u = mda.Universe(top, trj)

### Currently version of MDAnalysis:
(run `python -c "import MDAnalysis as mda; print(mda.__version__)"`)

35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
name: Bug report
about: Create a report to help us improve

---

**Expected behavior**

A clear and concise description of what you want to do and what you think should happen. (Code to reproduce the behavior can be added below).


**Actual behavior**

What happened instead. Add as much detail as you can. Include (copy and paste) stack traces and any output.


**Code to reproduce the behavior**

Show us how to reproduce the failiure. If you can, use trajectory files from the test data.

``` python
import MDAnalysis as mda
from MDAnalysis.tests.datafiles import PSF, DCD, GRO, PDB, TPR, XTC, TRR, PRMncdf, NCDF

u = mda.Universe(PSF, DCD)

....

```

**Currently version of MDAnalysis**

- Which version are you using? (run `python -c "import MDAnalysis as mda; print(mda.__version__)"`)
- Which version of Python (`python -V`)?
- Which operating system?
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
24 changes: 24 additions & 0 deletions .github/ISSUE_TEMPLATE/questions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
name: Questions
about: If you want to ask a question please use the mailing list!

---

If you have a **QUESTION** such as

- how to use MDAnalysis in general
- how to accomplish something specific,
- what output means
- ... or similar questions related to USING MDAnalysis

then please *ask this question on the user mailing list*

https://groups.google.com/forum/#!forum/mdnalysis-discussion

The issue tracker is meant for DEFECTS ("BUGS"), new FEATURES, and decisions on the API. In order to keep the volume of work on the issue tracker manageable for our volunteer developers, we will IMMEDIATELY CLOSE ISSUES THAT ARE BETTER ANSWERED ON THE USER MAILINGLIST.

We really appreciate you as a user getting in touch with us --- no matter what you want to discuss. But we need your help keeping the amount of work manageable so please use the mailing list for questions and the issue tracker for code-related issues.

Thank you!

The MDAnalysis Development Team
27 changes: 14 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,26 @@ env:
# Set default python version to avoid repetition later
- PYTHON_VERSION=3.5
- BUILD_DOCS=false
- COVERALLS=false
- CODECOV=false
- PYTEST_FLAGS="--disable-pytest-warnings --numprocesses 2 --durations=50"
- PYTEST_LIST="testsuite/MDAnalysisTests"
- MAIN_CMD="pytest ${PYTEST_LIST}"
- SETUP_CMD="${PYTEST_FLAGS}"
- BUILD_CMD="pip install -v package/ && pip install testsuite/"
- CONDA_MIN_DEPENDENCIES="mmtf-python mock six biopython networkx cython joblib matplotlib scipy griddataformats hypothesis gsd"
- CONDA_DEPENDENCIES="${CONDA_MIN_DEPENDENCIES} seaborn>=0.7.0 clustalw=2.1 netcdf4 scikit-learn coveralls"
- BUILD_CMD="pip install -v package/ && (cd testsuite/ && python setup.py build)"
- CONDA_MIN_DEPENDENCIES="mmtf-python mock six biopython networkx cython joblib matplotlib scipy griddataformats hypothesis gsd codecov"
- CONDA_DEPENDENCIES="${CONDA_MIN_DEPENDENCIES} seaborn>=0.7.0 clustalw=2.1 netcdf4 scikit-learn"
- CONDA_CHANNELS='biobuilds conda-forge'
- CONDA_CHANNEL_PRIORITY=True
- PIP_DEPENDENCIES="duecredit"
- NUMPY_VERSION=stable
- INSTALL_HOLE="true"

matrix:
# Run a coverage test
- COVERALLS="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
- PYTHON_VERSION=3.6
- PYTHON_VERSION=3.4
- PYTHON_VERSION=2.7
# Run a coverage test for most versions
- CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
- PYTHON_VERSION=3.6 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
- PYTHON_VERSION=3.4 NUMPY_VERSION=1.14 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
- PYTHON_VERSION=2.7 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
- NUMPY_VERSION=1.10.4
- NUMPY_VERSION=dev EVENT_TYPE="cron"

Expand All @@ -53,6 +53,7 @@ matrix:
BUILD_DOCS=true
BUILD_CMD="cd ${TRAVIS_BUILD_DIR}/package && python setup.py build_ext --inplace"
INSTALL_HOLE="false"
PIP_DEPENDENCIES="${PIP_DEPENDENCIES} sphinx-sitemap"

- env: NAME="Lint"
PYLINTRC="${TRAVIS_BUILD_DIR}/package/.pylintrc"
Expand All @@ -71,10 +72,10 @@ matrix:
- env: NAME='minimal'
CONDA_DEPENDENCIES=${CONDA_MIN_DEPENDENCIES}
INSTALL_HOLE="false"
CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"

allow_failures:
- env: NUMPY_VERSION=dev EVENT_TYPE="cron"
- env: PYTHON_VERSION=3.4
- os: osx

before_install:
# Workaround for Travis CI macOS bug (https://github.com/travis-ci/travis-ci/issues/6307)
Expand Down Expand Up @@ -106,8 +107,8 @@ script:

after_success:
- |
if [[ $COVERALLS == 'true' ]]; then \
coveralls; \
if [[ $CODECOV == 'true' ]]; then \
codecov; \
fi
# can't use test here since this leads to travis fails even though the build passes
- if [[ ${TRAVIS_PULL_REQUEST} == "false" ]] && [[ ${BUILD_DOCS} == "true" ]] && [[ ${TRAVIS_BRANCH} == ${GH_DOC_BRANCH} ]]; then
Expand Down
18 changes: 9 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,17 @@ to find uncovered code.
:target: https://www.mdanalysis.org/mdanalysis/

.. |build| image:: https://travis-ci.org/MDAnalysis/mdanalysis.svg?branch=develop
:alt: Build Status
:target: https://travis-ci.org/MDAnalysis/mdanalysis
:alt: Build Status
:target: https://travis-ci.org/MDAnalysis/mdanalysis

.. |cov| image:: https://coveralls.io/repos/MDAnalysis/mdanalysis/badge.svg?branch=develop
:alt: Coverage Status
:target: https://coveralls.io/r/MDAnalysis/mdanalysis?branch=develop
.. |cov| image:: https://codecov.io/gh/MDAnalysis/mdanalysis/branch/develop/graph/badge.svg
:alt: Coverage Status
:target: https://codecov.io/gh/MDAnalysis/mdanalysis

.. |anaconda| image:: https://anaconda.org/conda-forge/mdanalysis/badges/version.svg
:alt: Anaconda
:target: https://anaconda.org/conda-forge/mdanalysis
:alt: Anaconda
:target: https://anaconda.org/conda-forge/mdanalysis

.. |mybinder| image:: https://mybinder.org/badge.svg
:alt: My Binder
:target: https://mybinder.org/v2/gh/MDAnalysis/binder-notebook/master
:alt: My Binder
:target: https://mybinder.org/v2/gh/MDAnalysis/binder-notebook/master
18 changes: 13 additions & 5 deletions benchmarks/benchmarks/GRO.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,20 @@

import numpy as np
from MDAnalysis.coordinates.GRO import GROReader
from MDAnalysis.topology.GROParser import GROParser
from MDAnalysisTests.datafiles import GRO
import MDAnalysis as mda

class GROReadBench(object):

def time_read_GRO_file(self):
"""Benchmark reading of standard test
suite GRO file.
"""
def time_read_GRO_coordinates(self):
"""Benchmark reading of standard testsuite GRO file."""
GROReader(GRO)

def time_parse_GRO_file(self):
"""Time to create topology from GRO file"""
p = GROParser(GRO)
top = p.parse()

def time_create_GRO_universe(self):
"""Time to create MDA Universe of GRO"""
u = mda.Universe(GRO)
23 changes: 20 additions & 3 deletions benchmarks/benchmarks/ag_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import numpy as np

try:
from MDAnalysisTests.datafiles import GRO
from MDAnalysisTests.datafiles import GRO, TPR, XTC
from MDAnalysis.exceptions import NoDataError
except:
pass
Expand All @@ -24,8 +24,11 @@ def setup(self, num_atoms):
self.u = MDAnalysis.Universe(GRO)
self.ag = self.u.atoms[:num_atoms]
self.weights = np.ones(num_atoms)
self.vdwradii = {'NA':1.0,
'M':1.0}
self.vdwradii = {'H':1.0,
'C':1.0,
'N':1.0,
'O':1.0,
'DUMMY':1.0}
self.rot_matrix = np.ones((3,3))
self.trans = np.ones((4,4))

Expand Down Expand Up @@ -319,3 +322,17 @@ def time_bond(self, num_atoms):
Requires ag of size 2.
"""
self.ag[:2].bond


class FragmentFinding(object):
"""Test how quickly we find fragments (distinct molecules from bonds)"""
params = [(TPR, XTC), # single large fragment, many small solvents
(PSF, DCD), # single large fragment
(TRZ_psf, TRZ)] # 20ish polymer chains
param_names = ['universe']

def setup(self, universe):
self.u = MDAnalysis.Universe(*universe)

def test_find_fragments(self, universe):
frags = self.u.atoms.fragments
12 changes: 7 additions & 5 deletions benchmarks/benchmarks/analysis/rdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,23 @@ class SimpleRdfBench(object):
"""

params = ([20,75,200],
[[0,5], [0,15], [0,20]])
[[0,5], [0,15], [0,20]],
[1, 100, 1000, 10000])

param_names = ['nbins',
'range_val']
'range_val',
'natoms']

def setup(self, nbins, range_val):
def setup(self, nbins, range_val, natoms):

self.sel_str = 'name OW'

self.u = MDAnalysis.Universe(TPR, XTC)

try:
self.sel = self.u.select_atoms(self.sel_str)[:200]
self.sel = self.u.select_atoms(self.sel_str)[:natoms]
except AttributeError:
self.sel = self.u.selectAtoms(self.sel_str)[:200]
self.sel = self.u.selectAtoms(self.sel_str)[:natoms]

# do not include initialization of the
# InterRDF object in the benchmark itself
Expand Down
Loading