Added support for comparing AbstractImageAnnotations and Labels

.github/workflows/CI.yml

@@ -18,9 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.3'
           - '1.6'
-          - '1.9'
+          - '1'
         os:
           - ubuntu-latest
           - macOS-latest

.gitlab-ci.yml

@@ -17,7 +17,7 @@ test:
   stage: test
   parallel:
     matrix:
-      - CI_JULIA_VERSION: ["1.3", "1.6", "1.9"]
+      - CI_JULIA_VERSION: ["1.6", "1"]
   extends:
     - .julia.setup
     - .julia.test

src/ImageAnnotations.jl

@@ -23,6 +23,7 @@ export StaticObjectAnnotator
 include("label.jl")
 include("concept.jl")
 
+include("abstract_image_annotation.jl")
 include("image_annotation.jl")
 
 include("abstract_object_annotation.jl")

src/abstract_image_annotation.jl

@@ -0,0 +1,49 @@
+abstract type AbstractImageAnnotation{L} end
+
+function get_label end
+function get_confidence end
+function get_annotator_name end
+
+function Base.isless(a::T, b::U) where {T <: AbstractImageAnnotation, U <: AbstractImageAnnotation}
+    if Symbol(T) < Symbol(U)
+        return true
+    elseif Symbol(U) < Symbol(T)
+        return false
+    end
+    if get_label(a) !== get_label(b)
+        return get_label(a) < get_label(b)
+    end
+    if get_confidence(a) === nothing
+        if get_confidence(b) === nothing
+            if get_annotator_name(a) === nothing
+                return get_annotator_name(b) !== nothing
+            else
+                if get_annotator_name(b) === nothing
+                    return false
+                else
+                    return get_annotator_name(a) < get_annotator_name(b)
+                end
+            end
+        else
+            return true
+        end
+    else
+        if get_confidence(b) === nothing
+            return false
+        else
+            if get_confidence(a) !== get_confidence(b)
+                return get_confidence(a) < get_confidence(b)
+            else
+                if get_annotator_name(a) === nothing
+                    return get_annotator_name(b) !== nothing
+                else
+                    if get_annotator_name(b) === nothing
+                        return false
+                    else
+                        return get_annotator_name(a) < get_annotator_name(b)
+                    end
+                end
+            end
+        end
+    end
+end

src/image_annotation.jl

@@ -1,5 +1,3 @@
-abstract type AbstractImageAnnotation{L} end
-
 mutable struct ImageAnnotation{L} <: AbstractImageAnnotation{L}
     label::L
     confidence::Union{Float32, Nothing}
@@ -18,45 +16,6 @@ function Base.:(==)(a::ImageAnnotation, b::ImageAnnotation)
     return a.label == b.label && a.confidence == b.confidence && a.annotator_name == b.annotator_name
 end
 
-function Base.isless(a::ImageAnnotation, b::ImageAnnotation)
-    if a.label !== b.label
-        return a.label < b.label
-    end
-    if a.confidence === nothing
-        if b.confidence === nothing
-            if a.annotator_name === nothing
-                return b.annotator_name !== nothing
-            else
-                if b.annotator_name === nothing
-                    return false
-                else
-                    return a.annotator_name < b.annotator_name
-                end
-            end
-        else
-            return true
-        end
-    else
-        if b.confidence === nothing
-            return false
-        else
-            if a.confidence !== b.confidence
-                return a.confidence < b.confidence
-            else
-                if a.annotator_name === nothing
-                    return b.annotator_name !== nothing
-                else
-                    if b.annotator_name === nothing
-                        return false
-                    else
-                        return a.annotator_name < b.annotator_name
-                    end
-                end
-            end
-        end
-    end
-end
-
 get_label(annotation::ImageAnnotation) = annotation.label
 get_confidence(annotation::ImageAnnotation) = annotation.confidence
 get_annotator_name(annotation::ImageAnnotation) = annotation.annotator_name

src/label.jl

@@ -12,3 +12,11 @@ end
 Label(value::T) where {T} = Label{T}(value)
 
 Base.:(==)(a::Label, b::Label) = a.value == b.value && a.attributes == b.attributes
+
+function Base.isless(a::Label{T}, b::Label{T}) where {T}
+    if a.value != b.value
+        return a.value < b.value
+    else
+        return length(a.attributes) < length(b.attributes)
+    end
+end

test/abstract_image_annotation_tests.jl

@@ -0,0 +1,14 @@
+using GeometryBasics
+using ImageAnnotations
+using Test
+
+@testset "AbstractImageAnnotation" begin
+    @testset "Base.isless" begin
+        @testset "Annotations are sorted by their type name" begin
+            a = BoundingBoxAnnotation(Point2(0, 1), 2, 3, "car")
+            b = ImageAnnotation("car")
+            @test isless(a, b)
+            @test !isless(b, a)
+        end
+    end
+end

test/label_tests.jl

@@ -20,4 +20,13 @@ using Test
             end
         end
     end
+    @testset "Base.isless" begin
+        @testset "Labels are sorted by value, then number of attributes" begin
+            a = Label(1)
+            b = Label(2)
+            c = Label(2, Dict{String, Any}("a" => 3))
+            @test isless(a, b)
+            @test isless(b, c)
+        end
+    end
 end

test/runtests.jl

@@ -1,6 +1,7 @@
 using Test
 
 @testset "ImageAnnotations" begin
+    include("abstract_image_annotation_tests.jl")
     include("concept_tests.jl")
     include("image_annotation_tests.jl")
     include("label_tests.jl")