Small cleanup

Author: mtfishman

src/BlockArraysExtensions/blockedunitrange.jl

@@ -29,13 +29,18 @@ axis(a::AbstractVector) = axes(a, 1)
 function eachblockaxis(a::AbstractVector)
   return map(axis, blocks(a))
 end
+function blockaxistype(a::AbstractVector)
+  return eltype(eachblockaxis(a))
+end
 
 # Take a collection of axes and mortar them
 # into a single blocked axis.
 function mortar_axis(axs)
-  ## return blockedrange(length.(axs))
   return blockrange(axs)
 end
+function mortar_axis(axs::Vector{<:Base.OneTo{<:Integer}})
+  return blockedrange(length.(axs))
+end
 
 # Custom `BlockedUnitRange` constructor that takes a unit range
 # and a set of block lengths, similar to `BlockArray(::AbstractArray, blocklengths...)`.

src/abstractblocksparsearray/wrappedabstractblocksparsearray.jl

@@ -232,12 +232,15 @@ end
 
 # This circumvents some issues with `TypeParameterAccessors.similartype`.
 # TODO: Fix this poperly in `TypeParameterAccessors.jl`.
-function _similartype(arraytype::Type{<:AbstractArray}, elt::Type, axt)
-  return Base.promote_op(similar, arraytype, elt, axt)
+function _similartype(arrayt::Type{<:AbstractArray}, elt::Type, axt::Type{<:Tuple})
+  return Base.promote_op(similar, arrayt, elt, axt)
+end
+function _similartype(arrayt::Type{<:AbstractArray}, axt::Type{<:Tuple})
+  return Base.promote_op(similar, arrayt, axt)
 end
 
 function blocksparse_similar(a, elt::Type, axes::Tuple)
-  block_axt = Tuple{eltype.(eachblockaxis.(axes))...}
+  block_axt = Tuple{blockaxistype.(axes)...}
   blockt = _similartype(blocktype(a), Type{elt}, block_axt)
   return BlockSparseArray{elt,length(axes),blockt}(undef, axes)
 end

src/blocksparsearray/blocksparsearray.jl

@@ -173,8 +173,8 @@ end
 function BlockSparseArray{T,N}(
   ::UndefInitializer, axes::Tuple{Vararg{AbstractUnitRange{<:Integer},N}}
 ) where {T,N}
-  # TODO: Use `similartype` to determine the block type.
-  A = Base.promote_op(similar, Array{T}, Tuple{eltype.(eachblockaxis.(axes))...})
+  axt = Tuple{blockaxistype.(axes)...}
+  A = _similartype(Array{T}, axt)
   return BlockSparseArray{T,N,A}(undef, axes)
 end