Skip to content

StepRangeLen to support 0 step size in cumsum #226 #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 28, 2023
Merged

StepRangeLen to support 0 step size in cumsum #226 #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6af551f
use StepRangeLen to support 0 step size
dlfivefifty Mar 28, 2023
02b1088
Merge branch 'master' into dl/steprangelen
dlfivefifty Mar 28, 2023
8b368a4
v0.13.11
dlfivefifty Mar 28, 2023
3e640af
allow special casing on ∞ length
dlfivefifty Mar 28, 2023
1d15e36
Restore ± special cases
dlfivefifty Mar 28, 2023
579b00d
Merge branch 'dl/plusminus' into dl/steprangelen
dlfivefifty Mar 28, 2023
9b57fd9
Merge branch 'master' into dl/steprangelen
dlfivefifty Mar 28, 2023
4a2018b
Update runtests.jl
dlfivefifty Mar 28, 2023
99c346f
fix more tests
dlfivefifty Mar 28, 2023
3c5caf3
Update runtests.jl
dlfivefifty Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/FillArrays.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,14 +496,14 @@ sum(x::AbstractFill) = getindex_value(x)*length(x)
sum(f, x::AbstractFill) = length(x) * f(getindex_value(x))
sum(x::Zeros) = getindex_value(x)

cumsum(x::AbstractFill{<:Any,1}) = range(getindex_value(x); step=getindex_value(x),
length=length(x))
# needed to support infinite case
steprangelen(st...) = StepRangeLen(st...)
cumsum(x::AbstractFill{<:Any,1}) = steprangelen(getindex_value(x), getindex_value(x), length(x))

cumsum(x::ZerosVector) = x
cumsum(x::ZerosVector{Bool}) = x
cumsum(x::OnesVector{II}) where II<:Integer = convert(AbstractVector{II}, oneto(length(x)))
cumsum(x::OnesVector{Bool}) = oneto(length(x))
cumsum(x::AbstractFillVector{Bool}) = cumsum(AbstractFill{Int}(x))


#########
Expand Down
8 changes: 5 additions & 3 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,11 +634,11 @@ end
@test sum(Fill(3,10)) ≡ 30
@test reduce(+, Fill(3,10)) ≡ 30
@test sum(x -> x + 1, Fill(3,10)) ≡ 40
@test cumsum(Fill(3,10)) ≡ 3:3:30
@test cumsum(Fill(3,10)) ≡ StepRangeLen(3,3,10)

@test sum(Ones(10)) ≡ 10.0
@test sum(x -> x + 1, Ones(10)) ≡ 20.0
@test cumsum(Ones(10)) ≡ 1.0:10.0
@test cumsum(Ones(10)) ≡ StepRangeLen(1.0, 1.0, 10)

@test sum(Ones{Int}(10)) ≡ 10
@test sum(x -> x + 1, Ones{Int}(10)) ≡ 20
Expand All @@ -654,7 +654,7 @@ end

@test cumsum(Zeros{Bool}(10)) ≡ Zeros{Bool}(10)
@test cumsum(Ones{Bool}(10)) ≡ Base.OneTo{Int}(10)
@test cumsum(Fill(true,10)) ≡ 1:1:10
@test cumsum(Fill(true,10)) ≡ StepRangeLen(true, true, 10)

@test diff(Fill(1,10)) ≡ Zeros{Int}(9)
@test diff(Ones{Float64}(10)) ≡ Zeros{Float64}(9)
Expand Down Expand Up @@ -1338,6 +1338,8 @@ end
@test stringmime("text/plain", Fill(7,2,3)) == "2×3 Fill{$Int}, with entries equal to 7"
@test stringmime("text/plain", Fill(8.0,1)) == "1-element Fill{Float64}, with entry equal to 8.0"
@test stringmime("text/plain", Eye(5)) == "5×5 Eye{Float64}"
# used downstream in LazyArrays.jl to deduce sparsity
@test Base.replace_in_print_matrix(Zeros(5,3), 1, 2, "0.0") == " ⋅ "

# 2-arg show, compact printing
@test repr(Zeros(3)) == "Zeros(3)"
Expand Down