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.

Sign up for GitHub

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

Updated RandomSunFlare #2260

Merged
merged 1 commit into from
Jan 7, 2025
Merged

Updated RandomSunFlare #2260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 0 additions & 57 deletions albumentations/augmentations/transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,15 +1153,6 @@ class RandomSunFlare(ImageOnlyTransform):

class InitSchema(BaseTransformInitSchema):
flare_roi: tuple[float, float, float, float]
angle_lower: float | None = Field(ge=0, le=1)
angle_upper: float | None = Field(ge=0, le=1)

num_flare_circles_lower: int | None = Field(
ge=0,
)
num_flare_circles_upper: int | None = Field(
gt=0,
)
src_radius: int = Field(gt=1)
src_color: tuple[int, ...]

Expand Down Expand Up @@ -1192,59 +1183,11 @@ def validate_parameters(self) -> Self:
):
raise ValueError(f"Invalid flare_roi. Got: {self.flare_roi}")

if self.angle_lower is not None or self.angle_upper is not None:
if self.angle_lower is not None:
warn(
"`angle_lower` deprecated. Use `angle_range` as tuple (angle_lower, angle_upper) instead.",
DeprecationWarning,
stacklevel=2,
)
if self.angle_upper is not None:
warn(
"`angle_upper` deprecated. Use `angle_range` as tuple(angle_lower, angle_upper) instead.",
DeprecationWarning,
stacklevel=2,
)
lower = self.angle_lower if self.angle_lower is not None else self.angle_range[0]
upper = self.angle_upper if self.angle_upper is not None else self.angle_range[1]
self.angle_range = (lower, upper)

if self.num_flare_circles_lower is not None or self.num_flare_circles_upper is not None:
if self.num_flare_circles_lower is not None:
warn(
"`num_flare_circles_lower` deprecated. Use `num_flare_circles_range` as tuple"
" (num_flare_circles_lower, num_flare_circles_upper) instead.",
DeprecationWarning,
stacklevel=2,
)
if self.num_flare_circles_upper is not None:
warn(
"`num_flare_circles_upper` deprecated. Use `num_flare_circles_range` as tuple"
" (num_flare_circles_lower, num_flare_circles_upper) instead.",
DeprecationWarning,
stacklevel=2,
)
lower = (
self.num_flare_circles_lower
if self.num_flare_circles_lower is not None
else self.num_flare_circles_range[0]
)
upper = (
self.num_flare_circles_upper
if self.num_flare_circles_upper is not None
else self.num_flare_circles_range[1]
)
self.num_flare_circles_range = (lower, upper)

return self

def __init__(
self,
flare_roi: tuple[float, float, float, float] = (0, 0, 1, 0.5),
angle_lower: float | None = None,
angle_upper: float | None = None,
num_flare_circles_lower: int | None = None,
num_flare_circles_upper: int | None = None,
src_radius: int = 400,
src_color: tuple[int, ...] = (255, 255, 255),
angle_range: tuple[float, float] = (0, 1),
Expand Down
37 changes: 0 additions & 37 deletions tests/test_transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1770,43 +1770,6 @@ def test_gauss_noise(mean, image):
assert not (result["image"] >= image).all()


@pytest.mark.parametrize(
"params, expected",
[
# Test default initialization values
(
{},
{
"flare_roi": (0, 0, 1, 0.5),
"angle_range": (0, 1),
"num_flare_circles_range": (6, 10),
"src_radius": 400,
"src_color": (255, 255, 255),
},
),
# Test custom initialization values
({"flare_roi": (0.2, 0.3, 0.8, 0.9)}, {"flare_roi": (0.2, 0.3, 0.8, 0.9)}),
({"angle_range": (0.3, 0.7)}, {"angle_range": (0.3, 0.7)}),
({"angle_lower": 0.3, "angle_upper": 0.7}, {"angle_range": (0.3, 0.7)}),
({"num_flare_circles_range": (4, 8)}, {"num_flare_circles_range": (4, 8)}),
(
{"num_flare_circles_lower": 4, "num_flare_circles_upper": 8},
{"num_flare_circles_range": (4, 8)},
),
({"src_radius": 500}, {"src_radius": 500}),
({"src_color": (200, 200, 200)}, {"src_color": (200, 200, 200)}),
({"angle_lower": 0.2}, {"angle_range": (0.2, 1)}),
({"angle_upper": 0.8}, {"angle_range": (0, 0.8)}),
({"num_flare_circles_lower": 5}, {"num_flare_circles_range": (5, 10)}),
({"num_flare_circles_upper": 9}, {"num_flare_circles_range": (6, 9)}),
],
)
def test_random_sun_flare_initialization(params, expected):
img_flare = A.RandomSunFlare(**params)
for key, value in expected.items():
assert getattr(img_flare, key) == value, f"Failed on {key} with value {value}"


@pytest.mark.parametrize(
"params",
[
Expand Down
Loading