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

Fixed Pep8 utils tracking testing denoise #949

Closed
wants to merge 32 commits into
base: master
from

Conversation

Projects
None yet
2 participants
@manu-tej
Contributor

manu-tej commented Mar 1, 2016

@arokem continuation of PR #939
Issued fixed: #875 #885 #887 #889

manu-tej added some commits Feb 23, 2016

Merge branch 'master' of https://github.com/manu-tej/dipy into pep8_u…
…tils_tracking_testing

Conflicts:
	dipy/denoise/tests/test_noise_estimate.py

123

@manu-tej manu-tej changed the title from Fixed Pep8 utils tracking testing to Fixed Pep8 utils tracking testing denoise Mar 1, 2016

assert_array_almost_equal(sigma,
(0.10286889997472792 /
np.sqrt(0.42920367320510366)))
>>>>>>> ce3767d0d5cb3776e0d4dddf0b09ca087a3cb66d

This comment has been minimized.

@arokem

arokem Mar 1, 2016

Member

These conflict markers are going to cause trouble.

@arokem

This comment has been minimized.

Member

arokem commented Mar 1, 2016

For simplicity's sake, I propose closing this one and doing one pull request per file.

@manu-tej manu-tej closed this Mar 1, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment