Skip to content

Commit 12d21f2

Browse files
committed
Fix reindex
1 parent 3e33a08 commit 12d21f2

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ BlockArrays = "0.9"
3535
BlockBandedMatrices = "0.4.3"
3636
Calculus = "≥ 0.1.15"
3737
DSP = "≥ 0.5.1"
38-
DomainSets = "0.0.2"
38+
DomainSets = "0.0.2, 0.1"
3939
DualNumbers = "0.6.2"
4040
FFTW = "≥ 0.2.4"
4141
FastGaussQuadrature = "≥ 0.3.2"

src/ApproxFunBase.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import FFTW: plan_r2r!, fftwNumber, REDFT10, REDFT01, REDFT00, RODFT00, R2HC, HC
1818

1919

2020
import Base: values, convert, getindex, setindex!, *, +, -, ==, <, <=, >, |, !, !=, eltype, iterate,
21-
>=, /, ^, \, , transpose, size, reindex, tail, broadcast, broadcast!, copyto!, copy, to_index, (:),
21+
>=, /, ^, \, , transpose, size, tail, broadcast, broadcast!, copyto!, copy, to_index, (:),
2222
similar, map, vcat, hcat, hvcat, show, summary, stride, sum, cumsum, sign, imag, conj, inv,
2323
complex, reverse, exp, sqrt, abs, abs2, sign, issubset, values, in, first, last, rand, intersect, setdiff,
2424
isless, union, angle, join, isnan, isapprox, isempty, sort, merge, promote_rule,

src/Operators/SubOperator.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@ defaultgetindex(B::Operator,k::AbstractRange, j::InfRanges) = view(B, k, j)
127127
defaultgetindex(B::Operator,k::InfRanges, j::AbstractRange) = view(B, k, j)
128128

129129

130+
if VERSION < v"1.2-"
131+
reindex(V, idxs, subidxs) = Base.reindex(V, idxs, subidxs)
132+
else
133+
reindex(V, idxs, subidxs) = Base.reindex(idxs, subidxs)
134+
end
130135

131136
reindex(A::Operator, B::Tuple{Block,Any}, kj::Tuple{Any,Any}) =
132137
(reindex(rangespace(A),(B[1],), (kj[1],))[1], reindex(domainspace(A),tail(B), tail(kj))[1])

0 commit comments

Comments
 (0)