force dims and refdims to be tuples

rafaqz · Oct 2, 2019 · 09e1f6c · 09e1f6c · rafaqz · Oct 2, 2019
1 parent b1531d2
commit 09e1f6c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "DimensionalData"
 uuid = "0703355e-b756-11e9-17c0-8b28908087d0"
 authors = ["Rafael Schouten <rafaelschouten@gmail.com>"]
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"

diff --git a/src/array.jl b/src/array.jl
@@ -1,4 +1,4 @@
-abstract type AbstractDimensionalArray{T,N,D} <: AbstractArray{T,N} end
+abstract type AbstractDimensionalArray{T,N,D<:Tuple} <: AbstractArray{T,N} end
 
 const AbDimArray = AbstractDimensionalArray
 
@@ -123,7 +123,7 @@ A basic DimensionalArray type
 
 Maintains and updates its dimensions through transformations
 """
-struct DimensionalArray{T,N,D,R,A<:AbstractArray{T,N}} <: AbstractDimensionalArray{T,N,D}
+struct DimensionalArray{T,N,D<:Tuple,R<:Tuple,A<:AbstractArray{T,N}} <: AbstractDimensionalArray{T,N,D}
     data::A
     dims::D
     refdims::R

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -22,7 +22,12 @@ using DimensionalData: val, basetype, slicedims, dims2indices, formatdims,
 # Basic dim and array initialisation
 
 a = ones(5, 4)
+# Must construct with a tuple for dims/refdims
+@test_throws MethodError DimensionalArray(a, X((140, 148)))
+@test_throws MethodError DimensionalArray(a, (X((140, 148)), Y((2, 11))), Z(1)) 
 da = DimensionalArray(a, (X((140, 148)), Y((2, 11))))
+
+
 dimz = dims(da)
 @test slicedims(dimz, (2:4, 3)) == ((X(LinRange(142,146,3)),), (Y(8.0),))
 @test name(dimz) == ("X", "Y")