tuplemortar with nested tuple input

Author: ogauthe

src/blockedtuple.jl

@@ -92,7 +92,7 @@ struct BlockedTuple{BlockLengths,Flat} <: AbstractBlockTuple
 end
 
 # TensorAlgebra Interface
-tuplemortar(tt::Vararg{Tuple}) = BlockedTuple{length.(tt)}(flatten_tuples(tt))
+tuplemortar(tt::Tuple{Vararg{Tuple}}) = BlockedTuple{length.(tt)}(flatten_tuples(tt))
 function BlockedTuple(flat::Tuple, BlockLengths::Tuple{Vararg{Int}})
   return BlockedTuple{BlockLengths}(flat)
 end

test/test_blockedtuple.jl

@@ -12,7 +12,7 @@ using TensorAlgebra: BlockedTuple, tuplemortar
   bt = BlockedTuple{divs}(flat)
 
   @test (@constinferred Tuple(bt)) == flat
-  @test bt == tuplemortar((true,), ('a', 2), ("b", 3.0))
+  @test bt == tuplemortar(((true,), ('a', 2), ("b", 3.0)))
   @test bt == BlockedTuple(flat, divs)
   @test BlockedTuple(bt) == bt
   @test blocklength(bt) == 3
@@ -25,7 +25,7 @@ using TensorAlgebra: BlockedTuple, tuplemortar
   # it is hard to make bt[Block(1)] type stable as compile-time knowledge of 1 is lost in Block
   @test bt[Block(1)] == blocks(bt)[1]
   @test bt[Block(2)] == blocks(bt)[2]
-  @test bt[Block(1):Block(2)] == tuplemortar((true,), ('a', 2))
+  @test bt[Block(1):Block(2)] == tuplemortar(((true,), ('a', 2)))
   @test bt[Block(2)[1:2]] == ('a', 2)
   @test bt[2:4] == ('a', 2, "b")
 
@@ -39,17 +39,17 @@ using TensorAlgebra: BlockedTuple, tuplemortar
 
   @test_throws DimensionMismatch BlockedTuple{(1, 2, 3)}(flat)
 
-  bt = tuplemortar((1,), (4, 2), (5, 3))
+  bt = tuplemortar(((1,), (4, 2), (5, 3)))
   @test Tuple(bt) == (1, 4, 2, 5, 3)
   @test blocklengths(bt) == (1, 2, 2)
   @test deepcopy(bt) == bt
 
   @test (@constinferred map(n -> n + 1, bt)) ==
     BlockedTuple{blocklengths(bt)}(Tuple(bt) .+ 1)
-  @test bt .+ tuplemortar((1,), (1, 1), (1, 1)) ==
+  @test bt .+ tuplemortar(((1,), (1, 1), (1, 1))) ==
     BlockedTuple{blocklengths(bt)}(Tuple(bt) .+ 1)
-  @test_throws DimensionMismatch bt .+ tuplemortar((1, 1), (1, 1), (1,))
+  @test_throws DimensionMismatch bt .+ tuplemortar(((1, 1), (1, 1), (1,)))
 
-  bt = tuplemortar((1:2, 1:2), (1:3,))
-  @test length.(bt) == tuplemortar((2, 2), (3,))
+  bt = tuplemortar(((1:2, 1:2), (1:3,)))
+  @test length.(bt) == tuplemortar(((2, 2), (3,)))
 end