more tests

Author: ogauthe

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

@@ -96,7 +96,7 @@ end
 blocklabels(a::GradedUnitRangeDual) = dual.(blocklabels(nondual(a)))
 
 function BlockArrays.combine_blockaxes(a1::GradedUnitRangeDual, a2::GradedUnitRangeDual)
-  return dual(combine_blockaxes(dual(a1), dual(a2)))
+  return dual(combine_blockaxes(nondual(a1), nondual(a2)))
 end
 
 function unlabel_blocks(a::GradedUnitRangeDual)

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

@@ -12,7 +12,8 @@ using BlockArrays:
   blocks,
   combine_blockaxes,
   mortar
-using NDTensors.GradedAxes: GradedOneTo, GradedUnitRange, OneToOne, blocklabels, gradedrange
+using NDTensors.GradedAxes:
+  GradedOneTo, GradedUnitRange, OneToOne, blocklabels, gradedrange, space_isequal
 using NDTensors.LabelledNumbers:
   LabelledUnitRange, islabelled, label, labelled, labelled_isequal, unlabel
 using Test: @test, @test_broken, @testset
@@ -97,8 +98,12 @@ end
     @test blocklengths(only(axes(a))) == blocklengths(a)
     @test blocklabels(only(axes(a))) == blocklabels(a)
 
-    @test combine_blockaxes(a, a) isa GradedOneTo
     @test axes(Base.Slice(a)) isa Tuple{typeof(a)}
+    @test AbstractUnitRange{Int}(a) == 1:5
+    b = combine_blockaxes(a, a)
+    @test b isa GradedOneTo
+    @test b == 1:5
+    @test space_isequal(b, a)
   end
 
   # Slicing operations
@@ -118,6 +123,11 @@ end
   @test blocklabels(ax) == blocklabels(a)
   @test blockfirsts(a) == [2, 3]
 
+  @test AbstractUnitRange{Int}(a) == 2:4
+  b = combine_blockaxes(a, a)
+  @test b isa GradedUnitRange
+  @test b == 1:4
+
   @test x[[2, 4]] == [labelled(2, "x"), labelled(4, "y")]
   @test labelled_isequal(x[BlockRange(1)], gradedrange(["x" => 2]))
 

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

@@ -11,7 +11,8 @@ using BlockArrays:
   blocklengths,
   blocks,
   findblock,
-  mortar
+  mortar,
+  combine_blockaxes
 using NDTensors.GradedAxes:
   AbstractGradedUnitRange,
   GradedAxes,
@@ -77,6 +78,20 @@ end
     @test isdual(ad)
     @test !isdual(a)
     @test axes(Base.Slice(a)) isa Tuple{typeof(a)}
+    @test AbstractUnitRange{Int}(ad) == 1:5
+    b = combine_blockaxes(ad, ad)
+    @test b isa GradedUnitRangeDual
+    @test b == 1:5
+    @test space_isequal(b, ad)
+
+    for x in iterate(ad)
+      @test x == 1
+      @test label(x) == U1(0)
+    end
+    for x in iterate(ad, labelled(3, U1(-1)))
+      @test x == 4
+      @test label(x) == U1(-1)
+    end
 
     @test blockfirsts(ad) == [labelled(1, U1(0)), labelled(3, U1(-1))]
     @test blocklasts(ad) == [labelled(2, U1(0)), labelled(5, U1(-1))]