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

add GenericImage and GenericRGBImage alias #80

Merged
merged 7 commits into from
May 15, 2019
Merged

add GenericImage and GenericRGBImage alias #80

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
810b470
add GenericImage and GenericRGBImage alias
johnnychen94 May 13, 2019
b00b0be
bump version
johnnychen94 May 13, 2019
00e0bec
remove unnecessary alias
johnnychen94 May 15, 2019
165e65e
remove Gray2dImage
johnnychen94 May 15, 2019
1a15fe6
change Pixel and NumberLike
johnnychen94 May 15, 2019
26ea238
change GenericGrayImage and GenericImage
johnnychen94 May 15, 2019
88c093c
remove redundant <: annotation
johnnychen94 May 15, 2019
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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "ImageCore"
uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534"
version = "0.8.2"
version = "0.8.3"

[deps]
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
Expand Down
11 changes: 4 additions & 7 deletions src/ImageCore.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,10 @@ const RRArray{To,From,N,M,P} = Base.ReshapedArray{To,N,Base.ReinterpretArray{To,
const RGArray = Union{Base.ReinterpretArray{<:AbstractGray,M,<:Number,P}, Base.ReinterpretArray{<:Number,M,<:AbstractGray,P}} where {M,P}

# delibrately not export these constants to enable extensibility for downstream packages
const NumberLike{T<:Number} = Union{T,AbstractGray{T}}
const RealLike{T<:Real} = NumberLike{T}
const FloatLike{T<:AbstractFloat} = RealLike{T}
const FractionalLike{T<:Union{FixedPoint, AbstractFloat}} = RealLike{T}
const GrayLike{T<:Union{Bool, FixedPoint, AbstractFloat}} = RealLike{T}
const GenericGrayImage{N, T<:GrayLike} = AbstractArray{<:GrayLike{T}, N}
const Gray2dImage{T<:GrayLike} = GenericGrayImage{2, T}
const NumberLike = Union{<:Number,<:AbstractGray}
timholy marked this conversation as resolved.
Show resolved Hide resolved
const Pixel = Union{<:Number,<:Colorant}
const GenericGrayImage{T<:NumberLike,N} = AbstractArray{T,N}
timholy marked this conversation as resolved.
Show resolved Hide resolved
const GenericImage{T<:Pixel,N} = AbstractArray{T,N}

export
## Types
Expand Down
167 changes: 97 additions & 70 deletions test/traits.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using ImageCore, Colors, FixedPointNumbers, ColorVectorSpace, MappedArrays, OffsetArrays
using Test
using ImageCore: NumberLike, RealLike, FloatLike, FractionalLike,
GrayLike, GenericGrayImage, Gray2dImage
using ImageCore: Pixel, NumberLike, GenericImage, GenericGrayImage

@testset "Image traits" begin
for (B, swap) in ((rand(UInt16(1):UInt16(20), 3, 5), false),
Expand Down Expand Up @@ -35,13 +34,19 @@ using ImageCore: NumberLike, RealLike, FloatLike, FractionalLike,
end
end

# delibrately written in a redundant way
@testset "*Like traits" begin
# delibrately written in a redundant way
@testset "NumberLike" begin
@test RealLike <: NumberLike
@test FloatLike <: NumberLike
@test FractionalLike <: NumberLike
@testset "Pixel" begin
@test NumberLike <: Pixel
@test Number <: Pixel
@test Gray <: Pixel
@test RGB <: Pixel

@test isa(oneunit(Gray), Pixel)
@test isa(RGB(1.0, 0.0, 0.0), Pixel)
end

@testset "NumberLike" begin
@test Number <: NumberLike
@test Real <: NumberLike
@test AbstractFloat <: NumberLike
Expand All @@ -56,78 +61,100 @@ end
@test isa(oneunit(Gray), NumberLike)
end

@testset "RealLike" begin
@test FloatLike <: RealLike
@test FractionalLike <: RealLike

@test Real <: RealLike
@test AbstractFloat <: RealLike
@test FixedPoint <: RealLike
@test Integer <: RealLike
@test Bool <: RealLike

@test Gray{<:AbstractFloat} <: RealLike
@test Gray{<:Bool} <: RealLike
@test Gray{<:FixedPoint} <: RealLike

@test isa(oneunit(Gray), RealLike)
end

@testset "FractionalLike" begin
@test AbstractFloat <: FractionalLike
@test FixedPoint <: FractionalLike
@testset "GenericImage" begin
@test GenericGrayImage <: GenericImage
for sz in [(3, 3), (3, 3, 3)]
@test isa(rand(Bool, sz), GenericImage)
@test isa(rand(N0f8, sz), GenericImage)
@test isa(rand(Float32, sz), GenericImage)

@test !(Gray <: FractionalLike)
@test Gray{<:AbstractFloat} <: FractionalLike
@test Gray{<:FixedPoint} <: FractionalLike
@test isa(rand(Gray, sz), GenericImage)
@test isa(rand(Gray{Bool}, sz), GenericImage)
@test isa(rand(Gray{N0f8}, sz), GenericImage)
@test isa(rand(Gray{Float32}, sz), GenericImage)

@test isa(oneunit(Gray), FractionalLike)
end
@test isa(rand(GrayA, sz), GenericImage)
@test isa(rand(GrayA{N0f8}, sz), GenericImage)
@test isa(rand(GrayA{Float32}, sz), GenericImage)

@testset "GrayLike" begin
@test AbstractFloat <: GrayLike
@test FixedPoint <: GrayLike
@test Bool <: GrayLike
@test isa(rand(RGB, sz), GenericImage)
@test isa(rand(RGB{N0f8}, sz), GenericImage)
@test isa(rand(RGB{Float32}, sz), GenericImage)

@test Gray <: GrayLike
@test Gray{<:AbstractFloat} <: GrayLike
@test Gray{<:FixedPoint} <: GrayLike
@test Gray{Bool} <: GrayLike
@test isa(rand(RGBA, sz), GenericImage)
@test isa(rand(RGBA{N0f8}, sz), GenericImage)
@test isa(rand(RGBA{Float32}, sz), GenericImage)

@test isa(oneunit(Gray), GrayLike)
@test isa(rand(Lab, sz), GenericImage)
@test isa(rand(Lab{Float32}, sz), GenericImage)
end
end

@testset "FloatLike" begin
@test AbstractFloat <: FloatLike

@test !(Gray <: FloatLike)
@test Gray{<:AbstractFloat} <: FloatLike

@test !isa(oneunit(Gray), FloatLike)
@testset "GrayImage" begin
for sz in [(3, 3), (3, 3, 3)]
@test isa(rand(Bool, sz), GenericGrayImage)
@test isa(rand(N0f8, sz), GenericGrayImage)
@test isa(rand(Float32, sz), GenericGrayImage)

@test isa(rand(Gray, sz), GenericGrayImage)
@test isa(rand(Gray{Bool}, sz), GenericGrayImage)
@test isa(rand(Gray{N0f8}, sz), GenericGrayImage)
@test isa(rand(Gray{Float32}, sz), GenericGrayImage)
end
end

@testset "GrayImage" begin
@test Gray2dImage{Float32} == GenericGrayImage{2, Float32}

sz = (3,3)
@test isa(rand(Bool, sz), Gray2dImage)
@test isa(rand(N0f8, sz), Gray2dImage)
@test isa(rand(Float32, sz), Gray2dImage)

@test isa(rand(Gray, sz), Gray2dImage)
@test isa(rand(Gray{Bool}, sz), Gray2dImage)
@test isa(rand(Gray{N0f8}, sz), Gray2dImage)
@test isa(rand(Gray{Float32}, sz), Gray2dImage)

foo(img::Gray2dImage) = "Generic"
foo(img::Gray2dImage{<:AbstractFloat}) = "AbstractFloat"
foo(img::Gray2dImage{<:FixedPoint}) = "FixedPoint"
@test foo(rand(Bool, sz)) == "Generic"
@test foo(rand(Gray{Bool}, sz)) == "Generic"
@test foo(rand(Gray{Float32}, sz)) == "AbstractFloat"
@test foo(rand(Float32, sz)) == "AbstractFloat"
@test foo(rand(Gray{N0f8}, sz)) == "FixedPoint"
@test foo(rand(N0f8, sz)) == "FixedPoint"
@testset "dispatch" begin
begin
whatis(::GenericImage) = "GenericImage"
whatis(::GenericGrayImage) = "GenericGrayImage"
whatis(::GenericImage{<:AbstractRGB}) = "GenericRGBImage"

whatis(::GenericImage{<:Pixel, 2}) = "Generic2dImage"
whatis(::GenericGrayImage{<:NumberLike, 2}) = "Gray2dImage"
whatis(::GenericImage{<:AbstractRGB, 2}) = "RGB2dImage"

@test whatis(rand(Lab, 2, 2, 2)) == "GenericImage"

@test whatis(rand(Lab, 2, 2)) == "Generic2dImage"

@test whatis(rand(2, 2, 2)) == "GenericGrayImage"
@test whatis(rand(N0f8, 2, 2, 2)) == "GenericGrayImage"
@test whatis(rand(Bool, 2, 2, 2)) == "GenericGrayImage"
@test whatis(rand(Float32, 2, 2, 2)) == "GenericGrayImage"
@test whatis(rand(Int64, 2, 2, 2)) == "GenericGrayImage"

@test whatis(rand(Gray, 2, 2, 2)) == "GenericGrayImage"
@test whatis(rand(Gray{N0f8}, 2, 2, 2)) == "GenericGrayImage"
@test whatis(rand(Gray{Bool}, 2, 2, 2)) == "GenericGrayImage"
@test whatis(rand(Gray{Float32}, 2, 2, 2)) == "GenericGrayImage"

@test whatis(rand(2, 2)) == "Gray2dImage"
@test whatis(rand(N0f8, 2, 2)) == "Gray2dImage"
@test whatis(rand(Bool, 2, 2)) == "Gray2dImage"
@test whatis(rand(Float32, 2, 2)) == "Gray2dImage"
@test whatis(rand(Int64, 2, 2)) == "Gray2dImage"

@test whatis(rand(Gray, 2, 2)) == "Gray2dImage"
@test whatis(rand(Gray{N0f8}, 2, 2)) == "Gray2dImage"
@test whatis(rand(Gray{Bool}, 2, 2)) == "Gray2dImage"
@test whatis(rand(Gray{Float32}, 2, 2)) == "Gray2dImage"

@test whatis(rand(RGB, 2, 2, 2)) == "GenericRGBImage"
@test whatis(rand(RGB{N0f8}, 2, 2, 2)) == "GenericRGBImage"
@test whatis(rand(RGB{Float32}, 2, 2, 2)) == "GenericRGBImage"

@test whatis(rand(BGR, 2, 2, 2)) == "GenericRGBImage"
@test whatis(rand(BGR{N0f8}, 2, 2, 2)) == "GenericRGBImage"
@test whatis(rand(BGR{Float32}, 2, 2, 2)) == "GenericRGBImage"

@test whatis(rand(RGB, 2, 2)) == "RGB2dImage"
@test whatis(rand(RGB{N0f8}, 2, 2)) == "RGB2dImage"
@test whatis(rand(RGB{Float32}, 2, 2)) == "RGB2dImage"

@test whatis(rand(BGR, 2, 2)) == "RGB2dImage"
@test whatis(rand(BGR{N0f8}, 2, 2)) == "RGB2dImage"
@test whatis(rand(BGR{Float32}, 2, 2)) == "RGB2dImage"
end
end
end

Expand Down