Improve cache, support FillArrays v0.7 (#52)

Author: dlfivefifty

Project.toml

@@ -9,7 +9,7 @@ MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [compat]
-FillArrays = "0.6.3"
+FillArrays = "0.6.3,0.7"
 MacroTools = "0.4.5,0.5"
 StaticArrays = "0.8,0.9,0.10,0.11"
 julia = "1"

src/cache.jl

@@ -54,6 +54,18 @@ end
     v
 end
 
+_maximum(ax, I) = maximum(I)
+_maximum(ax, ::Colon) = maximum(ax)
+function getindex(A::CachedArray, I...)
+    resizedata!(A, _maximum.(axes(A), I)...)
+    A.data[I...]
+end
+
+function getindex(A::CachedArray, I::CartesianIndex)
+    resizedata!(A, Tuple(I)...)
+    A.data[I]
+end
+
 
 ## Array caching
 
@@ -81,3 +93,9 @@ function resizedata!(B::CachedArray{T,N,Array{T,N}},nm::Vararg{Integer,N}) where
 
     B
 end
+
+colsupport(A::CachedMatrix, i) = colsupport(A.array, i)
+rowsupport(A::CachedMatrix, i) = 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)

src/linalg/mul.jl

@@ -174,7 +174,7 @@ MulLayout(layouts) = ApplyLayout(*, layouts)
 
 
 _flatten(A::MulArray, B...) = _flatten(A.applied, B...)
-flatten(A::MulArray) = ApplyArray(*, flatten(A.applied))	
+flatten(A::MulArray) = ApplyArray(flatten(A.applied))	
 
 *(A::MulMatrix, B::MulMatrix) = ApplyArray(*, A.args..., B.args...)
 *(A::MulMatrix, B::MulVector) = ApplyArray(*, A.args..., B.args...)

test/runtests.jl

@@ -123,6 +123,8 @@ end
     LazyArrays.resizedata!(C,8,8,8)
     @test all(C.data .=== Array(A)[1:8,1:8,1:8])
 
+    @test C[1:3,1,:] == A[1:3,1,:]
+
     A = collect(1:5)
     C = cache(A)
     @test C isa Vector{Int}