Merge pull request #5 from gridap/add/convert

Sparse matrices conversion using convert method

Author: victorsndvg

src/SparseMatricesCSR.jl

@@ -24,14 +24,15 @@ This module contains:
     + `nzrange`: Return the range of indices for a particular row or column (Depending on the SparseMatrix type)
     + `findnz`: Return a tuple (I, J, V) where I and J are the row and column indices.
     + `rowvals`: Return row indices or raises an error (Depending on the SparseMatrix type)
+    + `convert`: Type conversion
 
 """
 module SparseMatricesCSR
 
 using SparseArrays
 using LinearAlgebra
 
-import Base: size, getindex, show, count, *
+import Base: convert, size, getindex, show, count, *
 import LinearAlgebra: mul!
 import SparseArrays: nnz, getnzval, nonzeros, nzrange, findnz, rowvals
 

src/SparseMatrixCSR.jl

@@ -285,3 +285,41 @@ getptr(S::SparseMatrixCSR) = S.rowptr
 Return column indices.
 """
 getindices(S::SparseMatrixCSR) = colvals(S)
+
+
+"""
+    function convert(::Type{SparseMatrixCSR}, x::AbstractSparseMatrix)
+
+Convert x to a value of type SymSparseMatrixCSR.
+"""
+convert(::Type{SparseMatrixCSR}, x::AbstractSparseMatrix)  = convert(SparseMatrixCSR{1}, x)
+
+function convert(::Type{SparseMatrixCSR{Bi}}, x::SparseMatrixCSR{Bj}) where {Bi,Bj}
+    if Bi == Bj
+        return x
+    else
+        return SparseMatrixCSR{Bi}( x.m, 
+                                    x.n, 
+                                    copy(getptr(x)).-x.offset, 
+                                    copy(getindices(x)).-x.offset, 
+                                    copy(nonzeros(x)))
+    end
+end
+
+function convert(::Type{SparseMatrixCSR{Bi}}, x::SparseMatrixCSC) where {Bi}
+    A = sparse(transpose(x))
+    (m, n) = size(A)
+    return SparseMatrixCSR{Bi}(m, n, getptr(A), getindices(A), nonzeros(A))
+end
+
+"""
+    function convert(::Type{SparseMatrixCSC}, x::SparseMatrixCSR)
+
+Convert x to a value of type SparseMatrixCSC.
+"""
+function convert(::Type{SparseMatrixCSC}, x::SparseMatrixCSR{Bi}) where {Bi}
+    A = sparse(transpose(x))
+    (m, n) = size(A)
+    return SparseMatrixCSR{Bi}(m, n, getptr(A), getindices(A), nonzeros(A))
+end
+

src/SymSparseMatrixCSR.jl

@@ -214,3 +214,17 @@ Return column indices.
 """
 getindices(S::SymSparseMatrixCSR) = colvals(S)
 
+"""
+    function convert(::Type{SymSparseMatrixCSR}, x::SymSparseMatrixCSR)
+
+Convert x to a value of type SymSparseMatrixCSR.
+"""
+convert(::Type{SymSparseMatrixCSR}, x::SymSparseMatrixCSR)  = convert(SymSparseMatrixCSR{1}, x)
+
+function convert(::Type{SymSparseMatrixCSR{Bi}}, x::SymSparseMatrixCSR{Bj}) where {Bi,Bj}
+    if Bi == Bj
+        return x
+    else
+        return SymSparseMatrixCSR(convert(SparseMatrixCSR{Bi}, x.uppertrian))
+    end
+end

test/SparseMatrixCSC.jl

@@ -13,7 +13,9 @@
         finalize_coo!(I,J,V,maxcols,maxrows)
         CSC = sparse(I, J, V, maxcols,maxrows)
 
-        @test hasrowmajororder(CSC) == false
+        @test convert(SparseMatrixCSC, CSC) === CSC
+
+        @test hasrowmajororder(CSC)  == false
         @test hascolmajororder(CSC) == true
         @test getptr(CSC)           == CSC.colptr
         @test getindices(CSC)       == rowvals(CSC)

test/SparseMatrixCSR.jl

@@ -15,7 +15,16 @@
             CSC = sparse(I, J, V, maxrows,maxcols)
             CSR = sparsecsr(SparseMatrixCSR{Bi},I, J, V,maxrows,maxcols)
 
+            display(CSR)
+
             @test CSC == CSR
+
+            @test convert(SparseMatrixCSR{Bi}, CSR) === CSR
+
+            CSRC = convert(SparseMatrixCSR{CSR.offset}, CSR)
+            @test CSRC == CSR
+            @test CSRC !== CSR
+
             @test nnz(CSC) == count(!iszero, CSC) == nnz(CSR) == count(!iszero, CSR)
 
             @test hasrowmajororder(CSR) == true

test/SymSparseMatrixCSR.jl

@@ -18,6 +18,12 @@
             @test size(SYMCSC)==size(SYMCSR)
             @test SYMCSC == SYMCSR
 
+            @test convert(SymSparseMatrixCSR{Bi}, SYMCSR) === SYMCSR
+
+            SYMCSRC = convert(SymSparseMatrixCSR{SYMCSR.uppertrian.offset}, SYMCSR)
+            @test SYMCSRC == SYMCSR
+            @test SYMCSRC !== SYMCSR
+
             @test hasrowmajororder(SYMCSR) == true
             @test hascolmajororder(SYMCSR) == false
             @test getptr(SYMCSR)           == SYMCSR.uppertrian.rowptr