kalmar/PropertyT.jl
1
0
Fork 0
mirror of https://github.com/kalmarek/PropertyT.jl.git synced 2024-07-17 10:55:30 +02:00
Code Issues Releases Wiki Activity

rework sparsify! Remove rank check which becomes very expensive

Browse Source 
We check that the sizes of projection matrices add-up anyway
This commit is contained in:
kalmarek 2018-07-31 10:18:03 +02:00
parent 1ca77f1f19
commit d3a228cfa7
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Orbit-wise.jl
View File

@ -42,7 +42,7 @@ function OrbitData(sett::Settings)
Uπs = load(filename(prepath(sett), :Uπs), "Uπs") Uπs = load(filename(prepath(sett), :Uπs), "Uπs")
nzros = [i for i in 1:length(Uπs) if size(Uπs[i],2) !=0] nzros = [i for i in 1:length(Uπs) if size(Uπs[i],2) !=0]
Uπs = Uπs[nzros] Uπs = Uπs[nzros]
Uπs = sparsify!.(Uπs, sett.tol, check=true, verbose=true) Uπs = map(x -> sparsify!(x, sett.tol, verbose=true), Uπs)
#dimensions of the corresponding πs: #dimensions of the corresponding πs:
dims = load(filename(prepath(sett), :Uπs), "dims")[nzros] dims = load(filename(prepath(sett), :Uπs), "dims")[nzros]
@ -64,11 +64,10 @@ end
include("OrbitDecomposition.jl") include("OrbitDecomposition.jl")
dens(M::SparseMatrixCSC) = length(M.nzval)/length(M) dens(M::SparseMatrixCSC) = nnz(M)/length(M)
dens(M::AbstractArray) = length(findn(M)[1])/length(M) dens(M::AbstractArray) = countnz(M)/length(M)
function sparsify!{Tv,Ti}(M::SparseMatrixCSC{Tv,Ti}, eps=eps(Tv); verbose=false) function sparsify!{Tv,Ti}(M::SparseMatrixCSC{Tv,Ti}, eps=eps(Tv); verbose=false)
n = nnz(M)
densM = dens(M) densM = dens(M)
for i in eachindex(M.nzval) for i in eachindex(M.nzval)
@ -77,32 +76,34 @@ function sparsify!{Tv,Ti}(M::SparseMatrixCSC{Tv,Ti}, eps=eps(Tv); verbose=false)
end end
end end
dropzeros!(M) dropzeros!(M)
m = nnz(M)
if verbose if verbose
info("Sparsified density:", rpad(densM, 20), " → ", rpad(dens(M), 20)) info("Sparsified density:", rpad(densM, 20), " → ", rpad(dens(M), 20), " ($(nnz(M)) non-zeros)")
end end
return M return M
end end
function sparsify!{T}(M::AbstractArray{T}, eps=eps(T); check=false, verbose=false) function sparsify!{T}(M::AbstractArray{T}, eps=eps(T); verbose=false)
densM = dens(M) densM = dens(M)
rankM = rank(M) if verbose
M[abs.(M) .< eps] .= zero(T) info("Sparsifying $(size(M))-matrix... ")
end
if check && rankM != rank(M) for n in eachindex(M)
warn("Sparsification decreased the rank!") if abs(M[n]) < eps
M[n] = zero(T)
end
end end
if verbose if verbose
info("Sparsified density:", rpad(densM, 20), " → ", rpad(dens(M),20)) info("$(rpad(densM, 20)) → $(rpad(dens(M),20))), ($(countnz(M)) non-zeros)")
end end
return sparse(M) return sparse(M)
end end
sparsify{T}(U::AbstractArray{T}, tol=eps(T); check=true, verbose=false) = sparsify!(deepcopy(U), tol, check=check, verbose=verbose) sparsify{T}(U::AbstractArray{T}, tol=eps(T); verbose=false) = sparsify!(deepcopy(U), tol, verbose=verbose)
function transform(U::AbstractArray, V::AbstractArray; sparse=true) function transform(U::AbstractArray, V::AbstractArray; sparse=true)
if sparse if sparse