Support setindex!/fill! when value is consistent (#69)

* Support setindex!/fill! when value is consistent

* v0.6.4

* Add fill! test

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "FillArrays"
 uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
-version = "0.6.3"
+version = "0.6.4"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/FillArrays.jl

@@ -4,9 +4,9 @@ using LinearAlgebra, SparseArrays
 import Base: size, getindex, setindex!, IndexStyle, checkbounds, convert,
     +, -, *, /, \, diff, sum, cumsum, maximum, minimum, sort, sort!,
     any, all, axes, isone, iterate, unique, allunique, permutedims, inv,
-    copy, vec
+    copy, vec, setindex!
 
-import LinearAlgebra: rank, svdvals!, tril, triu, tril!, triu!, diag, transpose, adjoint
+import LinearAlgebra: rank, svdvals!, tril, triu, tril!, triu!, diag, transpose, adjoint, fill!
 
 import Base.Broadcast: broadcasted, DefaultArrayStyle, broadcast_shape
 
@@ -27,6 +27,23 @@ end
     getindex_value(F)
 end
 
+@inline function setindex!(F::AbstractFill, v, k::Integer)
+    @boundscheck checkbounds(F, k)
+    v == getindex_value(F) || throw(ArgumentError("Cannot setindex! to $v for an AbstractFill with value $(getindex_value(F))."))
+    F
+end
+
+@inline function setindex!(F::AbstractFill{T, N}, v, kj::Vararg{<:Integer, N}) where {T, N}
+    @boundscheck checkbounds(F, kj...)
+    v == getindex_value(F) || throw(ArgumentError("Cannot setindex! to $v for an AbstractFill with value $(getindex_value(F))."))
+    F
+end
+
+@inline function fill!(F::AbstractFill, v)
+    v == getindex_value(F) || throw(ArgumentError("Cannot fill! with $v an AbstractFill with value $(getindex_value(F))."))
+    F
+end
+
 rank(F::AbstractFill) = iszero(getindex_value(F)) ? 0 : 1
 IndexStyle(::Type{<:AbstractFill{<:Any,N,<:NTuple{N,Base.OneTo{Int}}}}) where N = IndexLinear()
 

test/runtests.jl

@@ -722,3 +722,25 @@ end
     @test Fill([1+im 2; 3 4; 5 6], 2,3)' == Fill([1+im 2; 3 4; 5 6]', 3,2)
     @test transpose(Fill([1+im 2; 3 4; 5 6], 2,3)) == Fill(transpose([1+im 2; 3 4; 5 6]), 3,2)
 end
+
+@testset "setindex!/fill!" begin
+    F = Fill(1,10)
+    @test (F[1] = 1) == 1
+    @test_throws BoundsError (F[11] = 1)
+    @test_throws ArgumentError (F[10] = 2)
+    
+
+    F = Fill(1,10,5)
+    @test (F[1] = 1) == 1
+    @test (F[3,3] = 1) == 1
+    @test_throws BoundsError (F[51] = 1)
+    @test_throws BoundsError (F[1,6] = 1)
+    @test_throws ArgumentError (F[10] = 2)
+    @test_throws ArgumentError (F[10,1] = 2)
+
+    @test (F[:,1] .= 1) == fill(1,10)
+    @test_throws ArgumentError (F[:,1] .= 2)
+
+    @test fill!(F,1) == F
+    @test_throws ArgumentError fill!(F,2)
+end