From c364787187ebb7630937f50338353ff7a92a4b1c Mon Sep 17 00:00:00 2001 From: George Datseris Date: Mon, 13 Jan 2020 14:33:01 +0100 Subject: [PATCH 1/2] export @dim macro --- src/DimensionalData.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/DimensionalData.jl b/src/DimensionalData.jl index c93adcef0..471587652 100644 --- a/src/DimensionalData.jl +++ b/src/DimensionalData.jl @@ -78,6 +78,8 @@ export AbstractDimensionalArray, DimensionalArray export data, dims, refdims, metadata, name, shortname, val, label, units, order, bounds, locus, grid, <| +export @dim + include("interface.jl") include("grid.jl") include("dimension.jl") From e73c687b5fe2b0ebb82dc0deb3e56af9cd41481a Mon Sep 17 00:00:00 2001 From: Rafael Schouten Date: Sun, 9 Feb 2020 14:53:21 +1100 Subject: [PATCH 2/2] remove additional abstract array types --- src/array.jl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/array.jl b/src/array.jl index 7556b30bb..870a0a43c 100644 --- a/src/array.jl +++ b/src/array.jl @@ -1,12 +1,9 @@ """ Probably backed by an array, but might not be. Not good for broadcasting. -""" -abstract type AbstractDimensionalPseudoArray{T,N,D<:Tuple} <: AbstractArray{T,N} end +These arrays should be fixed with a dependency on DiskArrays.jl """ -Definately backed by an array. -""" -abstract type AbstractDimensionalArray{T,N,D,A} <: AbstractDimensionalPseudoArray{T,N,D} end +abstract type AbstractDimensionalArray{T,N,D<:Tuple,A} <: AbstractArray{T,N} end const AbDimArray = AbstractDimensionalArray