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

MAINT: warns for new multichannel default in denoise_{bilateral, nl_means} #2467

Merged
merged 1 commit into from
Jan 22, 2017

Conversation

stsievert
Copy link
Contributor

@stsievert stsievert commented Jan 20, 2017

Fixes #2465

Description

In #2461 (comment) we realized that denoise_wavelet should default to multichannel=False. We chose this primarily because multichannel=False works well for 2D images, is explicit and doesn't prioritize multichannel images (e.g., RGB images) over 2D images.

From this we decided that denoise_bilateral should default to multichannel=False to provide a consistent interface with the multichannel found in denoise_{wavelet, tv_chambolle}. denoise_nl_means also defaults to multichannel=True and though not discussed this is changed as well.

Checklist

  • denoise_bilateral
    • multichannel warning
    • example changed
  • denoise_nl_means
    • multichannel warning
    • examples changed

References

This closes #2465.

@sciunto
Copy link
Member

sciunto commented Jan 20, 2017

@stsievert You need to follow the procedure that we started to write here: #2422

Thx!

@sciunto sciunto added 🔧 type: Maintenance Refactoring and maintenance of internals 💪 Work in progress labels Jan 20, 2017
@sciunto sciunto added this to the 0.13 milestone Jan 20, 2017
Copy link
Member

@sciunto sciunto left a comment

Choose a reason for hiding this comment

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

One minor thing, and I think we are good :)

@@ -75,7 +75,10 @@ def denoise_bilateral(image, win_size=None, sigma_color=None, sigma_spatial=1,
>>> noisy = np.clip(noisy, 0, 1)
>>> denoised = denoise_bilateral(noisy, sigma_color=0.05, sigma_spatial=15)
"""
warn('denoise_bilateral will default to multichannel=False')
if multichannel is None:
warn('denoise_bilateral will default to multichannel=False')
Copy link
Member

Choose a reason for hiding this comment

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

Please, specify the version here (0.15).

@sciunto
Copy link
Member

sciunto commented Jan 21, 2017

At the end, if you can squash the commit, would be awesome ;)

@sciunto
Copy link
Member

sciunto commented Jan 21, 2017

You also need to update the test suite and specify the option everywhere.

@stsievert stsievert force-pushed the warn-bilateral branch 2 times, most recently from d2b4899 to 89abfff Compare January 21, 2017 17:45
@codecov-io
Copy link

codecov-io commented Jan 21, 2017

Current coverage is 90.71% (diff: 100%)

Merging #2467 into master will increase coverage by <.01%

@@             master      #2467   diff @@
==========================================
  Files           304        304          
  Lines         21500      21511    +11   
  Methods           0          0          
  Messages          0          0          
  Branches       1851       1853     +2   
==========================================
+ Hits          19502      19513    +11   
  Misses         1658       1658          
  Partials        340        340          

Powered by Codecov. Last update 5273a51...d2e5761

@stsievert
Copy link
Contributor Author

stsievert commented Jan 21, 2017

Rebased and (I believe) ready to merge.

@sciunto
Copy link
Member

sciunto commented Jan 22, 2017

@scikit-image/core We need a second review here. It's easy :)

@jni jni merged commit 8ca443d into scikit-image:master Jan 22, 2017
@jni
Copy link
Member

jni commented Jan 22, 2017

Thanks @stsievert! and @sciunto, you were right, that was easy. =D

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🔧 type: Maintenance Refactoring and maintenance of internals
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Change API denoise_bilateral, multichannel=False by default.
5 participants