Skip to content
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.

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

Use ContinuumArrays.jl #44

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
14 changes: 9 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name = "ApproxFunBase"
uuid = "fbd15aa5-315a-5a7d-a8a4-24992e37be05"
version = "0.6.6"
version = "0.7"

[deps]
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
BlockBandedMatrices = "ffab5731-97b5-5995-9138-79e8c1846df0"
Calculus = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9"
ContinuumArrays = "7ae1f121-cc2c-504b-ac30-9b923412ae5c"
DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"
DomainSets = "5b8099bc-c8ec-5219-889f-1d9e522a28bf"
DualNumbers = "fa6b7ba4-c1ee-5f82-b5fc-ecf0adba8f74"
Expand All @@ -18,13 +19,13 @@ InfiniteArrays = "4858937d-0d70-526a-a4dd-2d5cb5dd786c"
InfiniteLinearAlgebra = "cde9dba0-b1de-11e9-2c62-0bab9446c55c"
IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
LazyArrays = "5078a376-72f3-5289-bfd5-ec5146d43c02"
LazyBandedMatrices = "d7e5e226-e90b-4449-9968-0f923699bf6f"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
LowRankApprox = "898213cb-b102-5a47-900c-97e73b919f73"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
ToeplitzMatrices = "c751599d-da0a-543b-9d20-d0a503d91d24"

[compat]
Expand All @@ -34,6 +35,7 @@ BandedMatrices = "0.16, 0.17"
BlockArrays = "0.14, 0.15, 0.16"
BlockBandedMatrices = "0.10, 0.11"
Calculus = "0.5"
ContinuumArrays = "0.10"
DSP = "0.6, 0.7"
DomainSets = "0.5"
DualNumbers = "0.6.2"
Expand All @@ -44,15 +46,17 @@ InfiniteArrays = "0.11, 0.12"
InfiniteLinearAlgebra = "0.5, 0.6"
IntervalSets = "0.5, 0.6, 0.7"
LazyArrays = "0.20, 0.21, 0.22"
LowRankApprox = "0.2, 0.3, 0.4, 0.5"
LowRankApprox = "0.4, 0.5"
SpecialFunctions = "0.10, 1.0, 2"
StaticArrays = "0.12, 1.0"
ToeplitzMatrices = "0.6, 0.7"
julia = "1.5"
julia = "1.7"

[extras]
ClassicalOrthogonalPolynomials = "b30e2e7b-c4ee-47da-9d5f-2c5c27239acd"
ApproxFunOrthogonalPolynomials = "b70543e2-c0d9-56b8-a290-0d4d6d4de211"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["ApproxFunOrthogonalPolynomials", "Random"]
test = ["Random", "ApproxFunOrthogonalPolynomials", "ClassicalOrthogonalPolynomials", "Test"]
20 changes: 7 additions & 13 deletions src/ApproxFunBase.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ module ApproxFunBase
using Base: AnyDict
using Base, BlockArrays, BandedMatrices, BlockBandedMatrices, DomainSets, IntervalSets,
SpecialFunctions, AbstractFFTs, FFTW, SpecialFunctions, DSP, DualNumbers,
LinearAlgebra, SparseArrays, LowRankApprox, FillArrays, InfiniteArrays, InfiniteLinearAlgebra #, Arpack
LinearAlgebra, SparseArrays, LowRankApprox, FillArrays, InfiniteArrays,
InfiniteLinearAlgebra, ContinuumArrays
import StaticArrays, Calculus

import DomainSets: Domain, indomain, UnionDomain, ProductDomain, FullSpace, Point, elements, DifferenceDomain,
Expand All @@ -26,7 +27,7 @@ import Base: values, convert, getindex, setindex!, *, +, -, ==, <, <=, >, |, !,
getproperty, findfirst, unsafe_getindex, fld, cld, div, imag,
@_inline_meta, eachindex, firstindex, lastindex, keys, isreal, OneTo,
Array, Vector, Matrix, view, ones, @propagate_inbounds, print_array,
split, iszero, permutedims
split, iszero, permutedims, vec

import Base.Broadcast: BroadcastStyle, Broadcasted, AbstractArrayStyle, broadcastable,
DefaultArrayStyle, broadcasted
Expand All @@ -40,6 +41,8 @@ import LinearAlgebra: BlasInt, BlasFloat, norm, ldiv!, mul!, det, eigvals, cross

import SparseArrays: blockdiag


import ContinuumArrays: AbstractQuasiMatrix, AbstractQuasiVector, AbstractQuasiArray, arguments, checkpoints
# import Arpack: eigs

# we need to import all special functions to use Calculus.symbolic_derivatives_1arg
Expand Down Expand Up @@ -78,6 +81,7 @@ import InfiniteArrays: PosInfinity, InfRanges, AbstractInfUnitRange, OneToInf, I

# convenience for 1-d block ranges
const BlockRange1 = BlockRange{1,Tuple{UnitRange{Int}}}
const Space{T} = AbstractQuasiMatrix{T}

import Base: view

Expand All @@ -95,6 +99,7 @@ export pad!, pad, chop!, sample,

export .., Interval, ChebyshevInterval, leftendpoint, rightendpoint, endpoints, cache

export bilinearform, linebilinearform, innerproduct, lineinnerproduct

if VERSION < v"1.6-"
oneto(n) = Base.OneTo(n)
Expand All @@ -103,17 +108,6 @@ else
end


include("LinearAlgebra/LinearAlgebra.jl")
include("Fun.jl")
include("Domains/Domains.jl")
include("Multivariate/Multivariate.jl")
include("Operators/Operator.jl")
include("Caching/caching.jl")
include("PDE/PDE.jl")
include("Spaces/Spaces.jl")
include("hacks.jl")
include("testing.jl")
include("specialfunctions.jl")
include("show.jl")

end #module
Loading