diff --git a/Project.toml b/Project.toml index 57bd01b..d9fd665 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "ContinuumArrays" uuid = "7ae1f121-cc2c-504b-ac30-9b923412ae5c" -version = "0.20.1" +version = "0.20.2" [deps] AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c" @@ -38,7 +38,7 @@ Infinities = "0.1" IntervalSets = "0.7" LazyArrays = "2" Makie = "0.20, 0.21, 0.22, 0.24" -QuasiArrays = "0.13.1" +QuasiArrays = "0.13.2" Random = "1.0" RecipesBase = "1.0" StaticArrays = "1.0" diff --git a/src/ContinuumArrays.jl b/src/ContinuumArrays.jl index b0dce96..b81fd61 100644 --- a/src/ContinuumArrays.jl +++ b/src/ContinuumArrays.jl @@ -2,7 +2,7 @@ module ContinuumArrays using IntervalSets, DomainSets, LinearAlgebra, LazyArrays, FillArrays, BandedMatrices, QuasiArrays, Infinities, InfiniteArrays, StaticArrays, BlockArrays import Base: @_inline_meta, @_propagate_inbounds_meta, axes, size, getindex, convert, prod, *, /, \, +, -, ==, ^, IndexStyle, IndexLinear, ==, OneTo, tail, similar, copyto!, copy, diff, - first, last, show, isempty, findfirst, findlast, findall, Slice, union, minimum, maximum, sum, _sum, + first, last, show, isempty, findfirst, findlast, findall, Slice, union, minimum, maximum, sum, _sum, _maximum, _minimum, getproperty, isone, iszero, zero, abs, <, ≤, >, ≥, string, summary, to_indices, view, @propagate_inbounds import Base.Broadcast: materialize, BroadcastStyle, broadcasted, Broadcasted import LazyArrays: MemoryLayout, Applied, ApplyStyle, flatten, _flatten, colsupport, combine_mul_styles, AbstractArrayApplyStyle, @@ -18,7 +18,7 @@ import QuasiArrays: cardinality, checkindex, QuasiAdjoint, QuasiTranspose, Inclu QuasiDiagonal, MulQuasiArray, MulQuasiMatrix, MulQuasiVector, QuasiMatMulMat, QuasiArrayLayout, ApplyQuasiArray, ApplyQuasiMatrix, LazyQuasiArrayApplyStyle, AbstractQuasiArrayApplyStyle, AbstractQuasiLazyLayout, LazyQuasiArray, LazyQuasiVector, LazyQuasiMatrix, LazyLayout, LazyQuasiArrayStyle, _factorize, _cutdim, - AbstractQuasiFill, UnionDomain, sum_size, sum_layout, _cumsum, cumsum_layout, applylayout, equals_layout, layout_broadcasted, PolynomialLayout, dot_size, + AbstractQuasiFill, UnionDomain, sum_size, maximum_size, minimum_size, sum_layout, _cumsum, cumsum_layout, applylayout, equals_layout, layout_broadcasted, PolynomialLayout, dot_size, diff_layout, diff_size, AbstractQuasiVecOrMat, vec_layout, searchsortedfirst_layout import InfiniteArrays: Infinity, InfAxes import AbstractFFTs: Plan @@ -112,6 +112,8 @@ include("plotting.jl") # sum/dot ### +maximum_size(::Tuple{InfiniteCardinal{1}, Vararg{Integer}}, a, dims) = _maximum(expand(a), dims) +minimum_size(::Tuple{InfiniteCardinal{1}, Vararg{Integer}}, a, dims) = _minimum(expand(a), dims) sum_size(::Tuple{InfiniteCardinal{1}, Vararg{Integer}}, a, dims) = _sum(expand(a), dims) dot_size(::InfiniteCardinal{1}, a, b) = dot(expand(a), expand(b)) diff_size(::Tuple{InfiniteCardinal{1}, Vararg{Integer}}, a, order...; dims...) = diff(expand(a), order...; dims...)