Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "NamedDimsArrays"
uuid = "60cbd0c0-df58-4cb7-918c-6f5607b73fde"
version = "0.15.2"
version = "0.15.3"
authors = ["ITensor developers <support@itensor.org> and contributors"]

[workspace]
Expand Down
2 changes: 2 additions & 0 deletions src/littleset.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ using Base.Broadcast: AbstractArrayStyle, Broadcasted, Style
struct LittleSet{Values}
values::Values
end
LittleSet(s::LittleSet{V}) where {V} = LittleSet{V}(s)
LittleSet{V1}(s::LittleSet{V2}) where {V1, V2} = LittleSet{V1}(s.values)
Base.Tuple(s::LittleSet) = Tuple(s.values)
Base.eltype(s::LittleSet) = eltype(s.values)
Base.length(s::LittleSet) = length(s.values)
Expand Down
8 changes: 6 additions & 2 deletions src/nameddimsarray.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using TypeParameterAccessors: TypeParameterAccessors, parenttype
using TypeParameterAccessors:
TypeParameterAccessors, Position, get_type_parameters, parenttype

# TODO: Check `allunique(dimnames)`?
struct NamedDimsArray{
Expand Down Expand Up @@ -34,8 +35,11 @@ dimnames(a::NamedDimsArray) = LittleSet(a.dimnames)
denamed(a::NamedDimsArray) = a.denamed
Base.parent(a::NamedDimsArray) = denamed(a)

denamedtype(T::Type{<:NamedDimsArray}) = get_type_parameters(T, Position(3))
nametype(T::Type{<:NamedDimsArray}) = eltype(get_type_parameters(T, Position(4)))

function TypeParameterAccessors.position(
::Type{<:AbstractNamedDimsArray}, ::typeof(parenttype)
)
return TypeParameterAccessors.Position(3)
return Position(3)
end
15 changes: 12 additions & 3 deletions test/test_basics.jl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Combinatorics: Combinatorics
using NamedDimsArrays: @names, AbstractNamedDimsArray, AbstractNamedDimsMatrix, LittleSet,
Name, NameMismatch, NamedDimsArray, NamedDimsCartesianIndex, NamedDimsCartesianIndices,
NamedDimsMatrix, aligndims, aligneddims, apply, dename, denamed, dim, dimnames, dims,
fusednames, inds, isnamed, mapinds, name, named, nameddims, namedoneto, product,
replacedimnames, replaceinds, setinds
NamedDimsMatrix, aligndims, aligneddims, apply, dename, denamed, denamedtype, dim,
dimnames, dims, fusednames, inds, isnamed, mapinds, name, named, nameddims, namedoneto,
nametype, product, replacedimnames, replaceinds, setinds
using Test: @test, @test_throws, @testset
using VectorInterface: scalartype

Expand Down Expand Up @@ -43,6 +43,8 @@ end
@test dim(na, "j") == 2
@test dims(na, ("j", "i")) == (2, 1)
@test na[1, 1] == a[1, 1]
@test denamedtype(typeof(na)) === typeof(a)
@test nametype(typeof(na)) === String

# equals (==)/isequal
a = randn(elt, 3, 4)
Expand Down Expand Up @@ -398,6 +400,13 @@ end
@test s′[2] == "x"
@test s′[3] == "c"
end

s = LittleSet((1, 2, 3))
@test LittleSet(s).values isa Tuple
@test LittleSet(s) == s
sp = LittleSet{NTuple{3, Float64}}(s)
@test eltype(sp) === Float64
@test values(sp) == (1.0, 2.0, 3.0)
end
@testset "show" begin
a = NamedDimsArray([1 2; 3 4], ("i", "j"))
Expand Down
Loading