Merge pull request #17 from gridap/rmul

Added rmul! and fixed return value of fillstored!

Author: fverdugo

NEWS.md

@@ -4,11 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.5] - 2021.10.20
+
+### Fixed
+- Return value of `LinearAlbegra.fillstored!`.
+
+### Added
+- Implemented `LinearAlbegra.rmul!`.
 
 ## [0.6.4] - 2021.10.20
 
 ### Added
 - Implemented `LinearAlbegra.fillstored!`.
 
-
 *Previous releases are not included in this Changelog*

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.4"
+version = "0.6.5"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/SparseMatrixCSR.jl

@@ -122,6 +122,12 @@ _copy_and_increment(x) = copy(x) .+ 1
 
 function LinearAlgebra.fillstored!(a::SparseMatrixCSR,v)
   fill!(a.nzval,v)
+  a
+end
+
+function LinearAlgebra.rmul!(a::SparseMatrixCSR,v::Number)
+  rmul!(a.nzval,v)
+  a
 end
 
 function LinearAlgebra.lu(a::SparseMatrixCSR{0})

src/SymSparseMatrixCSR.jl

@@ -142,6 +142,12 @@ count(S::SymSparseMatrixCSR) = count(i->true, S)
 
 function LinearAlgebra.fillstored!(a::SymSparseMatrixCSR,v)
   LinearAlgebra.fillstored!(a.uppertrian,v)
+  a
+end
+
+function LinearAlgebra.rmul!(a::SymSparseMatrixCSR,v::Number)
+  LinearAlgebra.rmul!(a.uppertrian,v)
+  a
 end
 
 function mul!(y::AbstractVector,A::SymSparseMatrixCSR,v::AbstractVector, α::Number, β::Number)

test/SparseMatrixCSR.jl

@@ -82,12 +82,18 @@ function test_csr(Bi,Tv,Ti)
   mul!(z,CSC,x,1,2)
   @test y ≈ z
 
-  LinearAlgebra.fillstored!(CSR,3.33)
+  out = LinearAlgebra.fillstored!(CSR,3.33)
+  @test out === CSR
   LinearAlgebra.fillstored!(CSC,3.33)
   mul!(y,CSR,x)
   mul!(z,CSC,x)
   @test y ≈ z
 
+  _CSR = copy(CSR)
+  out = LinearAlgebra.rmul!(CSR,-1)
+  @test out === CSR
+  @test _CSR ≈ -1*CSR
+
 end
 
 function test_lu(Bi,I,J,V)

test/SymSparseMatrixCSR.jl

@@ -78,12 +78,18 @@ function test_csr(Bi,Tv,Ti)
 
   @test CSR*x ≈ CSC*x
 
-  LinearAlgebra.fillstored!(CSR,3.33)
+  out = LinearAlgebra.fillstored!(CSR,3.33)
+  @test out === CSR
   LinearAlgebra.fillstored!(CSC,3.33)
   mul!(y,CSR,x)
   mul!(z,CSC,x)
   @test y ≈ z
 
+  _CSR = copy(CSR)
+  out = LinearAlgebra.rmul!(CSR,-1)
+  @test out === CSR
+  @test _CSR ≈ -1*CSR
+
 end
 
 for Bi in (0,1)