Fix RangeNormalizer (#17)

Author: adrhill

src/heatmap.jl

@@ -28,7 +28,7 @@ function (::MaxAbsNormalizer)(img::SingleChannelImage)
 end
 
 struct RangeNormalizer <: AbstractActivationNormalizer end
-function normalize(img::SingleChannelImage)
+function (::RangeNormalizer)(img::SingleChannelImage)
     min, max = extrema(img)
     return (img .- min) / (max - min)
 end

test/runtests.jl

@@ -8,12 +8,12 @@ using Test
     @testset "Neuron selection" begin
         include("test_neuron_selection.jl")
     end
-    @testset "LRP rules" begin
-        include("test_rules.jl")
-    end
     @testset "Heatmaps" begin
         include("test_heatmaps.jl")
     end
+    @testset "LRP rules" begin
+        include("test_rules.jl")
+    end
     @testset "VGG-19" begin
         include("test_vgg19.jl")
     end

test/test_heatmaps.jl

@@ -1,21 +1,34 @@
 using ExplainabilityMethods
-using ExplainabilityMethods: SumReducer
+using ExplainabilityMethods: MaxAbsNormalizer, RangeNormalizer
+using ExplainabilityMethods: MaxAbsReducer, SumReducer
 
 # Defaults assume nchannels=3
 A = rand(Float32, 3, 4, 5)
 B = reshape(A, 3, 1, 4, 5, 1)
-@test heatmap(A) ≈ heatmap(B)
+@test heatmap(A; normalizer=MaxAbsNormalizer(), reducer=MaxAbsReducer()) ≈
+    heatmap(B; normalizer=MaxAbsNormalizer(), reducer=MaxAbsReducer())
+@test heatmap(A; normalizer=RangeNormalizer(), reducer=SumReducer()) ≈
+    heatmap(B; normalizer=RangeNormalizer(), reducer=SumReducer())
 
 A = rand(Float32, 3, 4, 5)
 B = reshape(A, 3, 1, 4, 1, 5)
-@test heatmap(A; reducer=SumReducer()) ≈ heatmap(B; reducer=SumReducer())
+@test heatmap(A; normalizer=MaxAbsNormalizer(), reducer=MaxAbsReducer()) ≈
+    heatmap(B; normalizer=MaxAbsNormalizer(), reducer=MaxAbsReducer())
+@test heatmap(A; normalizer=RangeNormalizer(), reducer=SumReducer()) ≈
+    heatmap(B; normalizer=RangeNormalizer(), reducer=SumReducer())
 
 # Test with single channel
 A = rand(Float32, 4, 5)
 B = reshape(A, 4, 1, 1, 5, 1)
-@test heatmap(A; nchannels=1) ≈ heatmap(B; nchannels=1)
+@test heatmap(A; nchannels=1, normalizer=MaxAbsNormalizer(), reducer=MaxAbsReducer()) ≈
+    heatmap(B; nchannels=1, normalizer=MaxAbsNormalizer(), reducer=MaxAbsReducer())
+@test heatmap(A; nchannels=1, normalizer=RangeNormalizer(), reducer=SumReducer()) ≈
+    heatmap(B; nchannels=1, normalizer=RangeNormalizer(), reducer=SumReducer())
 
 # Test with 2 color channels
 A = rand(Float32, 2, 3, 4)
 B = reshape(A, 2, 1, 1, 3, 4)
-@test heatmap(A; nchannels=2) ≈ heatmap(B; nchannels=2)
+@test heatmap(A; nchannels=2, normalizer=MaxAbsNormalizer(), reducer=MaxAbsReducer()) ≈
+    heatmap(B; nchannels=2, normalizer=MaxAbsNormalizer(), reducer=MaxAbsReducer())
+@test heatmap(A; nchannels=2, normalizer=RangeNormalizer(), reducer=SumReducer()) ≈
+    heatmap(B; nchannels=2, normalizer=RangeNormalizer(), reducer=SumReducer())