bugfix

rafaqz · Aug 31, 2023 · 2af083a · 2af083a
1 parent 1a7d8ef
commit 2af083a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/utils.jl b/src/utils.jl
@@ -156,7 +156,7 @@ function uniquekeys(das::Tuple{AbstractDimArray,Vararg{AbstractDimArray}})
     uniquekeys(map(Symbol ∘ name, das))
 end
 function uniquekeys(das::Vector{<:AbstractDimArray})
-    map(uniquekeys ∘ Symbol ∘ name, das)
+    length(das) == 0 ? Symbol[] : uniquekeys(map(Symbol ∘ name, das))
 end
 function uniquekeys(keys::Vector{Symbol})
     map(enumerate(keys)) do (id, k)

diff --git a/test/stack.jl b/test/stack.jl
@@ -24,7 +24,6 @@ mixed = DimStack(da1, da2, da4)
         DimStack((one=da1, two=da2, three=da3)) == s
     @test length(DimStack(NamedTuple())) == length(DimStack()) == 0
     @test dims(DimStack()) == dims(DimStack(NamedTuple())) == ()
-    DimStack(, ())
 end
 
 @testset "ConstructionBase" begin

diff --git a/test/utils.jl b/test/utils.jl
@@ -1,6 +1,7 @@
 using DimensionalData, Test, Dates
 using DimensionalData.LookupArrays, DimensionalData.Dimensions
 using .LookupArrays: shiftlocus, maybeshiftlocus
+using DimensionalData: uniquekeys
 
 @testset "reverse" begin
     @testset "dimension" begin
@@ -215,3 +216,15 @@ end
                                                    1.0 2.0 3.0]
     end
 end
+
+@testset "uniquekeys" begin
+    da1 = rand(X(2), Y(2); name=:name1)
+    da2 = rand(X(2), Y(2); name=:name1)
+    da3 = rand(X(2), Y(2); name=:name2)
+    @test uniquekeys([da1, da2, da3]) == [:layer1, :layer2, :name2] # Should we keep thoe original name?
+    @test uniquekeys((da1, da2, da3)) == (:layer1, :layer2, :name2) # Should we keep thoe original name?
+    @test uniquekeys([:name1, :name1, :name2]) == [:layer1, :layer2, :name2] # Should we keep thoe original name?
+    @test uniquekeys((:name1, :name1, :name2)) == (:layer1, :layer2, :name2) 
+    @test uniquekeys(Symbol[]) == Symbol[]
+    @test uniquekeys(()) == ()
+end