Overload reshape, Add special broadcasting for number and Zeros, add \ and / (#77)

* Add special broadcasting for number and Zeros, add \ and /

* Overload reshape

* v0.8

Author: dlfivefifty

Project.toml

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

src/FillArrays.jl

@@ -4,7 +4,7 @@ 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, setindex!, count, ==
+    copy, vec, setindex!, count, ==, reshape, _throw_dmrs
 
 import LinearAlgebra: rank, svdvals!, tril, triu, tril!, triu!, diag, transpose, adjoint, fill!, 
     norm2, norm1, normInf, normMinusInf, normp
@@ -159,7 +159,14 @@ end
 -(a::AbstractFill, b::AbstractRange) = a + (-b)
 -(a::AbstractRange, b::AbstractFill) = a + (-b)
 
+function fill_reshape(parent, dims::Integer...)
+    n = length(parent)
+    prod(dims) == n || _throw_dmrs(n, "size", dims)
+    Fill(getindex_value(parent), dims...)
+end
 
+reshape(parent::AbstractFill, dims::Integer...) = fill_reshape(parent, dims...)
+reshape(parent::AbstractFill, dims::Int...) = fill_reshape(parent, dims...)
 
 for (Typ, funcs, func) in ((:Zeros, :zeros, :zero), (:Ones, :ones, :one))
     @eval begin
@@ -211,6 +218,12 @@ for (Typ, funcs, func) in ((:Zeros, :zeros, :zero), (:Ones, :ones, :one))
             size(A) == size(kr) || throw(DimensionMismatch())
             $Typ{T}(count(kr))
         end
+
+        function fill_reshape(parent::$Typ{T}, dims::Integer...) where T
+            n = length(parent)
+            prod(dims) == n || _throw_dmrs(n, "size", dims)
+            $Typ{T}(dims...)
+        end
     end
 end
 
@@ -464,4 +477,5 @@ include("fillbroadcast.jl")
 Base.replace_in_print_matrix(::Zeros, ::Integer, ::Integer, s::AbstractString) = 
     Base.replace_with_centered_mark(s)
 
+
 end # module

src/fillbroadcast.jl

@@ -26,23 +26,27 @@ broadcasted(::DefaultArrayStyle, ::typeof(+), a::Zeros, b::Ones) = _broadcasted_
 
 broadcasted(::DefaultArrayStyle, ::typeof(*), a::Zeros, b::Zeros) = _broadcasted_zeros(a, b)
 
-broadcasted(::DefaultArrayStyle, ::typeof(*), a::Zeros, b::Ones) = _broadcasted_zeros(a, b)
-broadcasted(::DefaultArrayStyle, ::typeof(*), a::Zeros, b::Fill) = _broadcasted_zeros(a, b)
-broadcasted(::DefaultArrayStyle, ::typeof(*), a::Zeros, b::AbstractRange) =
-    return _broadcasted_zeros(a, b)
-broadcasted(::DefaultArrayStyle, ::typeof(*), a::Zeros, b::AbstractArray) =
-    return _broadcasted_zeros(a, b)
-
-broadcasted(::DefaultArrayStyle, ::typeof(*), a::Ones, b::Zeros) = _broadcasted_zeros(a, b)
-broadcasted(::DefaultArrayStyle, ::typeof(*), a::Fill, b::Zeros) = _broadcasted_zeros(a, b)
-broadcasted(::DefaultArrayStyle, ::typeof(*), a::AbstractRange, b::Zeros) =
-    return _broadcasted_zeros(a, b)
-broadcasted(::DefaultArrayStyle, ::typeof(*), a::AbstractArray, b::Zeros) =
-    return _broadcasted_zeros(a, b)
-broadcasted(::DefaultArrayStyle{1}, ::typeof(*), a::Zeros, b::AbstractRange) =
-    return _broadcasted_zeros(a, b)
-broadcasted(::DefaultArrayStyle{1}, ::typeof(*), a::AbstractRange, b::Zeros) =
-    return _broadcasted_zeros(a, b)
+for op in (:*, :/)
+    @eval begin
+        broadcasted(::DefaultArrayStyle, ::typeof($op), a::Zeros, b::Ones) = _broadcasted_zeros(a, b)
+        broadcasted(::DefaultArrayStyle, ::typeof($op), a::Zeros, b::Fill) = _broadcasted_zeros(a, b)
+        broadcasted(::DefaultArrayStyle, ::typeof($op), a::Zeros, b::Number) = _broadcasted_zeros(a, b)
+        broadcasted(::DefaultArrayStyle, ::typeof($op), a::Zeros, b::AbstractRange) = _broadcasted_zeros(a, b)
+        broadcasted(::DefaultArrayStyle, ::typeof($op), a::Zeros, b::AbstractArray) = _broadcasted_zeros(a, b)
+        broadcasted(::DefaultArrayStyle{1}, ::typeof($op), a::Zeros, b::AbstractRange) = _broadcasted_zeros(a, b)
+    end
+end
+
+for op in (:*, :\)
+    @eval begin
+        broadcasted(::DefaultArrayStyle, ::typeof($op), a::Ones, b::Zeros) = _broadcasted_zeros(a, b)
+        broadcasted(::DefaultArrayStyle, ::typeof($op), a::Fill, b::Zeros) = _broadcasted_zeros(a, b)
+        broadcasted(::DefaultArrayStyle, ::typeof($op), a::Number, b::Zeros) = _broadcasted_zeros(a, b)
+        broadcasted(::DefaultArrayStyle, ::typeof($op), a::AbstractRange, b::Zeros) = _broadcasted_zeros(a, b)
+        broadcasted(::DefaultArrayStyle, ::typeof($op), a::AbstractArray, b::Zeros) = _broadcasted_zeros(a, b)
+        broadcasted(::DefaultArrayStyle{1}, ::typeof($op), a::AbstractRange, b::Zeros) = _broadcasted_zeros(a, b)
+    end
+end
 
 
 broadcasted(::DefaultArrayStyle, ::typeof(*), a::Ones, b::Ones) = _broadcasted_ones(a, b)

test/runtests.jl

@@ -499,15 +499,23 @@ end
     @test broadcast(*, rnge, Fill(5.0, 10)) == broadcast(*, rnge, 5.0)
     @test_throws DimensionMismatch broadcast(*, rnge, Fill(5.0, 11))
 
-    @test Zeros(5) .* Ones(5) == Zeros(5)
-    @test Zeros(5) .* Fill(5.0, 5) == Zeros(5)
-    @test Ones(5) .* Zeros(5) == Zeros(5)
-    @test Fill(5.0, 5) .* Zeros(5) == Zeros(5)
+    @testset "Special zeros" begin
+        @test Zeros(5) .* Ones(5) ≡ Zeros(5) .* 1 ≡ Zeros(5)
+        @test Zeros(5) .* Fill(5.0, 5) ≡ Zeros(5) .* 5.0 ≡ Zeros(5)
+        @test Ones(5) .* Zeros(5) ≡ 1 .* Zeros(5) ≡ Zeros(5)
+        @test Fill(5.0, 5) .* Zeros(5) ≡ 5.0 .* Zeros(5) ≡ Zeros(5)
+
+        @test Zeros(5) ./ Ones(5) ≡ Zeros(5) ./ 1 ≡ Zeros(5)
+        @test Zeros(5) ./ Fill(5.0, 5) ≡ Zeros(5) ./ 5.0 ≡ Zeros(5)
+        @test Ones(5) .\ Zeros(5) ≡ 1 .\ Zeros(5) ≡ Zeros(5)
+        @test Fill(5.0, 5) .\ Zeros(5) ≡ 5.0 .\ Zeros(5) ≡ Zeros(5)
+    end
 
-    # support Ref
-    @test Fill(1,10) .- 1 ≡ Fill(1,10) .- Ref(1) ≡ Fill(1,10) .- Ref(1I)
-    @test Fill([1 2; 3 4],10) .- Ref(1I) == Fill([0 2; 3 3],10)
-    @test Ref(1I) .+ Fill([1 2; 3 4],10) == Fill([2 2; 3 5],10)
+    @testset "support Ref" begin
+        @test Fill(1,10) .- 1 ≡ Fill(1,10) .- Ref(1) ≡ Fill(1,10) .- Ref(1I)
+        @test Fill([1 2; 3 4],10) .- Ref(1I) == Fill([0 2; 3 3],10)
+        @test Ref(1I) .+ Fill([1 2; 3 4],10) == Fill([2 2; 3 5],10)
+    end
 
     @testset "Special Ones" begin
         @test Ones{Int}(5) .* (1:5) ≡ (1:5) .* Ones{Int}(5) ≡ 1:5 
@@ -877,4 +885,12 @@ end
 
 @testset "print" begin
     @test stringmime("text/plain", Zeros(3)) == "3-element Zeros{Float64,1,Tuple{Base.OneTo{$Int}}}:\n  ⋅ \n  ⋅ \n  ⋅ "
+end
+
+@testset "reshape" begin
+    @test reshape(Fill(2,6),2,3) ≡ Fill(2,2,3)
+    @test reshape(Fill(2,6),big(2),3) == Fill(2,big(2),3)
+    @test_throws DimensionMismatch reshape(Fill(2,6),2,4)
+    @test reshape(Zeros(6),2,3) ≡ Zeros(2,3)
+    @test reshape(Zeros(6),big(2),3) == Zeros(big(2),3)
 end