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

helanal cleanup #610

Merged
merged 6 commits into from
Jan 7, 2016
Merged

helanal cleanup #610

merged 6 commits into from
Jan 7, 2016

Conversation

orbeckst
Copy link
Member

@orbeckst orbeckst commented Jan 7, 2016

  • fixed broken helanal_trajectory() and helanal_main()
  • slightly better tests
  • minor code cleanups

@orbeckst orbeckst force-pushed the feature-helanal-tlc branch 2 times, most recently from 0b3a486 to 819f4f9 Compare January 7, 2016 08:01
@orbeckst orbeckst added this to the 0.13 milestone Jan 7, 2016
@orbeckst
Copy link
Member Author

orbeckst commented Jan 7, 2016

This is done (I am not addressing the QC issues because I actually do not want to add doc strings to test_something() tests as the doc string would replace the rather useful default output of nosetests -v).

@orbeckst
Copy link
Member Author

orbeckst commented Jan 7, 2016

Pending favorable reviews I'd like this to go into 0.13.0 (#600).


def vecnorm(a):
"""Return a/|a|"""
return a / veclength(a)


def vecangle(a, b):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mdamath.angle already covers nan issues, so this function can disappear (find and replace vecangle -> mdamath.angle)

@richardjgowers richardjgowers self-assigned this Jan 7, 2016
@richardjgowers
Copy link
Member

I think I'm just being pedantic, if you want to merge just go for it

@orbeckst
Copy link
Member Author

orbeckst commented Jan 7, 2016

Pedantic is good. Will fix.

Oliver Beckstein
email: orbeckst@gmail.com

Am Jan 7, 2016 um 4:17 schrieb Richard Gowers notifications@github.com:

I think I'm just being pedantic, if you want to merge just go for it


Reply to this email directly or view it on GitHub.

- helanal_trajectory() was broken: fixed by using np.mean for mean
- added simple regression test: compare helanal_bending_matrix.dat for alpha
  helix 8 in AdK in the test PSF/DCD (DIMS) trajectory
- cleaned up test_helanal.py
- @quantifiedcode suggested: Consider simplifying bounds checks
- removed import of psyco
- replaced a "if ... pass else" with "if not (...)"
- return data as dict (instead of just logging)
- fixed missing np.mean
- use lib.mdamath were possible
- added regression test
@orbeckst
Copy link
Member Author

orbeckst commented Jan 7, 2016

Addressed all your comments and rebased against develop. Good to go (assuming travis is happy).

@orbeckst
Copy link
Member Author

orbeckst commented Jan 7, 2016

@richardjgowers — all good.

richardjgowers added a commit that referenced this pull request Jan 7, 2016
@richardjgowers richardjgowers merged commit 0d6fbd8 into develop Jan 7, 2016
@richardjgowers richardjgowers deleted the feature-helanal-tlc branch January 7, 2016 20:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants