Skip to content

Commit 5b40b32

Browse files
committed
fixup! disallow DataFrames in obsp/varp, obsmap/varmap, layers
1 parent 448c7e2 commit 5b40b32

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

src/alignedmapping.jl

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ AlignedMapping{T, K}(r, d::AbstractDict{K}, ::Val{false}) where {T <: Tuple, K}
9696
AlignedMapping{T, K}(r, d::AbstractDict{K}) where {T <: Tuple, K} = AlignedMapping{T, K}(r, d, Val(true))
9797

9898
AlignedMapping{T}(r, d::AbstractDict) where {T <: Tuple} = AlignedMapping{T, keytype(d)}(r, d)
99-
AlignedMapping{T}(r, d::AbstractDict, ::Val{true}) where {T <: Tuple} = AlignedMapping{T, keytype(d)}(r, d, Val(true))
100-
AlignedMapping{T}(r, d::AbstractDict, ::Val{false}) where {T <: Tuple} = AlignedMapping{T, keytype(d)}(r, d, Val(false))
99+
AlignedMapping{T}(r, d::AbstractDict, ::Val{true}) where {T <: Tuple} = AlignedMapping{T, keytype(d), true}(r, d)
100+
AlignedMapping{T}(r, d::AbstractDict, ::Val{false}) where {T <: Tuple} = AlignedMapping{T, keytype(d), false}(r, d)
101101

102102
AlignedMapping{T}(r, d::Group) where {T <: Tuple} = AligedMapping{T}(ref, read_dict_of_mixed(d))
103103
AlignedMapping{T}(r, d::Group, ::Val{true}) where {T <: Tuple} = AligedMapping{T}(ref, read_dict_of_mixed(d), Val(true))
@@ -182,15 +182,13 @@ function Base.setindex!(d::BackedAlignedMapping{T}, v::AbstractArray, k) where {
182182
end
183183

184184
function copy_subset(src::AbstractAlignedMapping{T}, dst::AbstractAlignedMapping, I, J) where {T <: Tuple}
185-
idx = (
186-
if refdim == 1
187-
I
188-
elseif refdim == 2
189-
J
190-
else
191-
(:)
192-
end for (vdim, refdim) T.parameters
193-
)
185+
idx = (if refdim == 1
186+
I
187+
elseif refdim == 2
188+
J
189+
else
190+
(:)
191+
end for (vdim, refdim) T.parameters)
194192
for (k, v) src
195193
dst[k] = v[idx..., ..]
196194
end

0 commit comments

Comments
 (0)