sparse printing for triu (#74)

* sparse printing for triu

* LazyArrayStyle for LazyLayout

Author: dlfivefifty

src/LazyArrays.jl

@@ -30,7 +30,7 @@ import Base: AbstractArray, AbstractMatrix, AbstractVector,
       AbstractArray, AbstractVector, axes, (:), _sub2ind_recurse, broadcast, promote_eltypeof,
       similar, @_gc_preserve_end, @_gc_preserve_begin,
       @nexprs, @ncall, @ntuple, tuple_type_tail,
-      all, any, isbitsunion, issubset
+      all, any, isbitsunion, issubset, replace_in_print_matrix, replace_with_centered_mark
 
 import Base.Broadcast: BroadcastStyle, AbstractArrayStyle, Broadcasted, broadcasted,
                         combine_eltypes, DefaultArrayStyle, instantiate, materialize,

src/cache.jl

@@ -151,8 +151,8 @@ colsupport(A::CachedVector, i) =
 rowsupport(A::CachedMatrix, i) = 
     minimum(i) ≤ A.datasize[1] ? convexunion(rowsupport(A.array, i),rowsupport(A.data,i) ∩ Base.OneTo(A.datasize[2])) : rowsupport(A.array, i)
 
-Base.replace_in_print_matrix(A::CachedMatrix, i::Integer, j::Integer, s::AbstractString) =
-    i in colsupport(A,j) ? s : Base.replace_with_centered_mark(s)
+replace_in_print_matrix(A::CachedMatrix, i::Integer, j::Integer, s::AbstractString) =
+    i in colsupport(A,j) ? s : replace_with_centered_mark(s)
 
 
 ###

src/lazyapplying.jl

@@ -243,11 +243,12 @@ function show(io::IO, A::Applied)
     print(io, ')')
 end
 
-applybroadcaststyle(_1, _2) = DefaultArrayStyle{2}()
+applybroadcaststyle(::Type{<:AbstractArray{<:Any,N}}, _2) where N = DefaultArrayStyle{N}()
+applybroadcaststyle(::Type{<:AbstractArray{<:Any,N}}, ::LazyLayout) where N = LazyArrayStyle{N}()
 BroadcastStyle(M::Type{<:ApplyArray}) = applybroadcaststyle(M, MemoryLayout(M))
 
-Base.replace_in_print_matrix(A::LazyMatrix, i::Integer, j::Integer, s::AbstractString) =
-    i in colsupport(A,j) ? s : Base.replace_with_centered_mark(s)
+replace_in_print_matrix(A::LazyMatrix, i::Integer, j::Integer, s::AbstractString) =
+    i in colsupport(A,j) ? s : replace_with_centered_mark(s)
 
 ### 
 # Number special cases
@@ -300,4 +301,15 @@ for tri in (:tril, :triu)
         ndims(::Applied{<:Any,typeof($tri)}) = 2
         eltype(A::Applied{<:Any,typeof($tri)}) = eltype(first(A.args))
     end
-end
+end
+
+getindex(A::ApplyMatrix{T,typeof(triu),<:Tuple{<:AbstractMatrix}}, k::Integer, j::Integer) where T = 
+    j ≥ k ? A.args[1][k,j] : zero(T)
+
+getindex(A::ApplyMatrix{T,typeof(triu),<:Tuple{<:AbstractMatrix,<:Integer}}, k::Integer, j::Integer) where T = 
+    j ≥ k+A.args[2] ? A.args[1][k,j] : zero(T)    
+
+replace_in_print_matrix(A::ApplyMatrix{<:Any,typeof(triu),<:Tuple{<:AbstractMatrix}}, i::Integer, j::Integer, s::AbstractString) =
+    j ≥ i ? replace_in_print_matrix(A.args[1], i, j, s) : replace_with_centered_mark(s)
+replace_in_print_matrix(A::ApplyMatrix{<:Any,typeof(triu),<:Tuple{<:AbstractMatrix,<:Integer}}, i::Integer, j::Integer, s::AbstractString) =
+    j ≥ i+A.args[2] ? replace_in_print_matrix(A.args[1], i, j, s) : replace_with_centered_mark(s)    

src/lazyconcat.jl

@@ -619,3 +619,17 @@ materialize!(M::MatMulMatAdd{<:AbstractColumnMajor,<:ApplyLayout{typeof(vcat)}})
     materialize!(MulAdd(M.α,M.A,Array(M.B),M.β,M.C))
 materialize!(M::MatMulVecAdd{<:AbstractColumnMajor,<:ApplyLayout{typeof(vcat)}}) = 
     materialize!(MulAdd(M.α,M.A,Array(M.B),M.β,M.C))    
+
+
+## print
+
+function replace_in_print_matrix(f::Vcat{<:Any,1}, k::Integer, j::Integer, s::AbstractString)
+    @assert j == 1
+    κ = k
+    for A in f.args
+        n = length(A)
+        κ ≤ n && return replace_in_print_matrix(A, κ, 1, s)
+        κ -= n
+    end
+    throw(BoundsError(f, k))
+end