Allow preconditioner creation directly from CSC Matrix

Rename AbstractPreconditioner to AbstractExtendablePreconditioner

Author: j-fu

Project.toml

@@ -1,7 +1,7 @@
 name = "ExtendableSparse"
 uuid = "95c220a8-a1cf-11e9-0c77-dbfce5f500b3"
 authors = ["Juergen Fuhrmann <juergen.fuhrmann@wias-berlin.de>"]
-version = "0.2.4"
+version = "0.2.5"
 
 [deps]
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"

src/ExtendableSparse.jl

@@ -9,7 +9,7 @@ include("preconditioners.jl")
 include("sprand.jl")
 
 export SparseMatrixLNK,ExtendableSparseMatrix,flush!,nnz, sprand!,sprand_sdd!
-export JacobiPreconditioner, ILU0Preconditioner
+export JacobiPreconditioner, ILU0Preconditioner, update!
 
 export colptrs
 end # module

src/ilu0.jl

@@ -1,4 +1,4 @@
-mutable struct ILU0Preconditioner{Tv, Ti} <: AbstractPreconditioner{Tv,Ti}
+mutable struct ILU0Preconditioner{Tv, Ti} <: AbstractExtendablePreconditioner{Tv,Ti}
     extmatrix::ExtendableSparseMatrix{Tv,Ti}
     xdiag::Array{Tv,1}
     idiag::Array{Ti,1}
@@ -16,6 +16,9 @@ function ILU0Preconditioner(extmatrix::ExtendableSparseMatrix{Tv,Ti}) where {Tv,
     update!(precon)
 end
 
+ILU0Preconditioner(cscmatrix::SparseMatrixCSC{Tv,Ti}) where {Tv,Ti}=ILU0Preconditioner(ExtendableSparseMatrix(cscmatrix))
+
+
 function update!(precon::ILU0Preconditioner{Tv,Ti}) where {Tv,Ti}
     cscmatrix=precon.extmatrix.cscmatrix
     colptr=cscmatrix.colptr

src/jacobi.jl

@@ -1,4 +1,4 @@
-struct JacobiPreconditioner{Tv, Ti} <: AbstractPreconditioner{Tv,Ti}
+struct JacobiPreconditioner{Tv, Ti} <: AbstractExtendablePreconditioner{Tv,Ti}
     extmatrix::ExtendableSparseMatrix{Tv,Ti}
     invdiag::Array{Tv,1}
 end
@@ -21,6 +21,8 @@ function JacobiPreconditioner(extmatrix::ExtendableSparseMatrix{Tv,Ti}) where {T
     update!(precon)
 end
 
+JacobiPreconditioner(cscmatrix::SparseMatrixCSC{Tv,Ti}) where {Tv,Ti}=JacobiPreconditioner(ExtendableSparseMatrix(cscmatrix))
+
 
 function  LinearAlgebra.ldiv!(u::AbstractArray{T,1} where T, precon::JacobiPreconditioner, v::AbstractArray{T,1} where T)
     invdiag=precon.invdiag

src/preconditioners.jl

@@ -1,7 +1,28 @@
-abstract type AbstractPreconditioner{Tv,Ti} end
+"""
+  Abstract type for an extendabe preconditoioner working together
+  with ExtandableSparseMatrix. 
+  Still beta, so not in the published documentation.
+  
+  Any such preconditioner should have the following fields
+````
+  extmatrix
+  pattern_timestamp
+````
+and  methods
+````
+  update!(precon)
+````   
+  The idea is that, depending if the matrix pattern has changed, 
+  different steps are needed to update the preconditioner.
 
-need_symbolic_update(precon::AbstractPreconditioner)=precon.extmatrix.pattern_timestamp>precon.pattern_timestamp
-timestamp!(precon::AbstractPreconditioner)= precon.pattern_timestamp=time()
+  Moreover, they have the ExtendableSparseMatrix as a field, ensuring 
+  consistency after construction.
+"""
+abstract type AbstractExtendablePreconditioner{Tv,Ti} end
+
+need_symbolic_update(precon::AbstractExtendablePreconditioner)=precon.extmatrix.pattern_timestamp>precon.pattern_timestamp
+timestamp!(precon::AbstractExtendablePreconditioner)= precon.pattern_timestamp=time()
 
 include("jacobi.jl")
 include("ilu0.jl")
+