Merge pull request #15251 from martinholters/sparsesqueeze

squeeze for sparse matrices
JuliaLang · Feb 26, 2016 · 009cede · 009cede
2 parents 026fa10 + 7c54abd
commit 009cede
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/base/sparse/sparsematrix.jl b/base/sparse/sparsematrix.jl
@@ -2910,8 +2910,6 @@ function blkdiag(X::SparseMatrixCSC...)
     SparseMatrixCSC(m, n, colptr, rowval, nzval)
 end
 
-squeeze(S::SparseMatrixCSC, dims::Dims) = throw(ArgumentError("squeeze is not available for sparse matrices"))
-
 ## Structure query functions
 issym(A::SparseMatrixCSC) = is_hermsym(A, IdFun())
 

diff --git a/test/sparsedir/sparse.jl b/test/sparsedir/sparse.jl
@@ -81,6 +81,18 @@ a116[p, p] = reshape(1:9, 3, 3)
 s116[p, p] = reshape(1:9, 3, 3)
 @test a116 == s116
 
+# squeeze
+for i = 1:5
+    am = sprand(20, 1, 0.2)
+    av = squeeze(am, 2)
+    @test ndims(av) == 1
+    @test all(av.==am)
+    am = sprand(1, 20, 0.2)
+    av = squeeze(am, 1)
+    @test ndims(av) == 1
+    @test all(av.'.==am)
+end
+
 # matrix-vector multiplication (non-square)
 for i = 1:5
     a = sprand(10, 5, 0.5)