-
Notifications
You must be signed in to change notification settings - Fork 6
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
Requested changes to initial refactor #38
Conversation
Hi @lilyminium, could I have a review in this PR, please :) |
Thanks for the comments @fiona-naughton. Changes added. |
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.
Thanks for making this change! Could you please just remove repeated values like (0, 0) -- although to be honest the second 5x5 grid isn't necessary.
I added the 5x5 as suggested in previous PRs. If you are ok with it with different values excluding (0,0). @lilyminium Maybe inverted values? As in
I would prefer to keep it even if not necessary. |
I think those are just the same values in a different order, but sure, we can leave the grid in as-is so it's easier to modify for future tests :) |
This PR fixes #33.
Changes included:
pytest.mark.xfail
test of negative coordinates ingrid_map
.pytest.parametrize
.Test_mapper
changed by adding assertion of dummy coordinates.grid_map
using 6 unit cells in grid of 9 lipids as shown below:For grid with 9 lipid types:
Bead 0 mapped to [ 0 0 ], with Coordinates ( 0 , 0 )
Bead 1 mapped to [ 2 0 ], with Coordinates ( 1 , 0 )
Bead 2 mapped to [ 4 0 ], with Coordinates ( 2 , 0 )
Bead 3 mapped to [ 0 2 ], with Coordinates ( 0 , 1 )
Bead 4 mapped to [ 2 2 ], with Coordinates ( 1 , 1 )
Bead 5 mapped to [ 2 2 ], with Coordinates ( 1 , 1 )
Bead 6 mapped to [ 0 4 ], with Coordinates ( 0 , 2 )
Bead 7 mapped to [ 2 4 ], with Coordinates ( 1 , 2 )
Bead 8 mapped to [ 4 4 ], with Coordinates ( 2 , 2 )
and the equivalent to the grid of 25 lipids.
This PR may also fix:
#27 since function
def_all_beads
was deleted after replacingMDtraj
byMDAnalysis
.#28 since function
core_fast
was deleted after refactoring.#32 since function
def_all_beads
was deleted after refactoring and replaced by direct selection usingMDAnalysis
.and #16
Questions:
(possible minor change)
factor = 1
and then in lines 174 and 179, respectively.
assert grid_map(dummy_coord, 1) == dummy_coord
assert grid_map(dummy_coord, 2) == (dummy_coord[0]*2, dummy_coord[1]*2)