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

Fix salt and pepper #2328

Merged
merged 2 commits into from
Feb 2, 2025
Merged

Fix salt and pepper #2328

merged 2 commits into from
Feb 2, 2025

Conversation

ternaus
Copy link
Collaborator

@ternaus ternaus commented Feb 2, 2025

Summary by Sourcery

Tests:

  • Add tests for SaltAndPepper transform to verify correct application and expected behavior with different image types (uint8, float32, single-channel).

Copy link
Contributor

sourcery-ai bot commented Feb 2, 2025

Reviewer's Guide by Sourcery

This pull request introduces a fix to the SaltAndPepper augmentation, addressing issues with incorrect noise application and ensuring proper handling of different image types. The changes include modifications to the mask generation logic and the application of noise to the image.

Sequence diagram for improved Salt and Pepper noise application

sequenceDiagram
    participant Transform as SaltAndPepper Transform
    participant Params as Parameter Generation
    participant Noise as Noise Application
    participant Image as Image Data

    Transform->>Image: Get image dimensions
    Image-->>Transform: Return height, width
    Transform->>Params: Generate noise parameters
    Params-->>Transform: Return total_amount and salt_ratio
    Transform->>Noise: Generate noise positions
    Noise->>Noise: Create salt and pepper masks
    Noise-->>Transform: Return masks
    Transform->>Image: Apply salt and pepper noise
    Note over Image: Handle multi-channel images
    Image-->>Transform: Return modified image
Loading

Flow diagram for Salt and Pepper noise generation

flowchart TD
    A[Get image dimensions] --> B[Calculate area]
    B --> C[Generate noise parameters]
    C --> D[Calculate number of pixels]
    D --> E[Generate noise positions]
    E --> F[Create salt mask]
    E --> G[Create pepper mask]
    F & G --> H[Reshape masks to 2D]
    H --> I[Apply masks to image]
    I --> J{Is image 3D?}
    J -->|Yes| K[Expand masks to match channels]
    J -->|No| L[Apply directly]
    K & L --> M[Return modified image]
Loading

File-Level Changes

Change Details Files
Fixed mask generation for salt and pepper noise.
  • Corrected the calculation of image dimensions to use the first two dimensions of the image shape.
  • Modified the generation of random indices to use the total area of the image instead of the product of height and width.
  • Reshaped the masks to 2D after generating the flat indices.
albumentations/augmentations/transforms.py
Ensured correct application of salt and pepper noise to the image.
  • Added a channel dimension to the masks if the image is 3D before applying the noise.
albumentations/augmentations/functional.py
Added comprehensive tests for the SaltAndPepper augmentation.
  • Added a test case for uint8 images to verify the correct number of noisy pixels and the salt vs pepper ratio.
  • Added a test case for float32 images to ensure salt pixels are 1.0 and pepper pixels are 0.0.
  • Added a test case for grayscale images to verify the shape is preserved and the noise values are correct.
tests/test_augmentations.py

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @ternaus - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟡 General issues: 1 issue found
  • 🟢 Security: all looks good
  • 🟡 Testing: 1 issue found
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

albumentations/augmentations/functional.py Show resolved Hide resolved
tests/test_augmentations.py Show resolved Hide resolved
@ternaus ternaus merged commit 80c58e1 into main Feb 2, 2025
14 checks passed
@ternaus ternaus deleted the fix_salt_and_pepper branch February 2, 2025 01:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant