Update comparisons

[aaronspring]

Description

• added unittests for all PM comparison (will be useful for later refactoring or speedup)
• changed the way _m2e is calculated, now leaves out the reference member from ensemble mean

Type of change

Please delete options that are not relevant.

• Bug fix: before didnt leave out the reference member from ensemble mean

How Has This Been Tested?

• unittests

Checklist (while developing):

• I have added docstrings to all new functions.
• I have commented my code, particularly in hard-to-understand areas
• Tests added for pytest, if necessary.

Pre-Merge Checklist (final steps):

• I have rebased onto master or develop (wherever I am merging) and dealt with any conflictions.
• I have squashed commits to a reasonable amount, and force-pushed the squashed commits.
• All notebooks run with this branch installed. (please post a screenshot of treon compiling successfully)
• pytest runs without breaking.

Discussion

Add any points to discuss in the PR thread. Issues with the code? Suggestions needed? Philosophy changes to the package?

References

Please add any references to manuscripts, textbooks, etc.

[bradyrx]

@aaronspring, Since these are minor edits and all builds pass (thanks Travis for testing treon and pytest!) this should be good. Nothing sticks out as being problematic.

However, this is a good opportunity for you to practice rebasing from command line since there shouldn't be any conflictions. It's helpful to clean up commits before merging so the messages are more clear, etc.

My workflow:

git checkout master
git pull master --rebase
git checkout update_comparisons
git rebase master --interactive

From here you shouldn't have to deal with any conflictions, but can squash your commits. You'll see the guide on the bottom of the vim screen, but this could be squashed into something like two commits for instance. You just modify the "pick" before the commit to what you want.

• "(e)dit" if you want a clearer commit message
• "(s)quash" if you want to just push that commit message into the last one
• "(f)ixup" to get rid of the message completely
• "(p)ick" to keep the commit as is.

What took me forever to figure out is that once you finish this process, you have to do git push -f origin update_comparisons to force-push the updated commits here so they are reflected.

I'll merge once that's done!

[bradyrx]

Just tag me here when that's done so I get the email.

[aaronspring]

I touched notebooks, then deleted them, ... next time.

cant I just use the green merge pull request bottom and squash there with the dropdown?

[bradyrx]

Totally, if there's a squash option there. Didn't realize you could edit commits tehre.

[bradyrx]

Ah I see now the "squash and merge" option.

[bradyrx]

@aaronspring, thanks! I'm excited to talk about the "v1 release" goals and project board next week.