diff --git a/src/overlay.jl b/src/overlay.jl index 5ef5d96..7423d0c 100644 --- a/src/overlay.jl +++ b/src/overlay.jl @@ -1,8 +1,10 @@ +const AbstractImage{T<:Colorant} = AbstractMatrix{T} + const DEFAULT_OVERLAY_ALPHA = 0.6 const DEFAULT_RESIZE_METHOD = Lanczos(1) """ - heatmap_overlay(val, img) + heatmap_overlay(val, image) Create a heatmap from `val` and overlay it on top of an image. Assumes 4D input array following the WHCN convention @@ -18,10 +20,21 @@ Refer to the [`heatmap`](@ref) documentation for more information. """ function heatmap_overlay( val::AbstractArray{T,N}, - im::AbstractMatrix{<:Colorant}; + im::AbstractImage; alpha=DEFAULT_OVERLAY_ALPHA, resize_method=DEFAULT_RESIZE_METHOD, heatmap_kwargs..., +) where {T,N} + options = HeatmapOptions(; heatmap_kwargs...) + return heatmap_overlay(val, im, alpha, resize_method, options) +end + +function heatmap_overlay( + val::AbstractArray{T,N}, + im::AbstractImage, + alpha::Real, + resize_method, + options::HeatmapOptions, ) where {T,N} N != 4 && throw(InputDimensionError) if size(val, 4) != 1 @@ -35,7 +48,6 @@ function heatmap_overlay( throw(ArgumentError("alpha must be in the range [0, 1]")) end - options = HeatmapOptions(; heatmap_kwargs...) hm = heatmap(val, options) hmsize = size(hm) imsize = size(im) @@ -44,3 +56,29 @@ function heatmap_overlay( end return im * (1 - alpha) + hm * alpha end + +#=================# +# XAIBase support # +#=================# + +""" + heatmap_overlay(expl::Explanation, image) + +Visualize `Explanation` from XAIBase as a vision heatmap and overlay it on top of an image. +Assumes WHCN convention (width, height, channels, batch dimension) for `explanation.val` +and batch size 1. + +This will use the default heatmapping style for the given type of explanation. +Refer to the [`heatmap`](@ref) and [`heatmap_overlay`](@ref) documentation +for a list of supported keyword arguments that can be used to override the defaults. +""" +function heatmap_overlay( + expl::Explanation, + im::AbstractImage; + alpha=DEFAULT_OVERLAY_ALPHA, + resize_method=DEFAULT_RESIZE_METHOD, + heatmap_kwargs..., +) + options = HeatmapOptions(expl; heatmap_kwargs...) + return heatmap_overlay(expl.val, im, alpha, resize_method, options) +end diff --git a/test/references/grays_norm_extrema.txt b/test/references/grays_norm_extrema.txt new file mode 100644 index 0000000..7a7373e --- /dev/null +++ b/test/references/grays_norm_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/grays_abssum_centered.txt b/test/references/heatmap/grays_abssum_centered.txt new file mode 100644 index 0000000..df64c44 --- /dev/null +++ b/test/references/heatmap/grays_abssum_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/grays_abssum_extrema.txt b/test/references/heatmap/grays_abssum_extrema.txt new file mode 100644 index 0000000..dde4abe --- /dev/null +++ b/test/references/heatmap/grays_abssum_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/grays_maxabs_centered.txt b/test/references/heatmap/grays_maxabs_centered.txt new file mode 100644 index 0000000..4810011 --- /dev/null +++ b/test/references/heatmap/grays_maxabs_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/grays_maxabs_extrema.txt b/test/references/heatmap/grays_maxabs_extrema.txt new file mode 100644 index 0000000..dde4abe --- /dev/null +++ b/test/references/heatmap/grays_maxabs_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/grays_norm_centered.txt b/test/references/heatmap/grays_norm_centered.txt new file mode 100644 index 0000000..190dd14 --- /dev/null +++ b/test/references/heatmap/grays_norm_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/grays_norm_extrema.txt b/test/references/heatmap/grays_norm_extrema.txt new file mode 100644 index 0000000..7a7373e --- /dev/null +++ b/test/references/heatmap/grays_norm_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/grays_sum_centered.txt b/test/references/heatmap/grays_sum_centered.txt new file mode 100644 index 0000000..df64c44 --- /dev/null +++ b/test/references/heatmap/grays_sum_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/grays_sum_extrema.txt b/test/references/heatmap/grays_sum_extrema.txt new file mode 100644 index 0000000..dde4abe --- /dev/null +++ b/test/references/heatmap/grays_sum_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/grays_sumabs_centered.txt b/test/references/heatmap/grays_sumabs_centered.txt new file mode 100644 index 0000000..df64c44 --- /dev/null +++ b/test/references/heatmap/grays_sumabs_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/grays_sumabs_extrema.txt b/test/references/heatmap/grays_sumabs_extrema.txt new file mode 100644 index 0000000..dde4abe --- /dev/null +++ b/test/references/heatmap/grays_sumabs_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/inferno.txt b/test/references/heatmap/inferno_sum_centered.txt similarity index 100% rename from test/references/inferno.txt rename to test/references/heatmap/inferno_sum_centered.txt diff --git a/test/references/heatmap/jet_abssum_centered.txt b/test/references/heatmap/jet_abssum_centered.txt new file mode 100644 index 0000000..20ddbd9 --- /dev/null +++ b/test/references/heatmap/jet_abssum_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/jet_abssum_extrema.txt b/test/references/heatmap/jet_abssum_extrema.txt new file mode 100644 index 0000000..e0f2012 --- /dev/null +++ b/test/references/heatmap/jet_abssum_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/jet_maxabs_centered.txt b/test/references/heatmap/jet_maxabs_centered.txt new file mode 100644 index 0000000..6b25244 --- /dev/null +++ b/test/references/heatmap/jet_maxabs_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/jet_maxabs_extrema.txt b/test/references/heatmap/jet_maxabs_extrema.txt new file mode 100644 index 0000000..e0f2012 --- /dev/null +++ b/test/references/heatmap/jet_maxabs_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/jet_norm_centered.txt b/test/references/heatmap/jet_norm_centered.txt new file mode 100644 index 0000000..6b25244 --- /dev/null +++ b/test/references/heatmap/jet_norm_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/jet_norm_extrema.txt b/test/references/heatmap/jet_norm_extrema.txt new file mode 100644 index 0000000..bb14ced --- /dev/null +++ b/test/references/heatmap/jet_norm_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/jet_sum_centered.txt b/test/references/heatmap/jet_sum_centered.txt new file mode 100644 index 0000000..20ddbd9 --- /dev/null +++ b/test/references/heatmap/jet_sum_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/jet_sum_extrema.txt b/test/references/heatmap/jet_sum_extrema.txt new file mode 100644 index 0000000..e0f2012 --- /dev/null +++ b/test/references/heatmap/jet_sum_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/jet_sumabs_centered.txt b/test/references/heatmap/jet_sumabs_centered.txt new file mode 100644 index 0000000..20ddbd9 --- /dev/null +++ b/test/references/heatmap/jet_sumabs_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/heatmap/jet_sumabs_extrema.txt b/test/references/heatmap/jet_sumabs_extrema.txt new file mode 100644 index 0000000..e0f2012 --- /dev/null +++ b/test/references/heatmap/jet_sumabs_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/abssum_centered.txt b/test/references/heatmap/seismic_abssum_centered.txt similarity index 100% rename from test/references/abssum_centered.txt rename to test/references/heatmap/seismic_abssum_centered.txt diff --git a/test/references/abssum_centered_2.txt b/test/references/heatmap/seismic_abssum_centered_2.txt similarity index 100% rename from test/references/abssum_centered_2.txt rename to test/references/heatmap/seismic_abssum_centered_2.txt diff --git a/test/references/abssum_extrema.txt b/test/references/heatmap/seismic_abssum_extrema.txt similarity index 100% rename from test/references/abssum_extrema.txt rename to test/references/heatmap/seismic_abssum_extrema.txt diff --git a/test/references/abssum_extrema_2.txt b/test/references/heatmap/seismic_abssum_extrema_2.txt similarity index 100% rename from test/references/abssum_extrema_2.txt rename to test/references/heatmap/seismic_abssum_extrema_2.txt diff --git a/test/references/maxabs_centered.txt b/test/references/heatmap/seismic_maxabs_centered.txt similarity index 100% rename from test/references/maxabs_centered.txt rename to test/references/heatmap/seismic_maxabs_centered.txt diff --git a/test/references/maxabs_centered_2.txt b/test/references/heatmap/seismic_maxabs_centered_2.txt similarity index 100% rename from test/references/maxabs_centered_2.txt rename to test/references/heatmap/seismic_maxabs_centered_2.txt diff --git a/test/references/abssum_extrema_grays.txt b/test/references/heatmap/seismic_maxabs_extrema.txt similarity index 100% rename from test/references/abssum_extrema_grays.txt rename to test/references/heatmap/seismic_maxabs_extrema.txt diff --git a/test/references/abssum_extrema_jet.txt b/test/references/heatmap/seismic_maxabs_extrema_2.txt similarity index 100% rename from test/references/abssum_extrema_jet.txt rename to test/references/heatmap/seismic_maxabs_extrema_2.txt diff --git a/test/references/abssum_centered_grays.txt b/test/references/heatmap/seismic_norm_centered.txt similarity index 100% rename from test/references/abssum_centered_grays.txt rename to test/references/heatmap/seismic_norm_centered.txt diff --git a/test/references/norm_centered_2.txt b/test/references/heatmap/seismic_norm_centered_2.txt similarity index 100% rename from test/references/norm_centered_2.txt rename to test/references/heatmap/seismic_norm_centered_2.txt diff --git a/test/references/abssum_extrema_seismic.txt b/test/references/heatmap/seismic_norm_extrema.txt similarity index 100% rename from test/references/abssum_extrema_seismic.txt rename to test/references/heatmap/seismic_norm_extrema.txt diff --git a/test/references/maxabs_extrema.txt b/test/references/heatmap/seismic_norm_extrema_2.txt similarity index 100% rename from test/references/maxabs_extrema.txt rename to test/references/heatmap/seismic_norm_extrema_2.txt diff --git a/test/references/abssum_centered_jet.txt b/test/references/heatmap/seismic_sum_centered.txt similarity index 100% rename from test/references/abssum_centered_jet.txt rename to test/references/heatmap/seismic_sum_centered.txt diff --git a/test/references/maxabs_centered_grays.txt b/test/references/heatmap/seismic_sum_centered_2.txt similarity index 100% rename from test/references/maxabs_centered_grays.txt rename to test/references/heatmap/seismic_sum_centered_2.txt diff --git a/test/references/maxabs_extrema_2.txt b/test/references/heatmap/seismic_sum_extrema.txt similarity index 100% rename from test/references/maxabs_extrema_2.txt rename to test/references/heatmap/seismic_sum_extrema.txt diff --git a/test/references/maxabs_extrema_grays.txt b/test/references/heatmap/seismic_sum_extrema_2.txt similarity index 100% rename from test/references/maxabs_extrema_grays.txt rename to test/references/heatmap/seismic_sum_extrema_2.txt diff --git a/test/references/abssum_centered_seismic.txt b/test/references/heatmap/seismic_sumabs_centered.txt similarity index 100% rename from test/references/abssum_centered_seismic.txt rename to test/references/heatmap/seismic_sumabs_centered.txt diff --git a/test/references/maxabs_centered_jet.txt b/test/references/heatmap/seismic_sumabs_centered_2.txt similarity index 100% rename from test/references/maxabs_centered_jet.txt rename to test/references/heatmap/seismic_sumabs_centered_2.txt diff --git a/test/references/maxabs_extrema_jet.txt b/test/references/heatmap/seismic_sumabs_extrema.txt similarity index 100% rename from test/references/maxabs_extrema_jet.txt rename to test/references/heatmap/seismic_sumabs_extrema.txt diff --git a/test/references/maxabs_extrema_seismic.txt b/test/references/heatmap/seismic_sumabs_extrema_2.txt similarity index 100% rename from test/references/maxabs_extrema_seismic.txt rename to test/references/heatmap/seismic_sumabs_extrema_2.txt diff --git a/test/references/jet_sum_extrema.txt b/test/references/jet_sum_extrema.txt new file mode 100644 index 0000000..e0f2012 --- /dev/null +++ b/test/references/jet_sum_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/maxabs_centered_seismic.txt b/test/references/maxabs_centered_seismic.txt deleted file mode 100644 index 4e4381a..0000000 --- a/test/references/maxabs_centered_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/norm_centered_grays.txt b/test/references/norm_centered_grays.txt deleted file mode 100644 index fd55c97..0000000 --- a/test/references/norm_centered_grays.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/norm_centered_jet.txt b/test/references/norm_centered_jet.txt deleted file mode 100644 index fd55c97..0000000 --- a/test/references/norm_centered_jet.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/norm_centered_seismic.txt b/test/references/norm_centered_seismic.txt deleted file mode 100644 index fd55c97..0000000 --- a/test/references/norm_centered_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/norm_extrema.txt b/test/references/norm_extrema.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/norm_extrema.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/norm_extrema_2.txt b/test/references/norm_extrema_2.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/norm_extrema_2.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/norm_extrema_grays.txt b/test/references/norm_extrema_grays.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/norm_extrema_grays.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/norm_extrema_jet.txt b/test/references/norm_extrema_jet.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/norm_extrema_jet.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/norm_extrema_seismic.txt b/test/references/norm_extrema_seismic.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/norm_extrema_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay/grays_abssum_centered.txt b/test/references/overlay/grays_abssum_centered.txt new file mode 100644 index 0000000..2fd7b47 --- /dev/null +++ b/test/references/overlay/grays_abssum_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/grays_abssum_extrema.txt b/test/references/overlay/grays_abssum_extrema.txt new file mode 100644 index 0000000..439ee1a --- /dev/null +++ b/test/references/overlay/grays_abssum_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/grays_maxabs_centered.txt b/test/references/overlay/grays_maxabs_centered.txt new file mode 100644 index 0000000..2fd7b47 --- /dev/null +++ b/test/references/overlay/grays_maxabs_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/grays_maxabs_extrema.txt b/test/references/overlay/grays_maxabs_extrema.txt new file mode 100644 index 0000000..439ee1a --- /dev/null +++ b/test/references/overlay/grays_maxabs_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/grays_norm_centered.txt b/test/references/overlay/grays_norm_centered.txt new file mode 100644 index 0000000..2fd7b47 --- /dev/null +++ b/test/references/overlay/grays_norm_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/grays_norm_extrema.txt b/test/references/overlay/grays_norm_extrema.txt new file mode 100644 index 0000000..439ee1a --- /dev/null +++ b/test/references/overlay/grays_norm_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/grays_sum_centered.txt b/test/references/overlay/grays_sum_centered.txt new file mode 100644 index 0000000..2fd7b47 --- /dev/null +++ b/test/references/overlay/grays_sum_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/grays_sum_extrema.txt b/test/references/overlay/grays_sum_extrema.txt new file mode 100644 index 0000000..439ee1a --- /dev/null +++ b/test/references/overlay/grays_sum_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/grays_sumabs_centered.txt b/test/references/overlay/grays_sumabs_centered.txt new file mode 100644 index 0000000..2fd7b47 --- /dev/null +++ b/test/references/overlay/grays_sumabs_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/grays_sumabs_extrema.txt b/test/references/overlay/grays_sumabs_extrema.txt new file mode 100644 index 0000000..439ee1a --- /dev/null +++ b/test/references/overlay/grays_sumabs_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay_inferno.txt b/test/references/overlay/inferno_sum_centered.txt similarity index 100% rename from test/references/overlay_inferno.txt rename to test/references/overlay/inferno_sum_centered.txt diff --git a/test/references/overlay/jet_abssum_centered.txt b/test/references/overlay/jet_abssum_centered.txt new file mode 100644 index 0000000..c62bd12 --- /dev/null +++ b/test/references/overlay/jet_abssum_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/jet_abssum_extrema.txt b/test/references/overlay/jet_abssum_extrema.txt new file mode 100644 index 0000000..5f5e221 --- /dev/null +++ b/test/references/overlay/jet_abssum_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/jet_maxabs_centered.txt b/test/references/overlay/jet_maxabs_centered.txt new file mode 100644 index 0000000..5979cf9 --- /dev/null +++ b/test/references/overlay/jet_maxabs_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/jet_maxabs_extrema.txt b/test/references/overlay/jet_maxabs_extrema.txt new file mode 100644 index 0000000..5f5e221 --- /dev/null +++ b/test/references/overlay/jet_maxabs_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/jet_norm_centered.txt b/test/references/overlay/jet_norm_centered.txt new file mode 100644 index 0000000..0f660df --- /dev/null +++ b/test/references/overlay/jet_norm_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/jet_norm_extrema.txt b/test/references/overlay/jet_norm_extrema.txt new file mode 100644 index 0000000..5f5e221 --- /dev/null +++ b/test/references/overlay/jet_norm_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/jet_sum_centered.txt b/test/references/overlay/jet_sum_centered.txt new file mode 100644 index 0000000..c62bd12 --- /dev/null +++ b/test/references/overlay/jet_sum_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/jet_sum_extrema.txt b/test/references/overlay/jet_sum_extrema.txt new file mode 100644 index 0000000..5f5e221 --- /dev/null +++ b/test/references/overlay/jet_sum_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/jet_sumabs_centered.txt b/test/references/overlay/jet_sumabs_centered.txt new file mode 100644 index 0000000..c62bd12 --- /dev/null +++ b/test/references/overlay/jet_sumabs_centered.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay/jet_sumabs_extrema.txt b/test/references/overlay/jet_sumabs_extrema.txt new file mode 100644 index 0000000..5f5e221 --- /dev/null +++ b/test/references/overlay/jet_sumabs_extrema.txt @@ -0,0 +1 @@ +▀▀ \ No newline at end of file diff --git a/test/references/overlay_abssum_centered_grays.txt b/test/references/overlay/seismic_abssum_centered.txt similarity index 100% rename from test/references/overlay_abssum_centered_grays.txt rename to test/references/overlay/seismic_abssum_centered.txt diff --git a/test/references/overlay_abssum_extrema_grays.txt b/test/references/overlay/seismic_abssum_extrema.txt similarity index 100% rename from test/references/overlay_abssum_extrema_grays.txt rename to test/references/overlay/seismic_abssum_extrema.txt diff --git a/test/references/overlay_abssum_centered_jet.txt b/test/references/overlay/seismic_maxabs_centered.txt similarity index 100% rename from test/references/overlay_abssum_centered_jet.txt rename to test/references/overlay/seismic_maxabs_centered.txt diff --git a/test/references/overlay_abssum_extrema_jet.txt b/test/references/overlay/seismic_maxabs_extrema.txt similarity index 100% rename from test/references/overlay_abssum_extrema_jet.txt rename to test/references/overlay/seismic_maxabs_extrema.txt diff --git a/test/references/overlay_abssum_centered_seismic.txt b/test/references/overlay/seismic_norm_centered.txt similarity index 100% rename from test/references/overlay_abssum_centered_seismic.txt rename to test/references/overlay/seismic_norm_centered.txt diff --git a/test/references/overlay_abssum_extrema_seismic.txt b/test/references/overlay/seismic_norm_extrema.txt similarity index 100% rename from test/references/overlay_abssum_extrema_seismic.txt rename to test/references/overlay/seismic_norm_extrema.txt diff --git a/test/references/overlay_maxabs_centered_grays.txt b/test/references/overlay/seismic_sum_centered.txt similarity index 100% rename from test/references/overlay_maxabs_centered_grays.txt rename to test/references/overlay/seismic_sum_centered.txt diff --git a/test/references/overlay_maxabs_extrema_grays.txt b/test/references/overlay/seismic_sum_extrema.txt similarity index 100% rename from test/references/overlay_maxabs_extrema_grays.txt rename to test/references/overlay/seismic_sum_extrema.txt diff --git a/test/references/overlay_maxabs_centered_jet.txt b/test/references/overlay/seismic_sumabs_centered.txt similarity index 100% rename from test/references/overlay_maxabs_centered_jet.txt rename to test/references/overlay/seismic_sumabs_centered.txt diff --git a/test/references/overlay_maxabs_extrema_jet.txt b/test/references/overlay/seismic_sumabs_extrema.txt similarity index 100% rename from test/references/overlay_maxabs_extrema_jet.txt rename to test/references/overlay/seismic_sumabs_extrema.txt diff --git a/test/references/overlay_maxabs_centered_seismic.txt b/test/references/overlay_maxabs_centered_seismic.txt deleted file mode 100644 index 57d3560..0000000 --- a/test/references/overlay_maxabs_centered_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_maxabs_extrema_seismic.txt b/test/references/overlay_maxabs_extrema_seismic.txt deleted file mode 100644 index 0c01456..0000000 --- a/test/references/overlay_maxabs_extrema_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_norm_centered_grays.txt b/test/references/overlay_norm_centered_grays.txt deleted file mode 100644 index 57d3560..0000000 --- a/test/references/overlay_norm_centered_grays.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_norm_centered_jet.txt b/test/references/overlay_norm_centered_jet.txt deleted file mode 100644 index 57d3560..0000000 --- a/test/references/overlay_norm_centered_jet.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_norm_centered_seismic.txt b/test/references/overlay_norm_centered_seismic.txt deleted file mode 100644 index 57d3560..0000000 --- a/test/references/overlay_norm_centered_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_norm_extrema_grays.txt b/test/references/overlay_norm_extrema_grays.txt deleted file mode 100644 index 0c01456..0000000 --- a/test/references/overlay_norm_extrema_grays.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_norm_extrema_jet.txt b/test/references/overlay_norm_extrema_jet.txt deleted file mode 100644 index 0c01456..0000000 --- a/test/references/overlay_norm_extrema_jet.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_norm_extrema_seismic.txt b/test/references/overlay_norm_extrema_seismic.txt deleted file mode 100644 index 0c01456..0000000 --- a/test/references/overlay_norm_extrema_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_maxabs_centered_jet.txt b/test/references/overlay_rescale_maxabs_centered_jet.txt deleted file mode 100644 index e7a720c..0000000 --- a/test/references/overlay_rescale_maxabs_centered_jet.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_maxabs_centered_seismic.txt b/test/references/overlay_rescale_maxabs_centered_seismic.txt deleted file mode 100644 index e7a720c..0000000 --- a/test/references/overlay_rescale_maxabs_centered_seismic.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_maxabs_extrema_jet.txt b/test/references/overlay_rescale_maxabs_extrema_jet.txt deleted file mode 100644 index bccc955..0000000 --- a/test/references/overlay_rescale_maxabs_extrema_jet.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_maxabs_extrema_seismic.txt b/test/references/overlay_rescale_maxabs_extrema_seismic.txt deleted file mode 100644 index bccc955..0000000 --- a/test/references/overlay_rescale_maxabs_extrema_seismic.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_norm_centered_jet.txt b/test/references/overlay_rescale_norm_centered_jet.txt deleted file mode 100644 index 863212c..0000000 --- a/test/references/overlay_rescale_norm_centered_jet.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_norm_centered_seismic.txt b/test/references/overlay_rescale_norm_centered_seismic.txt deleted file mode 100644 index 863212c..0000000 --- a/test/references/overlay_rescale_norm_centered_seismic.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_norm_extrema_jet.txt b/test/references/overlay_rescale_norm_extrema_jet.txt deleted file mode 100644 index d46bb45..0000000 --- a/test/references/overlay_rescale_norm_extrema_jet.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_norm_extrema_seismic.txt b/test/references/overlay_rescale_norm_extrema_seismic.txt deleted file mode 100644 index d46bb45..0000000 --- a/test/references/overlay_rescale_norm_extrema_seismic.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_sum_centered_grays.txt b/test/references/overlay_rescale_sum_centered_grays.txt deleted file mode 100644 index bcfcb11..0000000 --- a/test/references/overlay_rescale_sum_centered_grays.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_sum_centered_jet.txt b/test/references/overlay_rescale_sum_centered_jet.txt deleted file mode 100644 index bcfcb11..0000000 --- a/test/references/overlay_rescale_sum_centered_jet.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_sum_centered_seismic.txt b/test/references/overlay_rescale_sum_centered_seismic.txt deleted file mode 100644 index bcfcb11..0000000 --- a/test/references/overlay_rescale_sum_centered_seismic.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_sum_extrema_grays.txt b/test/references/overlay_rescale_sum_extrema_grays.txt deleted file mode 100644 index bccc955..0000000 --- a/test/references/overlay_rescale_sum_extrema_grays.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_sum_extrema_jet.txt b/test/references/overlay_rescale_sum_extrema_jet.txt deleted file mode 100644 index bccc955..0000000 --- a/test/references/overlay_rescale_sum_extrema_jet.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_sum_extrema_seismic.txt b/test/references/overlay_rescale_sum_extrema_seismic.txt deleted file mode 100644 index bccc955..0000000 --- a/test/references/overlay_rescale_sum_extrema_seismic.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_sumabs_centered_grays.txt b/test/references/overlay_rescale_sumabs_centered_grays.txt deleted file mode 100644 index bcfcb11..0000000 --- a/test/references/overlay_rescale_sumabs_centered_grays.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_sumabs_centered_jet.txt b/test/references/overlay_rescale_sumabs_centered_jet.txt deleted file mode 100644 index bcfcb11..0000000 --- a/test/references/overlay_rescale_sumabs_centered_jet.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_sumabs_centered_seismic.txt b/test/references/overlay_rescale_sumabs_centered_seismic.txt deleted file mode 100644 index bcfcb11..0000000 --- a/test/references/overlay_rescale_sumabs_centered_seismic.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_sumabs_extrema_grays.txt b/test/references/overlay_rescale_sumabs_extrema_grays.txt deleted file mode 100644 index bccc955..0000000 --- a/test/references/overlay_rescale_sumabs_extrema_grays.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_sumabs_extrema_jet.txt b/test/references/overlay_rescale_sumabs_extrema_jet.txt deleted file mode 100644 index bccc955..0000000 --- a/test/references/overlay_rescale_sumabs_extrema_jet.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_sumabs_extrema_seismic.txt b/test/references/overlay_rescale_sumabs_extrema_seismic.txt deleted file mode 100644 index bccc955..0000000 --- a/test/references/overlay_rescale_sumabs_extrema_seismic.txt +++ /dev/null @@ -1,3 +0,0 @@ -▀▀▀▀▀▀ -▀▀▀▀▀▀ -▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/grays_abssum_centered.txt b/test/references/overlay_rescaled/grays_abssum_centered.txt new file mode 100644 index 0000000..ec08777 --- /dev/null +++ b/test/references/overlay_rescaled/grays_abssum_centered.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/grays_abssum_extrema.txt b/test/references/overlay_rescaled/grays_abssum_extrema.txt new file mode 100644 index 0000000..9b59592 --- /dev/null +++ b/test/references/overlay_rescaled/grays_abssum_extrema.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/grays_maxabs_centered.txt b/test/references/overlay_rescaled/grays_maxabs_centered.txt new file mode 100644 index 0000000..0a67a25 --- /dev/null +++ b/test/references/overlay_rescaled/grays_maxabs_centered.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/grays_maxabs_extrema.txt b/test/references/overlay_rescaled/grays_maxabs_extrema.txt new file mode 100644 index 0000000..9b59592 --- /dev/null +++ b/test/references/overlay_rescaled/grays_maxabs_extrema.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/grays_norm_centered.txt b/test/references/overlay_rescaled/grays_norm_centered.txt new file mode 100644 index 0000000..ec08777 --- /dev/null +++ b/test/references/overlay_rescaled/grays_norm_centered.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/grays_norm_extrema.txt b/test/references/overlay_rescaled/grays_norm_extrema.txt new file mode 100644 index 0000000..9b59592 --- /dev/null +++ b/test/references/overlay_rescaled/grays_norm_extrema.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/grays_sum_centered.txt b/test/references/overlay_rescaled/grays_sum_centered.txt new file mode 100644 index 0000000..ec08777 --- /dev/null +++ b/test/references/overlay_rescaled/grays_sum_centered.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/grays_sum_extrema.txt b/test/references/overlay_rescaled/grays_sum_extrema.txt new file mode 100644 index 0000000..9b59592 --- /dev/null +++ b/test/references/overlay_rescaled/grays_sum_extrema.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/grays_sumabs_centered.txt b/test/references/overlay_rescaled/grays_sumabs_centered.txt new file mode 100644 index 0000000..ec08777 --- /dev/null +++ b/test/references/overlay_rescaled/grays_sumabs_centered.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/grays_sumabs_extrema.txt b/test/references/overlay_rescaled/grays_sumabs_extrema.txt new file mode 100644 index 0000000..9b59592 --- /dev/null +++ b/test/references/overlay_rescaled/grays_sumabs_extrema.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/jet_abssum_centered.txt b/test/references/overlay_rescaled/jet_abssum_centered.txt new file mode 100644 index 0000000..d81dbfc --- /dev/null +++ b/test/references/overlay_rescaled/jet_abssum_centered.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/jet_abssum_extrema.txt b/test/references/overlay_rescaled/jet_abssum_extrema.txt new file mode 100644 index 0000000..01265ae --- /dev/null +++ b/test/references/overlay_rescaled/jet_abssum_extrema.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/jet_maxabs_centered.txt b/test/references/overlay_rescaled/jet_maxabs_centered.txt new file mode 100644 index 0000000..d078ca6 --- /dev/null +++ b/test/references/overlay_rescaled/jet_maxabs_centered.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/jet_maxabs_extrema.txt b/test/references/overlay_rescaled/jet_maxabs_extrema.txt new file mode 100644 index 0000000..01265ae --- /dev/null +++ b/test/references/overlay_rescaled/jet_maxabs_extrema.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/jet_norm_centered.txt b/test/references/overlay_rescaled/jet_norm_centered.txt new file mode 100644 index 0000000..a19900c --- /dev/null +++ b/test/references/overlay_rescaled/jet_norm_centered.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/jet_norm_extrema.txt b/test/references/overlay_rescaled/jet_norm_extrema.txt new file mode 100644 index 0000000..d2c34d7 --- /dev/null +++ b/test/references/overlay_rescaled/jet_norm_extrema.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/jet_sum_centered.txt b/test/references/overlay_rescaled/jet_sum_centered.txt new file mode 100644 index 0000000..d81dbfc --- /dev/null +++ b/test/references/overlay_rescaled/jet_sum_centered.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/jet_sum_extrema.txt b/test/references/overlay_rescaled/jet_sum_extrema.txt new file mode 100644 index 0000000..01265ae --- /dev/null +++ b/test/references/overlay_rescaled/jet_sum_extrema.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/jet_sumabs_centered.txt b/test/references/overlay_rescaled/jet_sumabs_centered.txt new file mode 100644 index 0000000..d81dbfc --- /dev/null +++ b/test/references/overlay_rescaled/jet_sumabs_centered.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescaled/jet_sumabs_extrema.txt b/test/references/overlay_rescaled/jet_sumabs_extrema.txt new file mode 100644 index 0000000..01265ae --- /dev/null +++ b/test/references/overlay_rescaled/jet_sumabs_extrema.txt @@ -0,0 +1,3 @@ +▀▀▀▀▀▀ +▀▀▀▀▀▀ +▀▀▀▀▀▀ \ No newline at end of file diff --git a/test/references/overlay_rescale_abssum_centered_grays.txt b/test/references/overlay_rescaled/seismic_abssum_centered.txt similarity index 100% rename from test/references/overlay_rescale_abssum_centered_grays.txt rename to test/references/overlay_rescaled/seismic_abssum_centered.txt diff --git a/test/references/overlay_rescale_abssum_extrema_grays.txt b/test/references/overlay_rescaled/seismic_abssum_extrema.txt similarity index 100% rename from test/references/overlay_rescale_abssum_extrema_grays.txt rename to test/references/overlay_rescaled/seismic_abssum_extrema.txt diff --git a/test/references/overlay_rescale_maxabs_centered_grays.txt b/test/references/overlay_rescaled/seismic_maxabs_centered.txt similarity index 100% rename from test/references/overlay_rescale_maxabs_centered_grays.txt rename to test/references/overlay_rescaled/seismic_maxabs_centered.txt diff --git a/test/references/overlay_rescale_abssum_extrema_jet.txt b/test/references/overlay_rescaled/seismic_maxabs_extrema.txt similarity index 100% rename from test/references/overlay_rescale_abssum_extrema_jet.txt rename to test/references/overlay_rescaled/seismic_maxabs_extrema.txt diff --git a/test/references/overlay_rescale_norm_centered_grays.txt b/test/references/overlay_rescaled/seismic_norm_centered.txt similarity index 100% rename from test/references/overlay_rescale_norm_centered_grays.txt rename to test/references/overlay_rescaled/seismic_norm_centered.txt diff --git a/test/references/overlay_rescale_norm_extrema_grays.txt b/test/references/overlay_rescaled/seismic_norm_extrema.txt similarity index 100% rename from test/references/overlay_rescale_norm_extrema_grays.txt rename to test/references/overlay_rescaled/seismic_norm_extrema.txt diff --git a/test/references/overlay_rescale_abssum_centered_jet.txt b/test/references/overlay_rescaled/seismic_sum_centered.txt similarity index 100% rename from test/references/overlay_rescale_abssum_centered_jet.txt rename to test/references/overlay_rescaled/seismic_sum_centered.txt diff --git a/test/references/overlay_rescale_abssum_extrema_seismic.txt b/test/references/overlay_rescaled/seismic_sum_extrema.txt similarity index 100% rename from test/references/overlay_rescale_abssum_extrema_seismic.txt rename to test/references/overlay_rescaled/seismic_sum_extrema.txt diff --git a/test/references/overlay_rescale_abssum_centered_seismic.txt b/test/references/overlay_rescaled/seismic_sumabs_centered.txt similarity index 100% rename from test/references/overlay_rescale_abssum_centered_seismic.txt rename to test/references/overlay_rescaled/seismic_sumabs_centered.txt diff --git a/test/references/overlay_rescale_maxabs_extrema_grays.txt b/test/references/overlay_rescaled/seismic_sumabs_extrema.txt similarity index 100% rename from test/references/overlay_rescale_maxabs_extrema_grays.txt rename to test/references/overlay_rescaled/seismic_sumabs_extrema.txt diff --git a/test/references/overlay_sum_centered_grays.txt b/test/references/overlay_sum_centered_grays.txt deleted file mode 100644 index 57d3560..0000000 --- a/test/references/overlay_sum_centered_grays.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_sum_centered_jet.txt b/test/references/overlay_sum_centered_jet.txt deleted file mode 100644 index 57d3560..0000000 --- a/test/references/overlay_sum_centered_jet.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_sum_centered_seismic.txt b/test/references/overlay_sum_centered_seismic.txt deleted file mode 100644 index 57d3560..0000000 --- a/test/references/overlay_sum_centered_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_sum_extrema_grays.txt b/test/references/overlay_sum_extrema_grays.txt deleted file mode 100644 index 0c01456..0000000 --- a/test/references/overlay_sum_extrema_grays.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_sum_extrema_jet.txt b/test/references/overlay_sum_extrema_jet.txt deleted file mode 100644 index 0c01456..0000000 --- a/test/references/overlay_sum_extrema_jet.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_sum_extrema_seismic.txt b/test/references/overlay_sum_extrema_seismic.txt deleted file mode 100644 index 0c01456..0000000 --- a/test/references/overlay_sum_extrema_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_sumabs_centered_grays.txt b/test/references/overlay_sumabs_centered_grays.txt deleted file mode 100644 index 57d3560..0000000 --- a/test/references/overlay_sumabs_centered_grays.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_sumabs_centered_jet.txt b/test/references/overlay_sumabs_centered_jet.txt deleted file mode 100644 index 57d3560..0000000 --- a/test/references/overlay_sumabs_centered_jet.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_sumabs_centered_seismic.txt b/test/references/overlay_sumabs_centered_seismic.txt deleted file mode 100644 index 57d3560..0000000 --- a/test/references/overlay_sumabs_centered_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_sumabs_extrema_grays.txt b/test/references/overlay_sumabs_extrema_grays.txt deleted file mode 100644 index 0c01456..0000000 --- a/test/references/overlay_sumabs_extrema_grays.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_sumabs_extrema_jet.txt b/test/references/overlay_sumabs_extrema_jet.txt deleted file mode 100644 index 0c01456..0000000 --- a/test/references/overlay_sumabs_extrema_jet.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/overlay_sumabs_extrema_seismic.txt b/test/references/overlay_sumabs_extrema_seismic.txt deleted file mode 100644 index 0c01456..0000000 --- a/test/references/overlay_sumabs_extrema_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/norm_centered.txt b/test/references/seismic_sum_centered.txt similarity index 100% rename from test/references/norm_centered.txt rename to test/references/seismic_sum_centered.txt diff --git a/test/references/sum_centered.txt b/test/references/sum_centered.txt deleted file mode 100644 index fd55c97..0000000 --- a/test/references/sum_centered.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sum_centered_2.txt b/test/references/sum_centered_2.txt deleted file mode 100644 index 4e4381a..0000000 --- a/test/references/sum_centered_2.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sum_centered_grays.txt b/test/references/sum_centered_grays.txt deleted file mode 100644 index fd55c97..0000000 --- a/test/references/sum_centered_grays.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sum_centered_jet.txt b/test/references/sum_centered_jet.txt deleted file mode 100644 index fd55c97..0000000 --- a/test/references/sum_centered_jet.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sum_centered_seismic.txt b/test/references/sum_centered_seismic.txt deleted file mode 100644 index fd55c97..0000000 --- a/test/references/sum_centered_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sum_extrema.txt b/test/references/sum_extrema.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/sum_extrema.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sum_extrema_2.txt b/test/references/sum_extrema_2.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/sum_extrema_2.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sum_extrema_grays.txt b/test/references/sum_extrema_grays.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/sum_extrema_grays.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sum_extrema_jet.txt b/test/references/sum_extrema_jet.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/sum_extrema_jet.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sum_extrema_seismic.txt b/test/references/sum_extrema_seismic.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/sum_extrema_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sumabs_centered.txt b/test/references/sumabs_centered.txt deleted file mode 100644 index fd55c97..0000000 --- a/test/references/sumabs_centered.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sumabs_centered_2.txt b/test/references/sumabs_centered_2.txt deleted file mode 100644 index 4e4381a..0000000 --- a/test/references/sumabs_centered_2.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sumabs_centered_grays.txt b/test/references/sumabs_centered_grays.txt deleted file mode 100644 index fd55c97..0000000 --- a/test/references/sumabs_centered_grays.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sumabs_centered_jet.txt b/test/references/sumabs_centered_jet.txt deleted file mode 100644 index fd55c97..0000000 --- a/test/references/sumabs_centered_jet.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sumabs_centered_seismic.txt b/test/references/sumabs_centered_seismic.txt deleted file mode 100644 index fd55c97..0000000 --- a/test/references/sumabs_centered_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sumabs_extrema.txt b/test/references/sumabs_extrema.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/sumabs_extrema.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sumabs_extrema_2.txt b/test/references/sumabs_extrema_2.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/sumabs_extrema_2.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sumabs_extrema_grays.txt b/test/references/sumabs_extrema_grays.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/sumabs_extrema_grays.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sumabs_extrema_jet.txt b/test/references/sumabs_extrema_jet.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/sumabs_extrema_jet.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/references/sumabs_extrema_seismic.txt b/test/references/sumabs_extrema_seismic.txt deleted file mode 100644 index d00dbcc..0000000 --- a/test/references/sumabs_extrema_seismic.txt +++ /dev/null @@ -1 +0,0 @@ -▀▀ \ No newline at end of file diff --git a/test/runtests.jl b/test/runtests.jl index 1ba3c7f..d912af0 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -21,6 +21,6 @@ using JuliaFormatter end @testset "XAIBase Explanations" begin @info "Testing heatmaps on XAIBase explanations..." - include("test_xaibase.jl") + include("test_xai_presets.jl") end end diff --git a/test/test_heatmap.jl b/test/test_heatmap.jl index 53eb924..7af81b9 100644 --- a/test/test_heatmap.jl +++ b/test/test_heatmap.jl @@ -1,7 +1,11 @@ using ImageCore +using XAIBase shape = (2, 2, 3, 1) A = reshape(collect(Float32, 1:prod(shape)), shape) +val = output = reshape(collect(Float32, 1:prod(shape)), shape) +output_selection = [[CartesianIndex(1, 2)]] # irrelevant +expl = Explanation(val, output, output_selection, :DummyAnalyzer, :attribution) shape = (2, 2, 3, 2) batch = reshape(collect(Float32, 1:prod(shape)), shape) @@ -17,16 +21,37 @@ rangescales = [:extrema, :centered] for colorscheme in colorschemes for reducer in reducers for rangescale in rangescales - h = heatmap(A; reduce=reducer, rangescale=rangescale) - @test_reference "references/$(reducer)_$(rangescale)_$(colorscheme).txt" h - h2 = heatmap( - A; reduce=reducer, rangescale=rangescale, unpack_singleton=false - )[1] - @test h ≈ h2 + h = heatmap( + A; colorscheme=colorscheme, reduce=reducer, rangescale=rangescale + ) + @test_reference "references/heatmap/$(colorscheme)_$(reducer)_$(rangescale).txt" h + h = heatmap( + expl; colorscheme=colorscheme, reduce=reducer, rangescale=rangescale + ) + @test_reference "references/heatmap/$(colorscheme)_$(reducer)_$(rangescale).txt" h + hs = heatmap( + A; + colorscheme=colorscheme, + reduce=reducer, + rangescale=rangescale, + unpack_singleton=false, + ) + @test_reference "references/heatmap/$(colorscheme)_$(reducer)_$(rangescale).txt" hs[1] - ho = heatmap_overlay(A, img; reduce=reducer, rangescale=rangescale) + ho = heatmap_overlay( + A, img; colorscheme=colorscheme, reduce=reducer, rangescale=rangescale + ) @test size(ho) == size(img) - @test_reference "references/overlay_$(reducer)_$(rangescale)_$(colorscheme).txt" ho + @test_reference "references/overlay/$(colorscheme)_$(reducer)_$(rangescale).txt" ho + ho = heatmap_overlay( + expl, + img; + colorscheme=colorscheme, + reduce=reducer, + rangescale=rangescale, + ) + @test size(ho) == size(img) + @test_reference "references/overlay/$(colorscheme)_$(reducer)_$(rangescale).txt" ho end end end @@ -35,9 +60,11 @@ end for colorscheme in colorschemes for reducer in reducers for rangescale in rangescales - ho = heatmap_overlay(A, img2; reduce=reducer, rangescale=rangescale) + ho = heatmap_overlay( + A, img2; colorscheme=colorscheme, reduce=reducer, rangescale=rangescale + ) @test size(ho) == size(img2) - @test_reference "references/overlay_rescale_$(reducer)_$(rangescale)_$(colorscheme).txt" ho + @test_reference "references/overlay_rescaled/$(colorscheme)_$(reducer)_$(rangescale).txt" ho end end end @@ -47,24 +74,24 @@ end for reducer in reducers for rangescale in rangescales h = heatmap(batch; reduce=reducer, rangescale=rangescale) - @test_reference "references/$(reducer)_$(rangescale).txt" h[1] - @test_reference "references/$(reducer)_$(rangescale)_2.txt" h[2] + @test_reference "references/heatmap/seismic_$(reducer)_$(rangescale).txt" h[1] + @test_reference "references/heatmap/seismic_$(reducer)_$(rangescale)_2.txt" h[2] end end end @testset "ColorSchemes" begin h = heatmap(A; colorscheme=ColorSchemes.inferno) - @test_reference "references/inferno.txt" h + @test_reference "references/heatmap/inferno_sum_centered.txt" h # Test colorscheme symbols h = heatmap(A; colorscheme=:inferno) - @test_reference "references/inferno.txt" h + @test_reference "references/heatmap/inferno_sum_centered.txt" h ho = heatmap_overlay(A, img; colorscheme=:inferno) - @test_reference "references/overlay_inferno.txt" ho + @test_reference "references/overlay/inferno_sum_centered.txt" ho ho = heatmap_overlay(A, img; colorscheme=ColorSchemes.inferno) - @test_reference "references/overlay_inferno.txt" ho + @test_reference "references/overlay/inferno_sum_centered.txt" ho end @testset "Error handling" begin diff --git a/test/test_xai_presets.jl b/test/test_xai_presets.jl new file mode 100644 index 0000000..dace884 --- /dev/null +++ b/test/test_xai_presets.jl @@ -0,0 +1,66 @@ +using XAIBase + +shape = (2, 2, 3, 1) +val = output = reshape(collect(Float32, 1:prod(shape)), shape) +output_selection = [[CartesianIndex(1, 2)]] # irrelevant +img = [RGB(1, 0, 0) RGB(0, 1, 0); RGB(0, 0, 1) RGB(1, 1, 1)] + +@testset "Heatmapping presets" begin + expl = Explanation(val, output, output_selection, :DummyAnalyzer, :attribution) + h = heatmap(expl) + @test_reference "references/seismic_sum_centered.txt" h + expl = Explanation(val, output, output_selection, :DummyAnalyzer, :sensitivity) + h = heatmap(expl) + @test_reference "references/grays_norm_extrema.txt" h + expl = Explanation(val, output, output_selection, :DummyAnalyzer, :cam) + h = heatmap(expl) + @test_reference "references/jet_sum_extrema.txt" h +end + +@testset "Overlay presets" begin + shape = (2, 2, 3, 1) + val = output = reshape(collect(Float32, 1:prod(shape)), shape) + output_selection = [[CartesianIndex(1, 2)]] # irrelevant + + expl = Explanation(val, output, output_selection, :DummyAnalyzer, :attribution) + ho = heatmap_overlay(expl, img) + @test_reference "references/overlay/seismic_sum_centered.txt" ho + expl = Explanation(val, output, output_selection, :DummyAnalyzer, :sensitivity) + ho = heatmap_overlay(expl, img) + @test_reference "references/overlay/grays_norm_extrema.txt" ho + expl = Explanation(val, output, output_selection, :DummyAnalyzer, :cam) + ho = heatmap_overlay(expl, img) + @test_reference "references/overlay/jet_sum_extrema.txt" ho +end + +@testset "Batched input" begin + val = output = reshape(1:(2^4), 2, 2, 2, 2) + output_selection = [CartesianIndex(1, 2), CartesianIndex(3, 4)] # irrelevant + expl_batch = Explanation(val, output, output_selection, :LRP, :attribution) + + h1 = heatmap(expl_batch) + h2 = heatmap(expl_batch; process_batch=true) + @test_reference "references/process_batch_false.txt" h1 + @test_reference "references/process_batch_true.txt" h2 +end + +@testset "Direct Analyzer call" begin + struct DummyAnalyzer <: AbstractXAIMethod end + function (method::DummyAnalyzer)(input, output_selector::AbstractOutputSelector) + output = input + output_selection = output_selector(output) + batchsize = size(input)[end] + v = reshape(output[output_selection], :, batchsize) + val = input .* v + return Explanation(val, output, output_selection, :Dummy, :attribution) + end + + analyzer = DummyAnalyzer() + input = reshape([1 6 2 5 3 4], 2, 3, 1, 1) + val = reshape([3 36 6 30 9 24], 2, 3, 1, 1) # Explanation for max activation + expl = analyzer(input) + + h1 = heatmap(expl) + h2 = heatmap(input, analyzer) + @test h1 ≈ h2 +end diff --git a/test/test_xaibase.jl b/test/test_xaibase.jl deleted file mode 100644 index 4614c83..0000000 --- a/test/test_xaibase.jl +++ /dev/null @@ -1,73 +0,0 @@ -using XAIBase - -# NOTE: Heatmapping assumes Flux's WHCN convention (width, height, color channels, batch size). -# Single input -@testset "Single input" begin - shape = (2, 2, 3, 1) - val = output = reshape(collect(Float32, 1:prod(shape)), shape) - output_selection = [[CartesianIndex(1, 2)]] # irrelevant - - # Test presets - @testset "Heatmapping presets" begin - expl = Explanation(val, output, output_selection, :DummyAnalyzer, :attribution) - h = heatmap(expl) - @test_reference "references/sum_centered_seismic.txt" h - expl = Explanation(val, output, output_selection, :DummyAnalyzer, :sensitivity) - h = heatmap(expl; colorscheme=:seismic) - @test_reference "references/norm_extrema_grays.txt" h - expl = Explanation(val, output, output_selection, :DummyAnalyzer, :cam) - h = heatmap(expl; colorscheme=:seismic) - @test_reference "references/sum_extrema_jet.txt" h - end - - @testset "Overriding presets" begin - # The following Explanation selects the jet colorscheme - expl = Explanation(val, output, output_selection, :DummyAnalyzer, :attribution) - - # Custom configuration - reducers = [:sum, :maxabs, :norm, :sumabs, :abssum] - rangescales = [:extrema, :centered] - for reducer in reducers - for rangescale in rangescales - local h = heatmap(expl; reduce=reducer, rangescale=rangescale) - @test_reference "references/$(reducer)_$(rangescale)_jet.txt" h - h2 = heatmap( - expl; reduce=reducer, rangescale=rangescale, unpack_singleton=false - )[1] - @test h ≈ h2 - end - end - end -end - -@testset "Batched input" begin - val = output = reshape(1:(2^4), 2, 2, 2, 2) - output_selection = [CartesianIndex(1, 2), CartesianIndex(3, 4)] # irrelevant - expl_batch = Explanation(val, output, output_selection, :LRP, :attribution) - - h1 = heatmap(expl_batch) - h2 = heatmap(expl_batch; process_batch=true) - @test_reference "references/process_batch_false.txt" h1 - @test_reference "references/process_batch_true.txt" h2 -end - -@testset "Direct Analyzer call" begin - struct DummyAnalyzer <: AbstractXAIMethod end - function (method::DummyAnalyzer)(input, output_selector::AbstractOutputSelector) - output = input - output_selection = output_selector(output) - batchsize = size(input)[end] - v = reshape(output[output_selection], :, batchsize) - val = input .* v - return Explanation(val, output, output_selection, :Dummy, :attribution) - end - - analyzer = DummyAnalyzer() - input = reshape([1 6 2 5 3 4], 2, 3, 1, 1) - val = reshape([3 36 6 30 9 24], 2, 3, 1, 1) # Explanation for max activation - expl = analyzer(input) - - h1 = heatmap(expl) - h2 = heatmap(input, analyzer) - @test h1 ≈ h2 -end