Skip to content

Commit

Permalink
Support transforms with quasi matrices (#122)
Browse files Browse the repository at this point in the history
* Support transforms with matrix RHS

* better support for matrix transforms

* Expansion -> ExpansionLayout

* Update plotting.jl

* Update bases.jl

* Support hcat in Ldiv

* ((w .* P) * c) .* f fall back

* move broadcasted special cases from ClassicalOPs

* Update bases.jl

* WeightBasis takes Layout

* PolynomnialLayout

* Update Project.toml

* cumsum for HeavisideSpline

* increase coverage

* == for WeightedBasis

* increase cov

* Update ContinuumArrays.jl
  • Loading branch information
dlfivefifty authored Oct 11, 2021
1 parent e366725 commit a626602
Show file tree
Hide file tree
Showing 11 changed files with 250 additions and 122 deletions.
13 changes: 7 additions & 6 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "ContinuumArrays"
uuid = "7ae1f121-cc2c-504b-ac30-9b923412ae5c"
version = "0.9.6"
version = "0.10.0"

[deps]
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
Expand All @@ -17,15 +17,16 @@ RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"

[compat]
ArrayLayouts = "0.7.2"
ArrayLayouts = "0.7.7"
BandedMatrices = "0.16"
BlockArrays = "0.16"
FillArrays = "0.11, 0.12"
InfiniteArrays = "0.11, 0.12"
FastTransforms = "0.13"
FillArrays = "0.12"
InfiniteArrays = "0.12"
Infinities = "0.1"
IntervalSets = "0.5"
LazyArrays = "0.21.13, 0.22"
QuasiArrays = "0.7, 0.8"
LazyArrays = "0.22"
QuasiArrays = "0.9"
RecipesBase = "1.0"
StaticArrays = "1.0"
julia = "1.6"
Expand Down
14 changes: 8 additions & 6 deletions src/ContinuumArrays.jl
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
module ContinuumArrays
using IntervalSets, LinearAlgebra, LazyArrays, FillArrays, BandedMatrices, QuasiArrays, Infinities, InfiniteArrays, StaticArrays, BlockArrays, RecipesBase
import Base: @_inline_meta, @_propagate_inbounds_meta, axes, getindex, convert, prod, *, /, \, +, -, ==, ^,
import Base: @_inline_meta, @_propagate_inbounds_meta, axes, size, getindex, convert, prod, *, /, \, +, -, ==, ^,
IndexStyle, IndexLinear, ==, OneTo, _maybetail, tail, similar, copyto!, copy, diff,
first, last, show, isempty, findfirst, findlast, findall, Slice, union, minimum, maximum, sum, _sum,
getproperty, isone, iszero, zero, abs, <, , >, , string, summary, to_indices, view
import Base.Broadcast: materialize, BroadcastStyle, broadcasted
import Base.Broadcast: materialize, BroadcastStyle, broadcasted, Broadcasted
import LazyArrays: MemoryLayout, Applied, ApplyStyle, flatten, _flatten, colsupport, most, combine_mul_styles, AbstractArrayApplyStyle,
adjointlayout, arguments, _mul_arguments, call, broadcastlayout, layout_getindex, UnknownLayout,
sublayout, sub_materialize, ApplyLayout, BroadcastLayout, combine_mul_styles, applylayout,
simplifiable, _simplify, AbstractLazyLayout, PaddedLayout
import LinearAlgebra: pinv, dot, norm2
import LinearAlgebra: pinv, dot, norm2, ldiv!, mul!
import BandedMatrices: AbstractBandedLayout, _BandedMatrix
import BlockArrays: block, blockindex, unblock, blockedrange, _BlockedUnitRange, _BlockArray
import FillArrays: AbstractFill, getindex_value, SquareEye
import ArrayLayouts: mul, ZerosLayout, ScalarLayout
import ArrayLayouts: mul, ZerosLayout, ScalarLayout, AbstractStridedLayout
import QuasiArrays: cardinality, checkindex, QuasiAdjoint, QuasiTranspose, Inclusion, SubQuasiArray,
QuasiDiagonal, MulQuasiArray, MulQuasiMatrix, MulQuasiVector, QuasiMatMulMat, QuasiArrayLayout,
ApplyQuasiArray, ApplyQuasiMatrix, LazyQuasiArrayApplyStyle, AbstractQuasiArrayApplyStyle, AbstractQuasiLazyLayout,
LazyQuasiArray, LazyQuasiVector, LazyQuasiMatrix, LazyLayout, LazyQuasiArrayStyle, _factorize,
AbstractQuasiFill, UnionDomain, __sum
AbstractQuasiFill, UnionDomain, __sum, _cumsum, __cumsum, applylayout, _equals, layout_broadcasted, PolynomialLayout
import InfiniteArrays: Infinity, InfAxes

export Spline, LinearSpline, HeavisideSpline, DiracDelta, Derivative, ℵ₁, Inclusion, Basis, WeightedBasis, grid, plotgrid, transform, affine, ..
export Spline, LinearSpline, HeavisideSpline, DiracDelta, Derivative, ℵ₁, Inclusion, Basis, grid, plotgrid, affine, ..



Expand Down Expand Up @@ -58,6 +58,8 @@ sub_materialize(_, V::AbstractQuasiArray, ::Tuple{QInfAxes,Any}) = V
# ambiguity error
sub_materialize(_, V::AbstractQuasiArray, ::Tuple{InfAxes,QInfAxes}) = V
sub_materialize(_, V::AbstractQuasiArray, ::Tuple{QInfAxes,InfAxes}) = V
sub_materialize(::ApplyLayout{typeof(hcat)}, V::AbstractQuasiArray, ::Tuple{QInfAxes,Any}) = V
sub_materialize(::ApplyLayout{typeof(hcat)}, V::AbstractQuasiArray, ::Tuple{QInfAxes,InfAxes}) = V

#
# BlockQuasiArrays
Expand Down
Loading

2 comments on commit a626602

@dlfivefifty
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/46540

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.10.0 -m "<description of version>" a626602e7ae4c0aa242c1220d1846a49e7223b55
git push origin v0.10.0

Please sign in to comment.