remove UnitRangeDual

Author: ogauthe

NDTensors/src/lib/BlockSparseArrays/ext/BlockSparseArraysGradedAxesExt/test/runtests.jl

@@ -4,13 +4,7 @@ using Test: @test, @testset, @test_broken
 using BlockArrays: Block, BlockedOneTo, blockedrange, blocklengths, blocksize
 using NDTensors.BlockSparseArrays: BlockSparseArray, block_nstored
 using NDTensors.GradedAxes:
-  GradedAxes,
-  GradedOneTo,
-  GradedUnitRangeDual,
-  UnitRangeDual,
-  blocklabels,
-  dual,
-  gradedrange
+  GradedAxes, GradedOneTo, GradedUnitRangeDual, blocklabels, dual, gradedrange
 using NDTensors.LabelledNumbers: label
 using NDTensors.SparseArrayInterface: nstored
 using NDTensors.TensorAlgebra: fusedims, splitdims
@@ -208,14 +202,14 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64})
       @test Array(b) == 2 * Array(a)
       @test_broken a[:, :] isa BlockSparseArray
       for ax in axes(b)
-        @test ax isa UnitRangeDual
+        @test ax isa BlockedUnitRange
       end
 
       I = [Block(1)[1:1]]
       @test_broken a[I, :]
       @test_broken a[:, I]
       @test size(a[I, I]) == (1, 1)
-      @test_broken GradedAxes.isdual(axes(a[I, I], 1))
+      @test !GradedAxes.isdual(axes(a[I, I], 1))
     end
 
     # Test case when all axes are dual

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

@@ -2,7 +2,6 @@ module GradedAxes
 include("blockedunitrange.jl")
 include("gradedunitrange.jl")
 include("dual.jl")
-include("unitrangedual.jl")
 include("gradedunitrangedual.jl")
 include("onetoone.jl")
 include("fusion.jl")

NDTensors/src/lib/GradedAxes/src/dual.jl

@@ -1,5 +1,7 @@
-function dual end
-isdual(::AbstractUnitRange) = false  # default behavior
+# default behavior: self-dual
+dual(r::AbstractUnitRange) = r
+nondual(r::AbstractUnitRange) = r
+isdual(::AbstractUnitRange) = false
 
 using NDTensors.LabelledNumbers:
   LabelledStyle, IsLabelled, NotLabelled, label, labelled, unlabel

NDTensors/src/lib/GradedAxes/src/onetoone.jl

@@ -30,13 +30,4 @@ function gradedisequal(::OneToOne, g::AbstractUnitRange)
   return !islabelled(eltype(g)) && (first(g) == last(g) == 1)
 end
 gradedisequal(g::AbstractUnitRange, a0::OneToOne) = gradedisequal(a0, g)
-
-gradedisequal(::UnitRangeDual, ::AbstractUnitRange) = false
-gradedisequal(::AbstractUnitRange, ::UnitRangeDual) = false
-gradedisequal(::OneToOne, ::UnitRangeDual) = false
-gradedisequal(::UnitRangeDual, ::OneToOne) = false
-function gradedisequal(a1::UnitRangeDual, a2::UnitRangeDual)
-  return gradedisequal(nondual(a1), nondual(a2))
-end
-
 gradedisequal(a1::AbstractUnitRange, a2::AbstractUnitRange) = a1 == a2

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

@@ -106,6 +106,7 @@ end
   @test length(ax) == length(a)
   @test blocklengths(ax) == blocklengths(a)
   @test blocklabels(ax) == blocklabels(a)
+  @test_broken(blockfirsts(a)) == [2, 3]
 
   # Regression test for ambiguity error.
   x = gradedrange(["x" => 2, "y" => 3])