Skip to content

Commit 4c61ed3

Browse files
lkdvoslkdvos
committed
Merge remote-tracking branch 'origin/master' into spacetypes
2 parents edf2145 + c5aa8cb commit 4c61ed3

File tree

3 files changed

+77
-31
lines changed

3 files changed

+77
-31
lines changed

‎src/sectors/sectors.jl

+1
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ Note that every element `c` should appear at most once, fusion degeneracies (if
119119
`FusionStyle(I) == GenericFusion()`) should be accessed via `Nsymbol(a, b, c)`.
120120
"""
121121
⊗(::Trivial, ::Trivial) = (Trivial(),)
122+
⊗(I::Sector) = (I,)
122123

123124
"""
124125
Nsymbol(a::I, b::I, c::I) where {I<:Sector} -> Integer

‎src/tensors/braidingtensor.jl

+6-6
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ end
168168

169169
blocks(b::BraidingTensor) = blocks(TensorMap(b))
170170

171-
function planar_contract!(α, A::BraidingTensor, B::AbstractTensorMap{S},
171+
function planar_contract!(α, A::BraidingTensor{S}, B::AbstractTensorMap{S},
172172
β, C::AbstractTensorMap{S},
173173
oindA::IndexTuple{2}, cindA::IndexTuple{2},
174174
oindB::IndexTuple, cindB::IndexTuple{2},
@@ -214,7 +214,7 @@ function planar_contract!(α, A::BraidingTensor, B::AbstractTensorMap{S},
214214
end
215215
return C
216216
end
217-
function planar_contract!(α, A::AbstractTensorMap{S}, B::BraidingTensor,
217+
function planar_contract!(α, A::AbstractTensorMap{S}, B::BraidingTensor{S},
218218
β, C::AbstractTensorMap{S},
219219
oindA::IndexTuple, cindA::IndexTuple{2},
220220
oindB::IndexTuple{2}, cindB::IndexTuple{2},
@@ -259,7 +259,7 @@ function planar_contract!(α, A::AbstractTensorMap{S}, B::BraidingTensor,
259259
C
260260
end
261261

262-
function planar_contract!(α, A::BraidingTensor, B::AbstractTensorMap{S},
262+
function planar_contract!(α, A::BraidingTensor{S}, B::AbstractTensorMap{S},
263263
β, C::AbstractTensorMap{S},
264264
oindA::IndexTuple{0}, cindA::IndexTuple{4},
265265
oindB::IndexTuple, cindB::IndexTuple{4},
@@ -327,7 +327,7 @@ function planar_contract!(α, A::BraidingTensor, B::AbstractTensorMap{S},
327327
return C
328328
end
329329

330-
function planar_contract!(α, A::AbstractTensorMap{S}, B::BraidingTensor,
330+
function planar_contract!(α, A::AbstractTensorMap{S}, B::BraidingTensor{S},
331331
β, C::AbstractTensorMap{S},
332332
oindA::IndexTuple, cindA::IndexTuple{4},
333333
oindB::IndexTuple{0}, cindB::IndexTuple{4},
@@ -395,7 +395,7 @@ function planar_contract!(α, A::AbstractTensorMap{S}, B::BraidingTensor,
395395
return C
396396
end
397397

398-
function planar_contract!(α, A::BraidingTensor, B::AbstractTensorMap{S},
398+
function planar_contract!(α, A::BraidingTensor{S}, B::AbstractTensorMap{S},
399399
β, C::AbstractTensorMap{S},
400400
oindA::IndexTuple{1}, cindA::IndexTuple{3},
401401
oindB::IndexTuple, cindB::IndexTuple{3},
@@ -457,7 +457,7 @@ function planar_contract!(α, A::BraidingTensor, B::AbstractTensorMap{S},
457457
return C
458458
end
459459

460-
function planar_contract!(α, A::AbstractTensorMap{S}, B::BraidingTensor,
460+
function planar_contract!(α, A::AbstractTensorMap{S}, B::BraidingTensor{S},
461461
β, C::AbstractTensorMap{S},
462462
oindA::IndexTuple, cindA::IndexTuple{3},
463463
oindB::IndexTuple{1}, cindB::IndexTuple{3},

‎src/tensors/tensor.jl

+70-25
Original file line numberDiff line numberDiff line change
@@ -139,42 +139,65 @@ function TensorMap(data::AbstractDict{<:Sector,<:DenseMatrix}, codom::ProductSpa
139139
F₂ = fusiontreetype(I, N₂)
140140
rowr = SectorDict{I, FusionTreeDict{F₁, UnitRange{Int}}}()
141141
colr = SectorDict{I, FusionTreeDict{F₂, UnitRange{Int}}}()
142-
blockiterator = blocksectors(codom ← dom)
143-
for c in blockiterator
144-
rowrc = FusionTreeDict{F₁, UnitRange{Int}}()
145-
colrc = FusionTreeDict{F₂, UnitRange{Int}}()
146-
offset1 = 0
147-
for s1 in sectors(codom)
142+
rowdims = SectorDict{I, Int}()
143+
coldims = SectorDict{I, Int}()
144+
if N₁ == 0 || N₂ == 0
145+
blocksectoriterator = (one(I),)
146+
elseif N₂ <= N₁
147+
blocksectoriterator = blocksectors(dom)
148+
else
149+
blocksectoriterator = blocksectors(codom)
150+
end
151+
for s1 in sectors(codom)
152+
for c in blocksectoriterator
153+
offset1 = get!(rowdims, c, 0)
154+
rowrc = get!(rowr, c) do
155+
FusionTreeDict{F₁, UnitRange{Int}}()
156+
end
148157
for f1 in fusiontrees(s1, c, map(isdual, codom.spaces))
149158
r = (offset1 + 1):(offset1 + dim(codom, s1))
150159
push!(rowrc, f1 => r)
151160
offset1 = last(r)
152161
end
162+
rowdims[c] = offset1
153163
end
154-
offset2 = 0
155-
for s2 in sectors(dom)
164+
end
165+
for s2 in sectors(dom)
166+
for c in blocksectoriterator
167+
offset2 = get!(coldims, c, 0)
168+
colrc = get!(colr, c) do
169+
FusionTreeDict{F₂, UnitRange{Int}}()
170+
end
156171
for f2 in fusiontrees(s2, c, map(isdual, dom.spaces))
157172
r = (offset2 + 1):(offset2 + dim(dom, s2))
158173
push!(colrc, f2 => r)
159174
offset2 = last(r)
160175
end
176+
coldims[c] = offset2
161177
end
162-
(haskey(data, c) && size(data[c]) == (offset1, offset2)) ||
178+
end
179+
for c in blocksectoriterator
180+
dim1 = get!(rowdims, c, 0)
181+
dim2 = get!(coldims, c, 0)
182+
if dim1 == 0 || dim2 == 0
183+
delete!(rowr, c)
184+
delete!(colr, c)
185+
else
186+
(haskey(data, c) && size(data[c]) == (dim1, dim2)) ||
163187
throw(DimensionMismatch())
164-
push!(rowr, c=>rowrc)
165-
push!(colr, c=>colrc)
188+
end
166189
end
167190
if !isreal(I) && eltype(valtype(data)) <: Real
168191
b = valtype(data)(undef, (0,0))
169192
V = typeof(complex(b))
170193
K = keytype(data)
171-
data2 = SectorDict{K,V}((c=>complex(data[c])) for c in blockiterator)
194+
data2 = SectorDict{K,V}((c=>complex(data[c])) for c in keys(rowr))
172195
A = typeof(data2)
173196
return TensorMap{S, N₁, N₂, I, A, F₁, F₂}(data2, codom, dom, rowr, colr)
174197
else
175198
V = valtype(data)
176199
K = keytype(data)
177-
data2 = SectorDict{K,V}((c=>data[c]) for c in blockiterator)
200+
data2 = SectorDict{K,V}((c=>data[c]) for c in keys(rowr))
178201
A = typeof(data2)
179202
return TensorMap{S, N₁, N₂, I, A, F₁, F₂}(data2, codom, dom, rowr, colr)
180203
end
@@ -202,30 +225,52 @@ function TensorMap(f, codom::ProductSpace{S,N₁}, dom::ProductSpace{S,N₂}) wh
202225
data = SectorDict{I,A}()
203226
rowr = SectorDict{I, FusionTreeDict{F₁, UnitRange{Int}}}()
204227
colr = SectorDict{I, FusionTreeDict{F₂, UnitRange{Int}}}()
205-
for c in blocksectors(codom ← dom)
206-
rowrc = FusionTreeDict{F₁, UnitRange{Int}}()
207-
colrc = FusionTreeDict{F₂, UnitRange{Int}}()
208-
offset1 = 0
209-
for s1 in sectors(codom)
228+
rowdims = SectorDict{I, Int}()
229+
coldims = SectorDict{I, Int}()
230+
if N₁ == 0 || N₂ == 0
231+
blocksectoriterator = (one(I),)
232+
elseif N₂ <= N₁
233+
blocksectoriterator = blocksectors(dom)
234+
else
235+
blocksectoriterator = blocksectors(codom)
236+
end
237+
for s1 in sectors(codom)
238+
for c in blocksectoriterator
239+
offset1 = get!(rowdims, c, 0)
240+
rowrc = get!(rowr, c) do
241+
FusionTreeDict{F₁, UnitRange{Int}}()
242+
end
210243
for f1 in fusiontrees(s1, c, map(isdual, codom.spaces))
211244
r = (offset1 + 1):(offset1 + dim(codom, s1))
212245
push!(rowrc, f1 => r)
213246
offset1 = last(r)
214247
end
248+
rowdims[c] = offset1
215249
end
216-
dim1 = offset1
217-
offset2 = 0
218-
for s2 in sectors(dom)
250+
end
251+
for s2 in sectors(dom)
252+
for c in blocksectoriterator
253+
offset2 = get!(coldims, c, 0)
254+
colrc = get!(colr, c) do
255+
FusionTreeDict{F₂, UnitRange{Int}}()
256+
end
219257
for f2 in fusiontrees(s2, c, map(isdual, dom.spaces))
220258
r = (offset2 + 1):(offset2 + dim(dom, s2))
221259
push!(colrc, f2 => r)
222260
offset2 = last(r)
223261
end
262+
coldims[c] = offset2
263+
end
264+
end
265+
for c in blocksectoriterator
266+
dim1 = get!(rowdims, c, 0)
267+
dim2 = get!(coldims, c, 0)
268+
if dim1 == 0 || dim2 == 0
269+
delete!(rowr, c)
270+
delete!(colr, c)
271+
else
272+
data[c] = f((dim1, dim2))
224273
end
225-
dim2 = offset2
226-
push!(data, c=>f((dim1, dim2)))
227-
push!(rowr, c=>rowrc)
228-
push!(colr, c=>colrc)
229274
end
230275
return TensorMap{S, N₁, N₂, I, SectorDict{I,A}, F₁, F₂}(data, codom, dom, rowr, colr)
231276
end

0 commit comments

Comments
 (0)