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
Fix bug in m2rotaxis #1171
Fix bug in m2rotaxis #1171
Conversation
…bit of tests, and added tests for m2rotaxis
Can I merge #494 from @bertrand-caron first? Note there are some minor style issues to address,
|
Bio/PDB/Vector.py
Outdated
@@ -285,11 +305,20 @@ def normsq(self): | |||
return abs(sum(self._ar * self._ar)) | |||
|
|||
def normalize(self): | |||
"""Normalize the Vector.""" | |||
""" | |||
Normalize the Vector object. |
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.
Please put the one-line docstring summary on the same line as the opening triple quote, as per examples in PEP257 https://www.python.org/dev/peps/pep-0257/#multi-line-docstrings
@peterjc Yes, you can merge his first, but there will be a minor conflict that needs to be resolved in the beginning of Thanks for pointers on style guide. Ill go through it at some point today. |
Codecov Report
@@ Coverage Diff @@
## master #1171 +/- ##
==========================================
+ Coverage 79.72% 79.75% +0.02%
==========================================
Files 323 323
Lines 51452 51454 +2
==========================================
+ Hits 41020 41035 +15
+ Misses 10432 10419 -13
Continue to review full report at Codecov.
|
OK, I manually applied #494 - the merge conflict was due to a minor docstring change. Do you want to rebase this branch against the new master, or should I do this? |
It'd be great if you could. I haven't rebased before, and looking it up indicates there are enough steps that I could mess something up ;) Travis fails because I should have run |
Sorry - this is a new style issue, TravisCI checks for this were enabled only earlier today:
See 73896e4 - long lines might be an acceptable solution if you can't see how to break the long line nicely. |
Haha. The wonders of trying to commit to an active project. I made them single line. |
Fixes bug in m2rotaxis if rotation axis corresponds to 0 or 180 deg angle Fixed bug where refmat alters the state of input-vectors Split vector test into separate tests for rotmat and refmat, and added more tests. Squashed commit of pull request #1171.
See preceeding commit from pull request #1171.
I've manually applied this to the master branch, and included you in the acknowledgements. Thank you. Apologies if I already asked, but are you happy to dual licence your contributions under both the Biopython License Agreement AND the BSD 3-Clause License? See #898. |
You didn't ask, but I'm happy to appear as a contributor and I agree to the licenses. |
Thank you |
Fixes bug in m2rotaxis if rotation axis corresponds to 0 or 180 deg angle Fixed bug where refmat alters the state of input-vectors Split vector test into separate tests for rotmat and refmat, and added more tests. Squashed commit of pull request biopython#1171.
See preceeding commit from pull request biopython#1171.
Original author Thomas Hamelryck (when the file was called Bio/PDB/Vector.py) and all the contributors since as tracked with version control have agreed: - Adhemar Zerlotini (@azneto) biopython#1412 (comment) - Bertrand Caron (@bertrand-caron) biopython#494 (comment) - Brian Osborne (@bosborne) biopython#898 (comment) - Christian Brueffer (@cbrueffer) biopython#898 (comment) - Brad Chapman (@chapmanb) http://mailman.open-bio.org/pipermail/biopython-dev/2013-July/019903.html - Connor McCoy (@cmccoy) biopython#898 (comment) - Eric Talevich (@etal) biopython#898 (comment) - Francesco Gastaldello (@Gasta88) biopython#1063 - Hom (@platinhom) biopython#1920 - Joe Greener (@jgreener64) biopython#1393 - Michiel de Hoon (@mdehoon) biopython#898 (comment) - @morrme biopython#1172 (comment) - Peter Cock (@peterjc) biopython#898 (comment) - Ralf Stephan (@rwst) biopython#1900 - Rasmus Fonseca (@fonseca.rasmus) biopython#1171 (comment) - Sergei Lebedev (@superbobry) biopython#898 (comment) - Sergio Valqui (@svalqui) biopython#1749 - Thomas Hamelryck (CVS username nisse) https://mailman.open-bio.org/pipermail/biopython/2018-September/016546.html
Original author Thomas Hamelryck (when the file was called Bio/PDB/Vector.py) and all the contributors since as tracked with version control have agreed: - Adhemar Zerlotini (@azneto) #1412 (comment) - Bertrand Caron (@bertrand-caron) #494 (comment) - Brian Osborne (@bosborne) #898 (comment) - Christian Brueffer (@cbrueffer) #898 (comment) - Brad Chapman (@chapmanb) http://mailman.open-bio.org/pipermail/biopython-dev/2013-July/019903.html - Connor McCoy (@cmccoy) #898 (comment) - Eric Talevich (@etal) #898 (comment) - Francesco Gastaldello (@Gasta88) #1063 - Hom (@platinhom) #1920 - Joe Greener (@jgreener64) #1393 - Michiel de Hoon (@mdehoon) #898 (comment) - @morrme #1172 (comment) - Peter Cock (@peterjc) #898 (comment) - Ralf Stephan (@rwst) #1900 - Rasmus Fonseca (@fonseca.rasmus) #1171 (comment) - Sergei Lebedev (@superbobry) #898 (comment) - Sergio Valqui (@svalqui) #1749 - Thomas Hamelryck (CVS username nisse) https://mailman.open-bio.org/pipermail/biopython/2018-September/016546.html
Original authors Thomas Hamelryck and Eric Talevich (for the unittest conversion), and the contributors as tracked with version control have agreed: - Andrew Guy (@andrewguy) biopython#2212 (comment) - Ben Reynwar (@benreynwar) biopython#898 (comment) - Bernhard C. Thiel (@Bernhard10) biopython#968 - Carlos Pena (@carlosp420) biopython#898 (comment) - Chris Rands (@chris-rands) biopython#1301 - Christian Brueffer (@cbrueffer) biopython#898 (comment) - Eric Talevich (@etal) biopython#898 (comment) - Francesco Gastaldello (@Gasta88) biopython#1063 - Gokcen Eraslan (@gokceneraslan) biopython#898 (comment) - Jack Twilley (@mathuin) biopython#1049 (comment) - Jeroen Van Goey (@BioGeek) biopython#898 (comment) - Joe Greener (@jgreener64) biopython#1393 - Joerg Schaarschmidt (@schaarj) biopython#1567 - João Rodrigues (@JoaoRodrigues) biopython#898 (comment) - Kian Ho (@kianho) biopython#898 (comment) - Kristian Davidsen (@krdav) biopython#898 (comment) - Kristian Rother (@krother) biopython#898 (comment) - Lenna Peterson (@lennax) biopython#898 (comment) - Markus Piotrowski (@MarkusPiotrowski) biopython#898 (comment) - Milind Luthra (@milindl) biopython#1020 - Nick Negretti (@nimne) biopython#1768 (comment) - Peter Cock (@peterjc) biopython#898 (comment) - Rasmus Fonseca (@RasmusFonseca) biopython#1171 (comment) - Siong Kong (@siongkong) biopython#1516 - Stefans Mezulis (@StefansM) biopython#1445 - Thomas Hamelryck (CVS username nisse) https://mailman.open-bio.org/pipermail/biopython/2018-September/016546.html
Original authors Thomas Hamelryck and Eric Talevich (for the unittest conversion), and the contributors as tracked with version control have agreed: - Andrew Guy (@andrewguy) #2212 (comment) - Ben Reynwar (@benreynwar) #898 (comment) - Bernhard C. Thiel (@Bernhard10) #968 - Carlos Pena (@carlosp420) #898 (comment) - Chris Rands (@chris-rands) #1301 - Christian Brueffer (@cbrueffer) #898 (comment) - Eric Talevich (@etal) #898 (comment) - Francesco Gastaldello (@Gasta88) #1063 - Gokcen Eraslan (@gokceneraslan) #898 (comment) - Jack Twilley (@mathuin) #1049 (comment) - Jeroen Van Goey (@BioGeek) #898 (comment) - Joe Greener (@jgreener64) #1393 - Joerg Schaarschmidt (@schaarj) #1567 - João Rodrigues (@JoaoRodrigues) #898 (comment) - Kian Ho (@kianho) #898 (comment) - Kristian Davidsen (@krdav) #898 (comment) - Kristian Rother (@krother) #898 (comment) - Lenna Peterson (@lennax) #898 (comment) - Markus Piotrowski (@MarkusPiotrowski) #898 (comment) - Milind Luthra (@milindl) #1020 - Nick Negretti (@nimne) #1768 (comment) - Peter Cock (@peterjc) #898 (comment) - Rasmus Fonseca (@RasmusFonseca) #1171 (comment) - Siong Kong (@siongkong) #1516 - Stefans Mezulis (@StefansM) #1445 - Thomas Hamelryck (CVS username nisse) https://mailman.open-bio.org/pipermail/biopython/2018-September/016546.html
Takes 180deg rotation into account and added some documentation and tests.