test on a bunch more matrix types

Author: oxinabox

test/affprop.jl

@@ -6,6 +6,7 @@ using Clustering
 using LinearAlgebra
 using Random
 using Statistics
+include("test_helpers.jl")
 
 @testset "affinityprop() (affinity propagation)" begin
     @testset "Argument checks" begin
@@ -47,11 +48,10 @@ using Statistics
     end
 
     @testset "Support for arrays other than Matrix{T}" begin
-        R2 = affinityprop(@view S[:,:])  # run on complete subarray
-        @test R2.assignments == R.assignments
-
-        R3 = affinityprop(Symmetric(S))  # run on complete subarray
-        @test R3.assignments == R.assignments
+        @testset "$(typeof(M))" for M in equivalent_matrices(S)
+            R2 = affinityprop(M)
+            @test R2.assignments == R.assignments
+        end
     end
 
     #= compare with python result

test/dbscan.jl

@@ -1,6 +1,7 @@
 using Test
 using Clustering
 using Distances
+include("test_helpers.jl")
 
 @testset "dbscan() (DBSCAN clustering)" begin
 
@@ -37,11 +38,10 @@ end
 @test all(R.counts .>= 180)
 
 @testset "Support for arrays other than Matrix{T}" begin
-    R2 = dbscan(@view(D[:,:]), 1.0, 10)  # run on complete subarray
-    @test R2.assignments == R.assignments
-
-    R3 = dbscan(Symmetric(D), 1.0, 10)  # run on complete subarray
-    @test R3.assignments == R.assignments
+    @testset "$(typeof(M))" for M in equivalent_matrices(D)
+        R2 = dbscan(M, 1.0, 10)  # run on complete subarray
+        @test R2.assignments == R.assignments
+    end
 end
 
 @testset "normal points" begin

test/kmedoids.jl

@@ -1,7 +1,7 @@
 using Test
-
 using Distances
 using Clustering
+include("test_helpers.jl")
 
 @testset "kmedoids() (k-medoids)" begin
 
@@ -41,13 +41,11 @@ R = kmedoids(dist, k)
 @test R.converged
 
 @testset "Support for arrays other than Matrix{T}" begin
-    Random.seed!(34568)  # restore seed as kmedoids is not determantistic
-    R2 = kmedoids(@view(dist[:,:]), k)  # run on complete subarray
-    @test R2.assignments == R.assignments
-
-    Random.seed!(34568)  # restore seed as kmedoids is not determantistic
-    R3 = kmedoids(Symmetric(dist), k)  # run on complete subarray
-    @test R3.assignments == R.assignments
+    @testset "$(typeof(M))" for M in equivalent_matrices(dist)
+        Random.seed!(34568)  # restore seed as kmedoids is not determantistic
+        R2 = kmedoids(M, k)
+        @test R2.assignments == R.assignments
+    end
 end
 
 # k=1 and k=n cases

test/test_helpers.jl

@@ -0,0 +1,24 @@
+using LinearAlgebra
+using SparseArrays
+
+"""
+    equivalent_matrices(x::AbstractMatrix)
+
+Returns a collection of matrixes that are equal to the input `x`, but of a different type.
+Useful for testing if things still work on different types of matrix.
+"""
+function equivalent_matrices(x::AbstractMatrix)
+    mats = [
+        Base.PermutedDimsArray(x, (1,2)),  # identity permutation
+        view(x, :, :),
+        view(x, collect.(axes(x))...),  # breaks `strides`
+        sparse(x),
+    ]
+    if issymmetric(x)
+        append!(mats, [
+            Symmetric(x),
+            Transpose(x),
+        ])
+    end
+    return mats
+end