Skip to content

Commit 0d51b19

Browse files
committed
fix flip
1 parent 17d457d commit 0d51b19

File tree

3 files changed

+31
-2
lines changed

3 files changed

+31
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ label_dual(x) = label_dual(LabelledStyle(x), x)
1111
label_dual(::NotLabelled, x) = x
1212
label_dual(::IsLabelled, x) = labelled(unlabel(x), dual(label(x)))
1313

14+
flip(a::AbstractUnitRange) = dual(label_dual(a))
1415
flip(g::AbstractGradedUnitRange) = dual(gradedrange(label_dual.(blocklengths(g))))

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ end
1010
dual(a::LabelledUnitRange) = LabelledUnitRangeDual(a)
1111
nondual(a::LabelledUnitRangeDual) = a.nondual_unitrange
1212
dual(a::LabelledUnitRangeDual) = nondual(a)
13-
flip(a::LabelledUnitRangeDual) = dual(flip(nondual(a)))
13+
label_dual(::IsLabelled, a::LabelledUnitRangeDual) = dual(label_dual(nondual(a)))
1414
isdual(::LabelledUnitRangeDual) = true
1515
blocklabels(la::LabelledUnitRangeDual) = [label(la)]
1616

1717
LabelledNumbers.label(a::LabelledUnitRangeDual) = dual(label(nondual(a)))
1818
LabelledNumbers.unlabel(a::LabelledUnitRangeDual) = unlabel(nondual(a))
19+
LabelledNumbers.LabelledStyle(::LabelledUnitRangeDual) = IsLabelled()
1920

2021
for f in [:first, :getindex, :last, :length, :step]
2122
@eval Base.$f(a::LabelledUnitRangeDual, args...) =

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

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ using NDTensors.GradedAxes:
2929
isdual,
3030
nondual
3131
using NDTensors.LabelledNumbers:
32-
LabelledInteger, LabelledUnitRange, label, labelled, labelled_isequal, unlabel
32+
LabelledInteger, LabelledUnitRange, label, label_type, labelled, labelled_isequal, unlabel
3333
using Test: @test, @test_broken, @testset
3434
struct U1
3535
n::Int
@@ -70,6 +70,7 @@ end
7070
@test !isdual(la)
7171
@test labelled_isequal(la, la)
7272
@test space_isequal(la, la)
73+
@test label_type(la) == U1
7374

7475
lad = dual(la)
7576
@test lad isa LabelledUnitRangeDual
@@ -84,6 +85,22 @@ end
8485
@test isdual(lad)
8586
@test nondual(lad) === la
8687
@test dual(lad) === la
88+
@test label_type(lad) == U1
89+
90+
laf = flip(la)
91+
@test laf isa LabelledUnitRangeDual
92+
@test label(laf) == U1(1)
93+
@test unlabel(laf) == 1:2
94+
95+
ladf = flip(dual(la))
96+
@test ladf isa LabelledUnitRange
97+
@test label(ladf) == U1(-1)
98+
@test unlabel(ladf) == 1:2
99+
100+
lafd = dual(flip(la))
101+
@test lafd isa LabelledUnitRange
102+
@test label(lafd) == U1(-1)
103+
@test unlabel(lafd) == 1:2
87104

88105
# check default behavior for objects without dual
89106
la = labelled(1:2, 'x')
@@ -100,6 +117,16 @@ end
100117
@test isdual(lad)
101118
@test nondual(lad) === la
102119
@test dual(lad) === la
120+
121+
laf = flip(la)
122+
@test laf isa LabelledUnitRangeDual
123+
@test label(laf) == 'x'
124+
@test unlabel(laf) == 1:2
125+
126+
ladf = flip(lad)
127+
@test ladf isa LabelledUnitRange
128+
@test label(ladf) == 'x'
129+
@test unlabel(ladf) == 1:2
103130
end
104131

105132
@testset "GradedUnitRangeDual" begin

0 commit comments

Comments
 (0)