Merge pull request #8 from gridap/implement_convert

Implement convert

Author: fverdugo

Project.toml

@@ -1,7 +1,7 @@
 name = "SparseMatricesCSR"
 uuid = "a0a7dd2c-ebf4-11e9-1f05-cf50bc540ca1"
 authors = ["Víctor Sande <vsande@cimne.upc.edu>","Francesc Verdugo <fverdugo@cimne.upc.edu>"]
-version = "0.6.0"
+version = "0.6.1"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/SparseMatrixCSR.jl

@@ -87,6 +87,33 @@ sparsecsr(::Val{Bi},I,J,V,m,n) where Bi = SparseMatrixCSR{Bi}(transpose(sparse(J
 sparsecsr(::Val{Bi},I,J,V,m,n,combine) where Bi = SparseMatrixCSR{Bi}(transpose(sparse(J,I,V,n,m,combine)))
 dimlub(I) = isempty(I) ? 0 : Int(maximum(I))
 
+Base.convert(::Type{T},a::T) where T<:SparseMatrixCSR = a
+function Base.convert(
+  ::Type{SparseMatrixCSR{Bi,Tv,Ti}},a::SparseMatrixCSR{Bi}) where {Bi,Tv,Ti}
+  rowptr = convert(Vector{Ti},a.rowptr)
+  colval = convert(Vector{Ti},a.colval)
+  nzval = convert(Vector{Tv},a.nzval)
+  SparseMatrixCSR{Bi}(a.m,a.n,rowptr,colval,nzval)
+end
+function Base.convert(
+  ::Type{SparseMatrixCSR{Bi,Tv,Ti}},a::SparseMatrixCSR{Bj}) where {Bi,Tv,Ti,Bj}
+  rowptr = Vector{Ti}(undef,length(a.rowptr))
+  colval = Vector{Ti}(undef,length(a.colval))
+  rowptr .= a.rowptr .+ (Bi-Bj)
+  colval .= a.colval .+ (Bi-Bj)
+  nzval = convert(Vector{Tv},a.nzval)
+  SparseMatrixCSR{Bi}(a.m,a.n,rowptr,colval,nzval)
+end
+function Base.convert(
+  ::Type{SparseMatrixCSR{Bi,Tv,Ti}},a::Transpose{Tu,<:SparseMatrixCSC} where Tu) where {Bi,Tv,Ti}
+  convert(SparseMatrixCSR{Bi,Tv,Ti},SparseMatrixCSR{Bi}(a))
+end
+function Base.convert(
+  ::Type{SparseMatrixCSR{Bi,Tv,Ti}},a::AbstractMatrix) where {Bi,Tv,Ti}
+  at = convert(SparseMatrixCSC{Tv,Ti},transpose(a))
+  convert(SparseMatrixCSR{Bi,Tv,Ti},transpose(at))
+end
+
 size(S::SparseMatrixCSR) = (S.m, S.n)
 IndexStyle(::Type{<:SparseMatrixCSR}) = IndexCartesian()
 function getindex(A::SparseMatrixCSR{Bi,T}, i0::Integer, i1::Integer) where {Bi,T}

src/SymSparseMatrixCSR.jl

@@ -187,3 +187,9 @@ function show(io::IO, ::MIME"text/plain", S::SymSparseMatrixCSR)
 end
 show(io::IO, S::SymSparseMatrixCSR) = show(io, S.uppertrian)
 
+Base.convert(::Type{T},a::T) where T<:SymSparseMatrixCSR = a
+function Base.convert(
+  ::Type{SymSparseMatrixCSR{Bi,Tv,Ti}},a::SymSparseMatrixCSR) where {Bi,Tv,Ti}
+  utrian = convert(SparseMatrixCSR{Bi,Tv,Ti},a.uppertrian)
+  SymSparseMatrixCSR(utrian)
+end

test/SparseMatrixCSR.jl

@@ -38,6 +38,15 @@ function test_csr(Bi,Tv,Ti)
   CSR = sparsecsr(Val(Bi),I,J,V,maxrows,maxcols)
   @test CSR == CSC
 
+  CSR2 = convert(typeof(CSR),CSR)
+  @test CSR2 === CSR
+  CSR2 = convert(SparseMatrixCSR{0,Float64,Int32},CSR)
+  @test CSR2 == CSR
+  CSR2 = convert(SparseMatrixCSR{0,Float64,Int32},CSC)
+  @test CSR2 == CSC
+  CSR2 = convert(SparseMatrixCSR{0,Float64,Int32},collect(CSC))
+  @test CSR2 == CSC
+
   @test size(CSR) == size(CSC)
   @test eltype(CSR) == Tv
   @test isa(CSR,SparseMatrixCSR{Bi,Tv,Ti})

test/SymSparseMatrixCSR.jl

@@ -1,4 +1,4 @@
-module SparseMatrixCSRTests
+module SymSparseMatrixCSRTests
 
 using Test
 using SparseMatricesCSR
@@ -45,6 +45,11 @@ function test_csr(Bi,Tv,Ti)
   CSR = symsparsecsr(Val(Bi),copy(I),copy(J),copy(V),maxrows,maxcols;symmetrize=true)
   @test CSR == CSC
 
+  CSR2 = convert(typeof(CSR),CSR)
+  @test CSR2 === CSR
+  CSR2 = convert(SymSparseMatrixCSR{0,Float64,Int32},CSR)
+  @test CSR2 == CSR
+
   @test size(CSR) == size(CSC)
   @test eltype(CSR) == Tv
   @test isa(CSR,SymSparseMatrixCSR{Bi,Tv,Ti})