Skip to content

Commit 34640aa

Browse files
stemannstemann
committed
Elaborated on Dummies methods
1 parent 4c22c75 commit 34640aa

11 files changed

+314
-24
lines changed

‎src/Dummies.jl

+136-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,142 @@
11
module Dummies
22

3+
using GeometryBasics
34
using ..ImageAnnotations
45

5-
create_label(::Type{Int}) = 2
6-
create_label(::Type{Float64}) = 0.5
7-
create_label(::Type{String}) = "aeroplane"
6+
"Excerpt of the COCO classes."
7+
create_classes_1(::Type{String}) = ["person", "bicycle", "car"]
8+
create_classes_1(::Type{Label{String}}) = [Label(l) for l in create_classes_1(String)]
9+
create_classes_1(::Type{Int}) = Int.(1:length(create_classes_1(String)))
10+
create_classes_1(::Type{Float32}) = Float32.(create_classes_1(Int))
11+
create_classes_1(::Type{Float64}) = Float64.(create_classes_1(Int))
12+
create_classes_1() = create_classes_1(String)
13+
14+
for L in [Int, Float64, Float32]
15+
@eval create_label_1(::Type{$L}) = $L(1)
16+
@eval create_label_2(::Type{$L}) = $L(2)
17+
@eval create_label_3(::Type{$L}) = $L(3)
18+
end
19+
for L in [String, Label{String}]
20+
@eval create_label_1(::Type{$L}) = $L(create_classes_1()[1])
21+
@eval create_label_2(::Type{$L}) = $L(create_classes_1()[2])
22+
@eval create_label_3(::Type{$L}) = $L(create_classes_1()[3])
23+
end
24+
25+
for L in [Int, Float64, Float32, String, Label{String}]
26+
@eval create_image_annotation_1(::Type{$L}) = ImageAnnotation(create_label_1($L))
27+
@eval create_image_annotation_2(::Type{$L}) = ImageAnnotation(create_label_2($L))
28+
@eval create_image_annotation_3(::Type{$L}) = ImageAnnotation(create_label_3($L); confidence = 0.6f0)
29+
30+
@eval function create_annotated_image_1(::Type{$L})
31+
return AnnotatedImage(
32+
create_image_annotation_1($L); image_file_path = joinpath("images", "image1.jpeg"), image_height = 9, image_width = 16
33+
)
34+
end
35+
@eval function create_annotated_image_2(::Type{$L})
36+
return AnnotatedImage(
37+
sort([create_image_annotation_1($L), create_image_annotation_2($L)]);
38+
image_file_path = joinpath("images", "image2.jpeg"),
39+
image_height = 9,
40+
image_width = 16,
41+
)
42+
end
43+
44+
@eval create_image_annotation_dataset_1(::Type{$L}) = ImageAnnotationDataSet(create_classes_1($L), [create_annotated_image_1($L)])
45+
@eval create_image_annotation_dataset_2(::Type{$L}) = ImageAnnotationDataSet(create_classes_1($L), [create_annotated_image_2($L)])
46+
47+
for T in [Float64, Float32]
48+
@eval create_bounding_box_annotation_1(::Type{$L}, ::Type{$T}) =
49+
BoundingBoxAnnotation(Point2{$T}($T(0), $T(0)), $T(1), $T(1), create_label_1($L))
50+
@eval create_bounding_box_annotation_2(::Type{$L}, ::Type{$T}) =
51+
BoundingBoxAnnotation(Point2{$T}($T(0), $T(1)), $T(2), $T(3), create_label_2($L))
52+
@eval create_bounding_box_annotation_3(::Type{$L}, ::Type{$T}) =
53+
BoundingBoxAnnotation(Point2{$T}($T(0), $T(1)), $T(2), $T(3), create_label_3($L); confidence = 0.6f0)
54+
55+
@eval create_oriented_bounding_box_annotation_1(::Type{$L}, ::Type{$T}) =
56+
OrientedBoundingBoxAnnotation(Point2{$T}($T(0), $T(0)), $T(1), $T(1), $T(0), create_label_1($L))
57+
@eval create_oriented_bounding_box_annotation_2(::Type{$L}, ::Type{$T}) =
58+
OrientedBoundingBoxAnnotation(Point2{$T}($T(0), $T(1)), $T(2), $T(3), $T(pi / 2), create_label_2($L))
59+
@eval create_oriented_bounding_box_annotation_3(::Type{$L}, ::Type{$T}) =
60+
OrientedBoundingBoxAnnotation(Point2{$T}($T(0), $T(1)), $T(2), $T(3), $T(pi / 2), create_label_3($L); confidence = 0.6f0)
61+
62+
@eval create_polygon_annotation_1(::Type{$L}, ::Type{$T}) =
63+
PolygonAnnotation([Point2{$T}($T(0), $T(0)), Point2{$T}($T(1), $T(0)), Point2{$T}($T(1), $T(1))], create_label_1($L))
64+
@eval create_polygon_annotation_2(::Type{$L}, ::Type{$T}) =
65+
PolygonAnnotation([Point2{$T}($T(0), $T(1)), Point2{$T}($T(2), $T(3)), Point2{$T}($T(4), $T(5))], create_label_2($L))
66+
@eval create_polygon_annotation_3(::Type{$L}, ::Type{$T}) = PolygonAnnotation(
67+
[Point2{$T}($T(0), $T(1)), Point2{$T}($T(2), $T(3)), Point2{$T}($T(4), $T(5))], create_label_3($L); confidence = 0.6f0
68+
)
69+
70+
@eval function create_annotated_image_3(::Type{$L}, ::Type{$T})
71+
return AnnotatedImage(
72+
sort([
73+
create_image_annotation_1($L),
74+
create_image_annotation_2($L),
75+
create_bounding_box_annotation_1($L, $T),
76+
create_bounding_box_annotation_2($L, $T),
77+
create_oriented_bounding_box_annotation_1($L, $T),
78+
create_oriented_bounding_box_annotation_2($L, $T),
79+
create_polygon_annotation_1($L, $T),
80+
create_polygon_annotation_2($L, $T),
81+
]);
82+
image_file_path = joinpath("images", "image3.jpeg"),
83+
image_height = 9,
84+
image_width = 16,
85+
)
86+
end
87+
@eval function create_annotated_image_4(::Type{$L}, ::Type{$T})
88+
return AnnotatedImage(
89+
sort([
90+
create_image_annotation_3($L),
91+
create_bounding_box_annotation_3($L, $T),
92+
create_oriented_bounding_box_annotation_3($L, $T),
93+
create_polygon_annotation_3($L, $T),
94+
]);
95+
image_file_path = joinpath("images", "image4.jpeg"),
96+
image_height = 9,
97+
image_width = 16,
98+
)
99+
end
100+
101+
@eval function create_image_annotation_dataset_3(::Type{$L}, ::Type{$T})
102+
return ImageAnnotationDataSet(create_classes_1($L), [create_annotated_image_3($L, $T)])
103+
end
104+
@eval function create_image_annotation_dataset_4(::Type{$L}, ::Type{$T})
105+
return ImageAnnotationDataSet(create_classes_1($L), [create_annotated_image_4($L, $T)])
106+
end
107+
end
108+
end
109+
110+
create_label_1() = create_label_1(String)
111+
create_label_2() = create_label_2(String)
112+
create_label_3() = create_label_3(String)
113+
114+
create_image_annotation_1() = create_image_annotation_1(String)
115+
create_image_annotation_2() = create_image_annotation_2(String)
116+
create_image_annotation_3() = create_image_annotation_3(String)
117+
118+
create_bounding_box_annotation_1() = create_bounding_box_annotation_1(String, Float64)
119+
create_bounding_box_annotation_2() = create_bounding_box_annotation_2(String, Float64)
120+
create_bounding_box_annotation_3() = create_bounding_box_annotation_3(String, Float64)
121+
122+
create_oriented_bounding_box_annotation_1() = create_oriented_bounding_box_annotation_1(String, Float64)
123+
create_oriented_bounding_box_annotation_2() = create_oriented_bounding_box_annotation_2(String, Float64)
124+
create_oriented_bounding_box_annotation_3() = create_oriented_bounding_box_annotation_3(String, Float64)
125+
126+
create_polygon_annotation_1() = create_polygon_annotation_1(String, Float64)
127+
create_polygon_annotation_2() = create_polygon_annotation_2(String, Float64)
128+
create_polygon_annotation_3() = create_polygon_annotation_3(String, Float64)
129+
130+
create_annotated_image_0() = AnnotatedImage(; image_file_path = joinpath("images", "image0.jpeg"), image_height = 9, image_width = 16)
131+
create_annotated_image_1() = create_annotated_image_1(String)
132+
create_annotated_image_2() = create_annotated_image_2(String)
133+
create_annotated_image_3() = create_annotated_image_3(String, Float64)
134+
create_annotated_image_4() = create_annotated_image_4(String, Float64)
135+
136+
create_image_annotation_dataset_0() = ImageAnnotationDataSet(create_classes_1(), AnnotatedImage[])
137+
create_image_annotation_dataset_1() = create_image_annotation_dataset_1(String)
138+
create_image_annotation_dataset_2() = create_image_annotation_dataset_2(String)
139+
create_image_annotation_dataset_3() = create_image_annotation_dataset_3(String, Float64)
140+
create_image_annotation_dataset_4() = create_image_annotation_dataset_4(String, Float64)
8141

9142
end

‎test/annotated_image_tests.jl

+6-3
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@ using Test
77
@test get_annotations(empty_annotated_image) == []
88
end
99
@testset "Construction with single annotation" begin
10-
annotated_image = AnnotatedImage(ImageAnnotation(1))
10+
annotation = ImageAnnotations.Dummies.create_image_annotation_1()
11+
annotated_image = AnnotatedImage(annotation)
1112
@test length(get_annotations(annotated_image)) == 1
1213
end
1314
@testset "Construction with multiple annotations" begin
14-
annotated_image = AnnotatedImage([ImageAnnotation(1), ImageAnnotation(2)])
15+
annotations = [ImageAnnotations.Dummies.create_image_annotation_1(), ImageAnnotations.Dummies.create_image_annotation_2()]
16+
annotated_image = AnnotatedImage(annotations)
1517
@test length(get_annotations(annotated_image)) == 2
1618
end
1719
@testset "Construction with a mix of annotation types" begin
18-
annotated_image = AnnotatedImage([ImageAnnotation(1), BoundingBoxAnnotation(Point2(0.0, 1.0), 2.0, 3.0, "class")])
20+
annotations = [ImageAnnotations.Dummies.create_image_annotation_1(), ImageAnnotations.Dummies.create_bounding_box_annotation_1()]
21+
annotated_image = AnnotatedImage(annotations)
1922
@test length(get_annotations(annotated_image)) == 2
2023
end
2124

‎test/bounding_box_annotation_tests.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ using Test
1111
annotator_name = "annotator"
1212
kwarg_combos = [NamedTuple(), (confidence = confidence,), (confidence = confidence, annotator_name = annotator_name)]
1313
for (L, T) in type_param_combos, TAnnotation in type_combos(L, T), TLabelArg in label_arg_combos(L), kwargs in kwarg_combos
14-
label = ImageAnnotations.Dummies.create_label(L)
14+
label = ImageAnnotations.Dummies.create_label_1(L)
1515
if TLabelArg == ImageAnnotation{L}
1616
label_args = (ImageAnnotation(label; kwargs...),)
1717
kwargs = NamedTuple()

‎test/concept_tests.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ using Test
1313
attributes = Dict{String, AbstractConceptAttribute}([a.name => a for a in kwargs.attributes])
1414
end
1515
@testset "$TConcept with type parameter $T and kwargs $kwargs" begin
16-
concept_value = ImageAnnotations.Dummies.create_label(T)
16+
concept_value = ImageAnnotations.Dummies.create_label_1(T)
1717
concept = TConcept(concept_value; kwargs...)
1818
@test concept.value == concept_value
1919
@test concept.attributes == attributes

‎test/data_set_tests.jl

+7-9
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ using Test
1818
@test length(data_set) == 0
1919
end
2020

21-
@testset "Simple VOC-like data set" begin
22-
label = "aeroplane"
23-
aeroplane_annotation_args = (annotator_name = "alice",)
24-
annotation1 = BoundingBoxAnnotation(Point2(0.0, 1.0), 2.0, 3.0, label; aeroplane_annotation_args...)
25-
annotation2 = BoundingBoxAnnotation(Point2(0.0, 1.0), 2.0, 4.0, label; aeroplane_annotation_args...)
26-
annotated_image1 = AnnotatedImage(BoundingBoxAnnotation{String, Float64}[]; image_file_path = "img1.jpeg")
27-
annotated_image2 = AnnotatedImage([annotation1]; image_file_path = "img2.jpeg")
28-
annotated_image3 = AnnotatedImage([annotation2]; image_file_path = "img3.jpeg")
29-
data_set = ImageAnnotationDataSet(["aeroplane"], [annotated_image1, annotated_image2, annotated_image3])
21+
@testset "Non-empty data set" begin
22+
annotated_image1 = ImageAnnotations.Dummies.create_annotated_image_1()
23+
annotated_image2 = ImageAnnotations.Dummies.create_annotated_image_2()
24+
annotated_image3 = ImageAnnotations.Dummies.create_annotated_image_3()
25+
data_set = ImageAnnotationDataSet(
26+
ImageAnnotations.Dummies.create_classes_1(), [annotated_image1, annotated_image2, annotated_image3]
27+
)
3028

3129
@test length(data_set) == 3
3230
@test data_set[1] == annotated_image1

0 commit comments

Comments
 (0)