kalmar/PropertyT.jl
1
0
Fork 0
mirror of https://github.com/kalmarek/PropertyT.jl.git synced 2024-11-26 09:00:28 +01:00
Code Issues Releases Wiki Activity

separate section for sparsification

Browse Source
This commit is contained in:
kalmarek 2018-09-05 09:10:58 +02:00
parent 613c12e157
commit d02d80adb7
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/Orbit-wise.jl
View File

@ -27,46 +27,11 @@ end
include("OrbitDecomposition.jl") include("OrbitDecomposition.jl")
dens(M::SparseMatrixCSC) = nnz(M)/length(M)
dens(M::AbstractArray) = countnz(M)/length(M)
function sparsify!{Tv,Ti}(M::SparseMatrixCSC{Tv,Ti}, eps=eps(Tv); verbose=false)
densM = dens(M)
for i in eachindex(M.nzval)
if abs(M.nzval[i]) < eps
M.nzval[i] = zero(Tv)
end
end
dropzeros!(M)
if verbose
info("Sparsified density:", rpad(densM, 20), " → ", rpad(dens(M), 20), " ($(nnz(M)) non-zeros)")
end
return M
end end
function sparsify!{T}(M::AbstractArray{T}, eps=eps(T); verbose=false)
densM = dens(M)
if verbose
info("Sparsifying $(size(M))-matrix... ")
end
for n in eachindex(M)
if abs(M[n]) < eps
M[n] = zero(T)
end
end
if verbose
info("$(rpad(densM, 20)) → $(rpad(dens(M),20))), ($(countnz(M)) non-zeros)")
end
return sparse(M)
end
sparsify{T}(U::AbstractArray{T}, tol=eps(T); verbose=false) = sparsify!(deepcopy(U), tol, verbose=verbose)
function constrLHS(m::JuMP.Model, cnstr, Us, Ust, dims, vars, eps=100*eps(1.0)) function constrLHS(m::JuMP.Model, cnstr, Us, Ust, dims, vars, eps=100*eps(1.0))
M = [PropertyT.sparsify!(dims[π].*Ust[π]*cnstr*Us[π], eps) for π in 1:endof(Us)] M = [PropertyT.sparsify!(dims[π].*Ust[π]*cnstr*Us[π], eps) for π in 1:endof(Us)]
@ -136,14 +101,49 @@ function save_preps(fname::String, preps)
end end
###############################################################################
#
# Sparsification
#
###############################################################################
dens(M::SparseMatrixCSC) = nnz(M)/length(M)
dens(M::AbstractArray) = countnz(M)/length(M)
function sparsify!{Tv,Ti}(M::SparseMatrixCSC{Tv,Ti}, eps=eps(Tv); verbose=false)
densM = dens(M)
for i in eachindex(M.nzval)
if abs(M.nzval[i]) < eps
M.nzval[i] = zero(Tv)
end
end
dropzeros!(M)
if verbose
info("Sparsified density:", rpad(densM, 20), " → ", rpad(dens(M), 20), " ($(nnz(M)) non-zeros)")
end end
return M
end
end end
function sparsify!{T}(M::AbstractArray{T}, eps=eps(T); verbose=false)
densM = dens(M)
if verbose
info("Sparsifying $(size(M))-matrix... ")
end
for n in eachindex(M)
if abs(M[n]) < eps
M[n] = zero(T)
end
end
if verbose
info("$(rpad(densM, 20)) → $(rpad(dens(M),20))), ($(countnz(M)) non-zeros)")
end
return sparse(M)
end
sparsify{T}(U::AbstractArray{T}, tol=eps(T); verbose=false) = sparsify!(deepcopy(U), tol, verbose=verbose)