split gradedisequal into labelled_isequal and space_isequal

Author: ogauthe

NDTensors/src/lib/GradedAxes/src/gradedunitrange.jl

@@ -38,12 +38,13 @@ function Base.OrdinalRange{T,T}(a::GradedOneTo{<:LabelledInteger{T}}) where {T}
 end
 
 # == is just a range comparison that ignores labels. Need dedicated function to check equality.
-function gradedisequal(a1::AbstractUnitRange, a2::AbstractUnitRange)
-  return blockisequal(a1, a2)
+blocklabels(::AbstractUnitRange) = nothing
+function labelled_isequal(a1::AbstractUnitRange, a2::AbstractUnitRange)
+  return blockisequal(a1, a2) && (blocklabels(a1) == blocklabels(a2))
 end
 
-function gradedisequal(a1::AbstractGradedUnitRange, a2::AbstractGradedUnitRange)
-  return blockisequal(a1, a2) && (blocklabels(a1) == blocklabels(a2))
+function space_isequal(a1::AbstractUnitRange, a2::AbstractUnitRange)
+  return (isdual(a1) == isdual(a2)) && labelled_isequal(a1, a2)
 end
 
 # This is only needed in certain Julia versions below 1.10

NDTensors/src/lib/GradedAxes/src/unitrangedual.jl

@@ -108,11 +108,6 @@ BlockArrays.findblock(a::UnitRangeDual, index::Integer) = findblock(nondual(a),
 
 blocklabels(a::UnitRangeDual) = dual.(blocklabels(nondual(a)))
 
-gradedisequal(::UnitRangeDual, ::AbstractGradedUnitRange) = false
-gradedisequal(::AbstractGradedUnitRange, ::UnitRangeDual) = false
-function gradedisequal(a1::UnitRangeDual, a2::UnitRangeDual)
-  return gradedisequal(nondual(a1), nondual(a2))
-end
 function BlockArrays.combine_blockaxes(a1::UnitRangeDual, a2::UnitRangeDual)
   return dual(combine_blockaxes(dual(a1), dual(a2)))
 end

NDTensors/src/lib/GradedAxes/test/test_basics.jl

@@ -10,7 +10,7 @@ using BlockArrays:
   blocklengths,
   blocks
 using NDTensors.GradedAxes:
-  GradedOneTo, GradedUnitRange, blocklabels, gradedisequal, gradedrange
+  GradedOneTo, GradedUnitRange, blocklabels, labelled_isequal, gradedrange
 using NDTensors.LabelledNumbers: LabelledUnitRange, islabelled, label, labelled, unlabel
 using Test: @test, @test_broken, @testset
 @testset "GradedAxes basics" begin
@@ -41,7 +41,7 @@ using Test: @test, @test_broken, @testset
       @test label(x) == "y"
     end
     @test isnothing(iterate(a, labelled(5, "y")))
-    @test gradedisequal(a, a)
+    @test labelled_isequal(a, a)
     @test length(a) == 5
     @test step(a) == 1
     @test !islabelled(step(a))

NDTensors/src/lib/GradedAxes/test/test_dual.jl

@@ -9,7 +9,7 @@ using NDTensors.GradedAxes:
   blocksortperm,
   dual,
   flip,
-  gradedisequal,
+  space_isequal,
   gradedrange,
   isdual,
   nondual
@@ -25,12 +25,12 @@ Base.isless(c1::U1, c2::U1) = c1.n < c2.n
   ad = dual(a)
   @test eltype(ad) == LabelledInteger{Int,U1}
 
-  @test gradedisequal(dual(ad), a)
-  @test gradedisequal(nondual(ad), a)
-  @test gradedisequal(nondual(a), a)
-  @test gradedisequal(ad, ad)
-  @test !gradedisequal(a, ad)
-  @test !gradedisequal(ad, a)
+  @test space_isequal(dual(ad), a)
+  @test space_isequal(nondual(ad), a)
+  @test space_isequal(nondual(a), a)
+  @test space_isequal(ad, ad)
+  @test !space_isequal(a, ad)
+  @test !space_isequal(ad, a)
 
   @test isdual(ad)
   @test !isdual(a)
@@ -66,8 +66,8 @@ end
 @testset "flip" begin
   a = gradedrange([U1(0) => 2, U1(1) => 3])
   ad = dual(a)
-  @test gradedisequal(flip(a), dual(gradedrange([U1(0) => 2, U1(-1) => 3])))
-  @test gradedisequal(flip(ad), gradedrange([U1(0) => 2, U1(-1) => 3]))
+  @test space_isequal(flip(a), dual(gradedrange([U1(0) => 2, U1(-1) => 3])))
+  @test space_isequal(flip(ad), gradedrange([U1(0) => 2, U1(-1) => 3]))
 
   @test blocklabels(a) == [U1(0), U1(1)]
   @test blocklabels(dual(a)) == [U1(0), U1(-1)]

NDTensors/src/lib/GradedAxes/test/test_tensor_product.jl

@@ -11,7 +11,8 @@ using NDTensors.GradedAxes:
   fusion_product,
   flip,
   gradedrange,
-  gradedisequal,
+  labelled_isequal,
+  space_isequal,
   isdual,
   tensor_product
 
@@ -26,15 +27,15 @@ GradedAxes.fuse_labels(x::U1, y::U1) = U1(x.n + y.n)
   GradedAxes.fuse_labels(x::String, y::String) = x * y
 
   g0 = OneToOne()
-  @test gradedisequal(tensor_product(g0, g0), g0)
+  @test labelled_isequal(tensor_product(g0, g0), g0)
 
   a = gradedrange(["x" => 2, "y" => 3])
   b = tensor_product(a, a)
   @test b isa GradedOneTo
   @test length(b) == 25
   @test blocklength(b) == 4
   @test blocklengths(b) == [4, 6, 6, 9]
-  @test gradedisequal(b, gradedrange(["xx" => 4, "yx" => 6, "xy" => 6, "yy" => 9]))
+  @test labelled_isequal(b, gradedrange(["xx" => 4, "yx" => 6, "xy" => 6, "yy" => 9]))
 
   c = tensor_product(a, a, a)
   @test c isa GradedOneTo
@@ -44,18 +45,20 @@ end
 
 @testset "GradedAxes.fusion_product" begin
   g0 = OneToOne()
-  @test gradedisequal(fusion_product(g0, g0), g0)
+  @test labelled_isequal(fusion_product(g0, g0), g0)
 
   a = gradedrange([U1(1) => 1, U1(2) => 3, U1(1) => 1])
 
   b = fusion_product(a)
-  @test gradedisequal(b, gradedrange([U1(1) => 2, U1(2) => 3]))
+  @test labelled_isequal(b, gradedrange([U1(1) => 2, U1(2) => 3]))
 
   c = fusion_product(a, a)
-  @test gradedisequal(c, gradedrange([U1(2) => 4, U1(3) => 12, U1(4) => 9]))
+  @test labelled_isequal(c, gradedrange([U1(2) => 4, U1(3) => 12, U1(4) => 9]))
 
   d = fusion_product(a, a, a)
-  @test gradedisequal(d, gradedrange([U1(3) => 8, U1(4) => 36, U1(5) => 54, U1(6) => 27]))
+  @test labelled_isequal(
+    d, gradedrange([U1(3) => 8, U1(4) => 36, U1(5) => 54, U1(6) => 27])
+  )
 end
 
 @testset "dual and tensor_product" begin
@@ -65,19 +68,19 @@ end
   b = fusion_product(ad)
   @test b isa GradedOneTo
   @test !isdual(b)
-  @test gradedisequal(b, gradedrange([U1(-2) => 3, U1(-1) => 2]))
+  @test space_isequal(b, gradedrange([U1(-2) => 3, U1(-1) => 2]))
 
   c = fusion_product(ad, ad)
   @test c isa GradedOneTo
   @test !isdual(c)
-  @test gradedisequal(c, gradedrange([U1(-4) => 9, U1(-3) => 12, U1(-2) => 4]))
+  @test space_isequal(c, gradedrange([U1(-4) => 9, U1(-3) => 12, U1(-2) => 4]))
 
   d = fusion_product(ad, a)
   @test !isdual(d)
-  @test gradedisequal(d, gradedrange([U1(-1) => 6, U1(0) => 13, U1(1) => 6]))
+  @test space_isequal(d, gradedrange([U1(-1) => 6, U1(0) => 13, U1(1) => 6]))
 
   e = fusion_product(a, ad)
   @test !isdual(d)
-  @test gradedisequal(e, d)
+  @test space_isequal(e, d)
 end
 end

NDTensors/src/lib/Sectors/test/test_category_product.jl

@@ -14,7 +14,7 @@ using NDTensors.Sectors:
   recover_category_product_type,
   sector,
   trivial
-using NDTensors.GradedAxes: dual, fusion_product, gradedisequal, gradedrange
+using NDTensors.GradedAxes: dual, fusion_product, space_isequal, gradedrange
 using Test: @inferred, @test, @testset, @test_throws
 
 macro inferred_latest(ex)
@@ -150,10 +150,10 @@ end
   @testset "Fusion of NonAbelian products" begin
     p0 = sector(SU2(0))
     ph = sector(SU2(1//2))
-    @test gradedisequal((@inferred p0 ⊗ ph), gradedrange([sector(SU2(1//2)) => 1]))
+    @test space_isequal((@inferred p0 ⊗ ph), gradedrange([sector(SU2(1//2)) => 1]))
 
     phh = SU2(1//2) × SU2(1//2)
-    @test gradedisequal(
+    @test space_isequal(
       phh ⊗ phh,
       gradedrange([
         (SU2(0) × SU2(0)) => 1,
@@ -162,7 +162,7 @@ end
         (SU2(1) × SU2(1)) => 1,
       ]),
     )
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred phh ⊗ phh),
       gradedrange([
         (SU2(0) × SU2(0)) => 1,
@@ -177,10 +177,10 @@ end
     ı = Fib("1")
     τ = Fib("τ")
     s = ı × ı
-    @test gradedisequal((@inferred s ⊗ s), gradedrange([s => 1]))
+    @test space_isequal((@inferred s ⊗ s), gradedrange([s => 1]))
 
     s = τ × τ
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred s ⊗ s),
       gradedrange([(ı × ı) => 1, (τ × ı) => 1, (ı × τ) => 1, (τ × τ) => 1]),
     )
@@ -191,26 +191,26 @@ end
     g = gradedrange([
       (ı × Ising("1")) => 1, (τ × Ising("1")) => 1, (ı × ψ) => 1, (τ × ψ) => 1
     ])
-    @test gradedisequal((@inferred s ⊗ s), g)
+    @test space_isequal((@inferred s ⊗ s), g)
   end
 
   @testset "Fusion of mixed Abelian and NonAbelian products" begin
     p2h = U1(2) × SU2(1//2)
     p1h = U1(1) × SU2(1//2)
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred p2h ⊗ p1h), gradedrange([(U1(3) × SU2(0)) => 1, (U1(3) × SU2(1)) => 1])
     )
 
     p1h1 = U1(1) × SU2(1//2) × Z{2}(1)
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred p1h1 ⊗ p1h1),
       gradedrange([(U1(2) × SU2(0) × Z{2}(0)) => 1, (U1(2) × SU2(1) × Z{2}(0)) => 1]),
     )
   end
 
   @testset "Fusion of fully mixed products" begin
     s = U1(1) × SU2(1//2) × Ising("σ")
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred s ⊗ s),
       gradedrange([
         (U1(2) × SU2(0) × Ising("1")) => 1,
@@ -223,7 +223,7 @@ end
     ı = Fib("1")
     τ = Fib("τ")
     s = SU2(1//2) × U1(1) × τ
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred s ⊗ s),
       gradedrange([
         (SU2(0) × U1(2) × ı) => 1,
@@ -234,23 +234,23 @@ end
     )
 
     s = U1(1) × ı × τ
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred s ⊗ s), gradedrange([(U1(2) × ı × ı) => 1, (U1(2) × ı × τ) => 1])
     )
   end
 
   @testset "Fusion of different length Categories" begin
     @test sector(U1(1) × U1(0)) ⊗ sector(U1(1)) == sector(U1(2) × U1(0))
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred sector(SU2(0) × SU2(0)) ⊗ sector(SU2(1))),
       gradedrange([sector(SU2(1) × SU2(0)) => 1]),
     )
 
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred sector(SU2(1) × U1(1)) ⊗ sector(SU2(0))),
       gradedrange([sector(SU2(1) × U1(1)) => 1]),
     )
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred sector(U1(1) × SU2(1)) ⊗ sector(U1(2))),
       gradedrange([sector(U1(3) × SU2(1)) => 1]),
     )
@@ -266,7 +266,7 @@ end
     s2 = U1(0) × SU2(1//2) × Ising("1")
     g1 = gradedrange([s1 => 2])
     g2 = gradedrange([s2 => 1])
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred fusion_product(g1, g2)),
       gradedrange([U1(1) × SU2(0) × Ising("σ") => 2, U1(1) × SU2(1) × Ising("σ") => 2]),
     )
@@ -418,14 +418,14 @@ end
     phb = sector(; B=SU2(1//2))
     phab = sector(; A=SU2(1//2), B=SU2(1//2))
 
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred pha ⊗ pha), gradedrange([sector(; A=SU2(0)) => 1, sector(; A=SU2(1)) => 1])
     )
-    @test gradedisequal((@inferred pha ⊗ p0), gradedrange([pha => 1]))
-    @test gradedisequal((@inferred p0 ⊗ phb), gradedrange([phb => 1]))
-    @test gradedisequal((@inferred pha ⊗ phb), gradedrange([phab => 1]))
+    @test space_isequal((@inferred pha ⊗ p0), gradedrange([pha => 1]))
+    @test space_isequal((@inferred p0 ⊗ phb), gradedrange([phb => 1]))
+    @test space_isequal((@inferred pha ⊗ phb), gradedrange([phab => 1]))
 
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred phab ⊗ phab),
       gradedrange([
         sector(; A=SU2(0), B=SU2(0)) => 1,
@@ -440,10 +440,10 @@ end
     ı = Fib("1")
     τ = Fib("τ")
     s = sector(; A=ı, B=ı)
-    @test gradedisequal((@inferred s ⊗ s), gradedrange([s => 1]))
+    @test space_isequal((@inferred s ⊗ s), gradedrange([s => 1]))
 
     s = sector(; A=τ, B=τ)
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred s ⊗ s),
       gradedrange([
         sector(; A=ı, B=ı) => 1,
@@ -462,7 +462,7 @@ end
       sector(; A=ı, B=ψ) => 1,
       sector(; A=τ, B=ψ) => 1,
     ])
-    @test gradedisequal((@inferred s ⊗ s), g)
+    @test space_isequal((@inferred s ⊗ s), g)
   end
 
   @testset "Fusion of mixed Abelian and NonAbelian products" begin
@@ -476,15 +476,15 @@ end
     q21 = (N=U1(2),) × (J=SU2(1),)
     q22 = (N=U1(2),) × (J=SU2(2),)
 
-    @test gradedisequal((@inferred q1h ⊗ q1h), gradedrange([q20 => 1, q21 => 1]))
-    @test gradedisequal((@inferred q10 ⊗ q1h), gradedrange([q2h => 1]))
-    @test gradedisequal((@inferred q0h ⊗ q1h), gradedrange([q10 => 1, q11 => 1]))
-    @test gradedisequal((@inferred q11 ⊗ q11), gradedrange([q20 => 1, q21 => 1, q22 => 1]))
+    @test space_isequal((@inferred q1h ⊗ q1h), gradedrange([q20 => 1, q21 => 1]))
+    @test space_isequal((@inferred q10 ⊗ q1h), gradedrange([q2h => 1]))
+    @test space_isequal((@inferred q0h ⊗ q1h), gradedrange([q10 => 1, q11 => 1]))
+    @test space_isequal((@inferred q11 ⊗ q11), gradedrange([q20 => 1, q21 => 1, q22 => 1]))
   end
 
   @testset "Fusion of fully mixed products" begin
     s = sector(; A=U1(1), B=SU2(1//2), C=Ising("σ"))
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred s ⊗ s),
       gradedrange([
         sector(; A=U1(2), B=SU2(0), C=Ising("1")) => 1,
@@ -497,7 +497,7 @@ end
     ı = Fib("1")
     τ = Fib("τ")
     s = sector(; A=SU2(1//2), B=U1(1), C=τ)
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred s ⊗ s),
       gradedrange([
         sector(; A=SU2(0), B=U1(2), C=ı) => 1,
@@ -508,7 +508,7 @@ end
     )
 
     s = sector(; A=τ, B=U1(1), C=ı)
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred s ⊗ s),
       gradedrange([sector(; B=U1(2), A=ı, C=ı) => 1, sector(; B=U1(2), A=τ, C=ı) => 1]),
     )
@@ -520,7 +520,7 @@ end
     g2 = gradedrange([s2 => 1])
     s3 = sector(; A=U1(1), B=SU2(0), C=Ising("σ"))
     s4 = sector(; A=U1(1), B=SU2(1), C=Ising("σ"))
-    @test gradedisequal(
+    @test space_isequal(
       (@inferred_latest fusion_product(g1, g2)), gradedrange([s3 => 2, s4 => 2])
     )
 
@@ -529,7 +529,7 @@ end
     sAB = sector(; A=U1(1), B=SU2(1//2))
     gA = gradedrange([sA => 2])
     gB = gradedrange([sB => 1])
-    @test gradedisequal((@inferred fusion_product(gA, gB)), gradedrange([sAB => 2]))
+    @test space_isequal((@inferred fusion_product(gA, gB)), gradedrange([sAB => 2]))
   end
 end
 
@@ -545,7 +545,7 @@ end
   @test typeof(s) == typeof(sector((;)))  # empty NamedTuple is cast to Tuple{}
 
   g0 = gradedrange([s => 2])
-  @test gradedisequal((@inferred fusion_product(g0, g0)), gradedrange([s => 4]))
+  @test space_isequal((@inferred fusion_product(g0, g0)), gradedrange([s => 4]))
 
   @test (@inferred s × U1(1)) == sector(U1(1))
   @test (@inferred s × sector(U1(1))) == sector(U1(1))