Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "QuasiArrays"
uuid = "c4ea9172-b204-11e9-377d-29865faadc5c"
authors = ["Sheehan Olver <[email protected]>"]
version = "0.12"
version = "0.12.1"

[deps]
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
Expand Down
2 changes: 2 additions & 0 deletions src/QuasiArrays.jl
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ import Base: BitInteger, IEEEFloat, uniontypes, _InitialValue, safe_tail, reduce

import Base: ones, zeros, one, zero, fill

import Base: AbstractVector, AbstractArray, AbstractMatrix

import Base.Broadcast: materialize, materialize!, BroadcastStyle, AbstractArrayStyle, Style, broadcasted, Broadcasted, Unknown,
newindex, broadcastable, preprocess, _eachindex, _broadcast_getindex, broadcast_shape,
DefaultArrayStyle, axistype, throwdm, instantiate, combine_eltypes, eltypes, combine_styles
Expand Down
11 changes: 11 additions & 0 deletions src/calculus.jl
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,15 @@ function diff(A::QuasiMatrix; dims::Integer=1)
else
QuasiMatrix(D ./ permutedims(diff(b.domain)), (a, diffaxes(b)))
end
end



#####
# norm
#####

if VERSION ≥ v"1.12-"
# avoid iterate call in v1.12
LinearAlgebra.norm_recursive_check(::AbstractQuasiArray) = nothing
end
2 changes: 1 addition & 1 deletion src/multidimensional.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module QuasiIteratorsMD
setindex!, IndexStyle, min, max, zero, oneunit, isless, eachindex,
ndims, IteratorSize, convert, show, iterate, promote_rule

import Base: +, -, *, (:)
import Base: +, -, *, (:), Tuple
import Base: simd_outer_range, simd_inner_length, simd_index
using Base: IndexLinear, IndexCartesian, AbstractCartesianIndex, fill_to_length, tail
using Base.Iterators: Reverse
Expand Down
21 changes: 17 additions & 4 deletions src/quasibroadcast.jl
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,23 @@ Base.similar(bc::Broadcasted{QuasiArrayConflict}, ::Type{ElType}) where ElType =

_axes(bc::Broadcasted{<:AbstractQuasiArrayStyle{0}}, ::Nothing) = ()

_eachindex(t::Tuple{AbstractQuasiVector{<:Number}}) = QuasiCartesianIndices(t)
_eachindex(t::Tuple{AbstractQuasiVector{<:Number},Vararg{Any}}) = QuasiCartesianIndices(t)
_eachindex(t::Tuple{AbstractQuasiVector{<:Number},Vararg{AbstractUnitRange}}) = QuasiCartesianIndices(t)
_eachindex(t::Tuple{AbstractUnitRange,AbstractQuasiVector{<:Number},Vararg{AbstractUnitRange}}) = QuasiCartesianIndices(t)
if VERSION < v"1.12-"
_eachindex(t::Tuple{AbstractQuasiVector{<:Number}}) = QuasiCartesianIndices(t)
_eachindex(t::Tuple{AbstractQuasiVector{<:Number},Vararg{Any}}) = QuasiCartesianIndices(t)
_eachindex(t::Tuple{AbstractQuasiVector{<:Number},Vararg{AbstractUnitRange}}) = QuasiCartesianIndices(t)
_eachindex(t::Tuple{AbstractUnitRange,AbstractQuasiVector{<:Number},Vararg{AbstractUnitRange}}) = QuasiCartesianIndices(t)
else
# TODO: add LinearQuasiIndices
_eachindex(::IndexLinear, t::Tuple{AbstractQuasiVector{<:Number}}) = _eachindex(IndexCartesian(), t) # t[1] commented out since broadcast doesn't support Float64 indexing
_eachindex(::IndexLinear, t::Tuple{AbstractQuasiVector{<:Number},Vararg{Any}}) = _eachindex(IndexCartesian(), t)
_eachindex(::IndexLinear, t::Tuple{AbstractQuasiVector{<:Number},Vararg{AbstractUnitRange}}) = _eachindex(IndexCartesian(), t)
_eachindex(::IndexLinear, t::Tuple{AbstractUnitRange,AbstractQuasiVector{<:Number},Vararg{AbstractUnitRange}}) = _eachindex(IndexCartesian(), t)

_eachindex(::IndexCartesian, t::Tuple{AbstractQuasiVector{<:Number}}) = QuasiCartesianIndices(t)
_eachindex(::IndexCartesian, t::Tuple{AbstractQuasiVector{<:Number},Vararg{Any}}) = QuasiCartesianIndices(t)
_eachindex(::IndexCartesian, t::Tuple{AbstractQuasiVector{<:Number},Vararg{AbstractUnitRange}}) = QuasiCartesianIndices(t)
_eachindex(::IndexCartesian, t::Tuple{AbstractUnitRange,AbstractQuasiVector{<:Number},Vararg{AbstractUnitRange}}) = QuasiCartesianIndices(t)
end

instantiate(bc::Broadcasted{<:AbstractQuasiArrayStyle{0}}) = bc

Expand Down
5 changes: 5 additions & 0 deletions test/test_calculus.jl
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,9 @@ using QuasiArrays, IntervalSets, Test
Base.axes(::IncompleteQuasiArray) = (Base.OneTo(3),)
@test_throws ErrorException diff(IncompleteQuasiArray())
end

@testset "norm" begin
b = QuasiVector(1:3, 1:0.5:2)
@test norm(b) ≈ norm(1:3) # TODO: this should rescale based on step
end
end
Loading