pass tests

Author: ogauthe

src/fusion_trees/fusiontree.jl

@@ -187,7 +187,7 @@ end
 
 # TODO move to GradedUnitRanges
 function nsymbol(s1::AbstractSector, s2::AbstractSector, s3::AbstractSector)
-  full_space = tensor_product(s1, s2)
+  full_space = to_gradedrange(s1 ⊗ s2)
   x = findfirst(==(s3), blocklabels(full_space))
   isnothing(x) && return 0  # OR labelled(0, s3)?
   return Int(blocklengths(full_space)[x])

src/fusiontensor/array_cast.jl

@@ -76,7 +76,7 @@ end
 
 function to_array(ft::FusionTensor)
   bounds = block_dimensions.((codomain_axes(ft)..., domain_axes(ft)...))
-  bsa = BlockSparseArray{eltype(ft)}(blockedrange.(bounds))
+  bsa = BlockSparseArray{eltype(ft)}(undef, blockedrange.(bounds))
   for (f1, f2) in keys(trees_block_mapping(ft))
     b = findblock(ft, f1, f2)
     bsa[b] = bsa[b] + contract_fusion_trees(ft, f1, f2)  # init block when needed

src/permutedims/permutedims.jl

@@ -3,7 +3,7 @@
 using BlockArrays: blocklengths
 using Strided: Strided, @strided
 
-using TensorAlgebra: BlockedPermutation, blockedperm, blockpermute
+using TensorAlgebra: BlockedPermutation, permmortar, blockpermute
 
 function naive_permutedims(ft, biperm::BlockedPermutation{2})
   @assert ndims(ft) == length(biperm)
@@ -25,7 +25,7 @@ end
 function fusiontensor_permutedims(
   ft, new_codomain_indices::Tuple, new_domain_indices::Tuple
 )
-  biperm = blockedperm(new_codomain_indices, new_domain_indices)
+  biperm = permmortar((new_codomain_indices, new_domain_indices))
   return fusiontensor_permutedims(ft, biperm)
 end
 

test/basics/test_permutedims.jl

@@ -13,7 +13,7 @@ using FusionTensors:
   to_fusiontensor
 using GradedUnitRanges: dual, gradedrange, space_isequal
 using SymmetrySectors: O2, U1, SectorProduct, SU2
-using TensorAlgebra: blockedperm, tuplemortar
+using TensorAlgebra: permmortar, tuplemortar
 
 include("setup.jl")
 
@@ -35,7 +35,7 @@ include("setup.jl")
       ft2 = permutedims(ft1, ((1, 2), (3, 4)))   # trivial with tuple of 2 tuples
       @test ft2 === ft1  # same object
 
-      biperm = blockedperm((1, 2), (3, 4))
+      biperm = permmortar(((1, 2), (3, 4)))
       ft2 = permutedims(ft1, biperm)   # trivial with biperm
       @test ft2 === ft1  # same object
 
@@ -66,7 +66,7 @@ include("setup.jl")
     arr[1:2, 4:5, 5:5, 1:2] .= 3.0
     arr[3:4, 4:5, 1:4, 3:3] .= 4.0
     ft = to_fusiontensor(arr, codomain_legs, domain_legs)
-    biperm = blockedperm((3,), (2, 4, 1))
+    biperm = permmortar(((3,), (2, 4, 1)))
 
     ftp = permutedims(ft, biperm)
     @test ftp ≈ naive_permutedims(ft, biperm)
@@ -90,13 +90,13 @@ include("setup.jl")
       @test ft0p ≈ ft0
 
       @test permutedims(ft0, ((), ())) isa FusionTensor{Float64,0}
-      @test permutedims(ft0, blockedperm((), ())) isa FusionTensor{Float64,0}
+      @test permutedims(ft0, permmortar(((), ()))) isa FusionTensor{Float64,0}
     end
 
     g = gradedrange([U1(0) => 1, U1(1) => 2, U1(2) => 3])
     v = zeros((6,))
     v[1] = 1.0
-    biperm = blockedperm((), (1,))
+    biperm = permmortar(((), (1,)))
     ft1 = to_fusiontensor(v, (g,), ())
     ft2 = permutedims(ft1, biperm)
     @test isnothing(check_sanity(ft2))
@@ -137,7 +137,9 @@ end
   )
     g2b = dual(g2)
     for biperm in [
-      blockedperm((2, 1), (3, 4)), blockedperm((3, 1), (2, 4)), blockedperm((3, 1, 4), (2,))
+      permmortar(((2, 1), (3, 4))),
+      permmortar(((3, 1), (2, 4))),
+      permmortar(((3, 1, 4), (2,))),
     ]
       ft = to_fusiontensor(sds22, (g2, g2), (g2b, g2b))
       @test permutedims(ft, biperm) ≈ naive_permutedims(ft, biperm)
@@ -147,7 +149,7 @@ end
       @test permutedims(ft, biperm) ≈ naive_permutedims(ft, biperm)
       @test permutedims(adjoint(ft), biperm) ≈ naive_permutedims(adjoint(ft), biperm)
     end
-    for biperm in [blockedperm((1, 2, 3, 4), ()), blockedperm((), (3, 1, 2, 4))]
+    for biperm in [permmortar(((1, 2, 3, 4), ())), permmortar(((), (3, 1, 2, 4)))]
       ft = to_fusiontensor(sds22, (g2, g2), (g2b, g2b))
       @test permutedims(ft, biperm) ≈ naive_permutedims(ft, biperm)
     end