Skip to content

Commit 9b7905c

Browse files
AFeuerpfeilAFeuerpfeil
committed
make GeometryStyle names more descriptive
1 parent 8f72c21 commit 9b7905c

File tree

9 files changed

+43
-43
lines changed

9 files changed

+43
-43
lines changed

‎src/operators/mpo.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Matrix Product Operator (MPO) acting on a finite tensor product space with a lin
1818
const FiniteMPO{O} = MPO{O, Vector{O}}
1919
Base.isfinite(O::MPO) = isfinite(typeof(O))
2020
Base.isfinite(::Type{<:FiniteMPO}) = true
21-
GeometryStyle(::Type{<:FiniteMPO}) = FiniteStyle()
21+
GeometryStyle(::Type{<:FiniteMPO}) = FiniteChainStyle()
2222
OperatorStyle(::Type{<:MPO}) = MPOStyle()
2323

2424
function FiniteMPO(Os::AbstractVector{O}) where {O}
@@ -40,7 +40,7 @@ Matrix Product Operator (MPO) acting on an infinite tensor product space with a
4040
"""
4141
const InfiniteMPO{O} = MPO{O, PeriodicVector{O}}
4242
Base.isfinite(::Type{<:InfiniteMPO}) = false
43-
GeometryStyle(::Type{<:InfiniteMPO}) = InfiniteStyle()
43+
GeometryStyle(::Type{<:InfiniteMPO}) = InfiniteChainStyle()
4444

4545
function InfiniteMPO(Os::AbstractVector{O}) where {O}
4646
for i in eachindex(Os)

‎src/operators/mpohamiltonian.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ OperatorStyle(::Type{<:MPOHamiltonian}) = HamiltonianStyle()
3636

3737
const FiniteMPOHamiltonian{O <: MPOTensor} = MPOHamiltonian{O, Vector{O}}
3838
Base.isfinite(::Type{<:FiniteMPOHamiltonian}) = true
39-
GeometryStyle(::Type{<:FiniteMPOHamiltonian}) = FiniteStyle()
39+
GeometryStyle(::Type{<:FiniteMPOHamiltonian}) = FiniteChainStyle()
4040

4141
function FiniteMPOHamiltonian(Ws::AbstractVector{O}) where {O <: MPOTensor}
4242
for i in eachindex(Ws)[1:(end - 1)]
@@ -48,7 +48,7 @@ end
4848

4949
const InfiniteMPOHamiltonian{O <: MPOTensor} = MPOHamiltonian{O, PeriodicVector{O}}
5050
Base.isfinite(::Type{<:InfiniteMPOHamiltonian}) = false
51-
GeometryStyle(::Type{<:InfiniteMPOHamiltonian}) = InfiniteStyle()
51+
GeometryStyle(::Type{<:InfiniteMPOHamiltonian}) = InfiniteChainStyle()
5252

5353
function InfiniteMPOHamiltonian(Ws::AbstractVector{O}) where {O <: MPOTensor}
5454
for i in eachindex(Ws)

‎src/states/finitemps.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ function Base.similar(ψ::FiniteMPS{A, B}) where {A, B}
312312
end
313313

314314
Base.isfinite(::Type{<:FiniteMPS}) = true
315-
GeometryStyle(::Type{<:FiniteMPS}) = FiniteStyle()
315+
GeometryStyle(::Type{<:FiniteMPS}) = FiniteChainStyle()
316316

317317
Base.eachindex(ψ::FiniteMPS) = eachindex(ψ.AL)
318318
Base.eachindex(l::IndexStyle, ψ::FiniteMPS) = eachindex(l, ψ.AL)

‎src/states/infinitemps.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ Base.length(ψ::InfiniteMPS) = length(ψ.AL)
242242
Base.eltype(ψ::InfiniteMPS) = eltype(typeof(ψ))
243243
Base.eltype(::Type{<:InfiniteMPS{A}}) where {A} = A
244244
Base.isfinite(::Type{<:InfiniteMPS}) = false
245-
GeometryStyle(::Type{<:InfiniteMPS}) = InfiniteStyle()
245+
GeometryStyle(::Type{<:InfiniteMPS}) = InfiniteChainStyle()
246246

247247
Base.copy(ψ::InfiniteMPS) = InfiniteMPS(copy(ψ.AL), copy(ψ.AR), copy(ψ.C), copy(ψ.AC))
248248
function Base.copy!(ψ::InfiniteMPS, ϕ::InfiniteMPS)

‎src/states/windowmps.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ struct WindowMPS{A <: GenericMPSTensor, B <: MPSBondTensor} <: AbstractFiniteMPS
5050
end
5151
end
5252

53-
GeometryStyle(::Type{<:WindowMPS}) = WindowStyle()
53+
GeometryStyle(::Type{<:WindowMPS}) = WindowChainStyle()
5454

5555
#===========================================================================================
5656
Constructors

‎src/utility/styles.jl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ struct HamiltonianStyle <: OperatorStyle end
2424
`GeometryStyle`
2525
2626
Holy trait used as a dispatch tag to distinguish between different
27-
geometry (currently finite and infinite). Concrete subtypes
28-
(`FiniteStyle` and `InfiniteStyle`) indicate whether a system is
29-
finite or infinite. Use `GeometryStyle` in method signatures to
27+
geometries Concrete subtypes
28+
(`FiniteChainStyle`, `InfiniteChainStyle` and `WindowChainStyle`) indicate whether a system is
29+
finite, infinite or a finite window in an infinite chain. Use `GeometryStyle` in method signatures to
3030
select implementation-specific code paths for different types.
3131
3232
To opt a custom type into this dispatch scheme implement:
@@ -38,6 +38,6 @@ abstract type GeometryStyle end
3838
GeometryStyle(x) = GeometryStyle(typeof(x))
3939
GeometryStyle(T::Type) = throw(MethodError(GeometryStyle, T)) # avoid stackoverflow if not defined
4040

41-
struct FiniteStyle <: GeometryStyle end
42-
struct InfiniteStyle <: GeometryStyle end
43-
struct WindowStyle <: GeometryStyle end
41+
struct FiniteChainStyle <: GeometryStyle end
42+
struct InfiniteChainStyle <: GeometryStyle end
43+
struct WindowChainStyle <: GeometryStyle end

‎test/operators.jl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module TestOperators
1010
using MPSKit
1111
using MPSKit: _transpose_front, _transpose_tail, C_hamiltonian, AC_hamiltonian,
1212
AC2_hamiltonian
13-
using MPSKit: GeometryStyle, FiniteStyle, InfiniteStyle, WindowStyle, OperatorStyle, MPOStyle,
13+
using MPSKit: GeometryStyle, FiniteChainStyle, InfiniteChainStyle, WindowChainStyle, OperatorStyle, MPOStyle,
1414
HamiltonianStyle
1515
using TensorKit
1616
using TensorKit: ℙ
@@ -36,8 +36,8 @@ module TestOperators
3636

3737
@test isfinite(mpo₁)
3838
@test isfinite(typeof(mpo₁))
39-
@test GeometryStyle(typeof(mpo₁)) == FiniteStyle()
40-
@test GeometryStyle(mpo₁) == FiniteStyle()
39+
@test GeometryStyle(typeof(mpo₁)) == FiniteChainStyle()
40+
@test GeometryStyle(mpo₁) == FiniteChainStyle()
4141
@test OperatorStyle(typeof(mpo₁)) == MPOStyle()
4242

4343

@@ -100,8 +100,8 @@ module TestOperators
100100

101101
@test !isfinite(H)
102102
@test !isfinite(typeof(H))
103-
@test GeometryStyle(typeof(H)) == InfiniteStyle()
104-
@test GeometryStyle(H) == InfiniteStyle()
103+
@test GeometryStyle(typeof(H)) == InfiniteChainStyle()
104+
@test GeometryStyle(H) == InfiniteChainStyle()
105105
@test OperatorStyle(typeof(H)) == MPOStyle()
106106
@test OperatorStyle(H) == MPOStyle()
107107
end
@@ -136,8 +136,8 @@ module TestOperators
136136

137137
@test isfinite(H)
138138
@test isfinite(typeof(H))
139-
@test GeometryStyle(typeof(H)) == FiniteStyle()
140-
@test GeometryStyle(H) == FiniteStyle()
139+
@test GeometryStyle(typeof(H)) == FiniteChainStyle()
140+
@test GeometryStyle(H) == FiniteChainStyle()
141141
@test OperatorStyle(typeof(H)) == HamiltonianStyle()
142142
@test OperatorStyle(H) == HamiltonianStyle()
143143

@@ -154,8 +154,8 @@ module TestOperators
154154

155155
@test !isfinite(H)
156156
@test !isfinite(typeof(H))
157-
@test GeometryStyle(typeof(H)) == InfiniteStyle()
158-
@test GeometryStyle(H) == InfiniteStyle()
157+
@test GeometryStyle(typeof(H)) == InfiniteChainStyle()
158+
@test GeometryStyle(H) == InfiniteChainStyle()
159159
@test OperatorStyle(typeof(H)) == HamiltonianStyle()
160160
@test OperatorStyle(H) == HamiltonianStyle()
161161
end

‎test/other.jl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module TestMiscellaneous
88
using ..TestSetup
99
using Test, TestExtras
1010
using MPSKit
11-
using MPSKit: GeometryStyle, FiniteStyle, InfiniteStyle, OperatorStyle, MPOStyle,
11+
using MPSKit: GeometryStyle, FiniteChainStyle, InfiniteChainStyle, OperatorStyle, MPOStyle,
1212
HamiltonianStyle
1313
using TensorKit
1414
using TensorKit: ℙ
@@ -109,12 +109,12 @@ module TestMiscellaneous
109109
@test OperatorStyle(MPO) == MPOStyle()
110110
@test OperatorStyle(InfiniteMPO) == MPOStyle()
111111

112-
@test GeometryStyle(FiniteMPOHamiltonian) == FiniteStyle()
113-
@test GeometryStyle(InfiniteMPS) == InfiniteStyle()
114-
@test GeometryStyle(FiniteMPS) == FiniteStyle()
115-
@test GeometryStyle(FiniteMPO) == FiniteStyle()
116-
@test GeometryStyle(FiniteMPOHamiltonian) == FiniteStyle()
117-
@test GeometryStyle(InfiniteMPO) == InfiniteStyle()
118-
@test GeometryStyle(InfiniteMPOHamiltonian) == InfiniteStyle()
112+
@test GeometryStyle(FiniteMPOHamiltonian) == FiniteChainStyle()
113+
@test GeometryStyle(InfiniteMPS) == InfiniteChainStyle()
114+
@test GeometryStyle(FiniteMPS) == FiniteChainStyle()
115+
@test GeometryStyle(FiniteMPO) == FiniteChainStyle()
116+
@test GeometryStyle(FiniteMPOHamiltonian) == FiniteChainStyle()
117+
@test GeometryStyle(InfiniteMPO) == InfiniteChainStyle()
118+
@test GeometryStyle(InfiniteMPOHamiltonian) == InfiniteChainStyle()
119119
end
120120
end

‎test/states.jl‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module TestStates
99
using Test, TestExtras
1010
using MPSKit
1111
using MPSKit: _transpose_front, _transpose_tail
12-
using MPSKit: GeometryStyle, FiniteStyle, InfiniteStyle, WindowStyle
12+
using MPSKit: GeometryStyle, FiniteChainStyle, InfiniteChainStyle, WindowChainStyle
1313
using MPSKit: TransferMatrix
1414
using TensorKit
1515
using TensorKit: ℙ
@@ -29,8 +29,8 @@ module TestStates
2929
@test isfinite(ψ)
3030
@test isfinite(typeof(ψ))
3131
@test isfinite(ψ) == isfinite(typeof(ψ))
32-
@test GeometryStyle(typeof(ψ)) == FiniteStyle()
33-
@test GeometryStyle(ψ) == FiniteStyle()
32+
@test GeometryStyle(typeof(ψ)) == FiniteChainStyle()
33+
@test GeometryStyle(ψ) == FiniteChainStyle()
3434
@test @constinferred physicalspace(ψ) == fill(d, L)
3535
@test all(x -> x ≾ D, @constinferred left_virtualspace(ψ))
3636
@test all(x -> x ≾ D, @constinferred right_virtualspace(ψ))
@@ -111,8 +111,8 @@ module TestStates
111111
@test !isfinite(typeof(ψ))
112112
@test !isfinite(ψ)
113113
@test isfinite(ψ) == isfinite(typeof(ψ))
114-
@test GeometryStyle(typeof(ψ)) == InfiniteStyle()
115-
@test GeometryStyle(ψ) == InfiniteStyle()
114+
@test GeometryStyle(typeof(ψ)) == InfiniteChainStyle()
115+
@test GeometryStyle(ψ) == InfiniteChainStyle()
116116

117117
@test eltype(ψ) == eltype(typeof(ψ))
118118

@@ -147,8 +147,8 @@ module TestStates
147147
]; tol
148148
)
149149

150-
@test GeometryStyle(typeof(ψ)) == InfiniteStyle()
151-
@test GeometryStyle(ψ) == InfiniteStyle()
150+
@test GeometryStyle(typeof(ψ)) == InfiniteChainStyle()
151+
@test GeometryStyle(ψ) == InfiniteChainStyle()
152152

153153
@test !isfinite(typeof(ψ))
154154

@@ -190,8 +190,8 @@ module TestStates
190190
# constructor 2 - used to take a "slice" from an infinite mps
191191
window_2 = WindowMPS(gs, 10)
192192

193-
@test GeometryStyle(typeof(window_1)) == WindowStyle()
194-
@test GeometryStyle(window_1) == WindowStyle()
193+
@test GeometryStyle(typeof(window_1)) == WindowChainStyle()
194+
@test GeometryStyle(window_1) == WindowChainStyle()
195195
@test GeometryStyle(window_1) == GeometryStyle(window_2)
196196

197197
@test eltype(window_1) == eltype(typeof(window_1))
@@ -257,8 +257,8 @@ module TestStates
257257
ϕ₁ = LeftGaugedQP(rand, ψ)
258258
ϕ₂ = LeftGaugedQP(rand, ψ)
259259

260-
@test GeometryStyle(ϕ₁) == FiniteStyle()
261-
@test GeometryStyle(typeof(ϕ₂)) == FiniteStyle()
260+
@test GeometryStyle(ϕ₁) == FiniteChainStyle()
261+
@test GeometryStyle(typeof(ϕ₂)) == FiniteChainStyle()
262262

263263
@test @constinferred physicalspace(ϕ₁) == physicalspace(ψ)
264264
@test @constinferred left_virtualspace(ϕ₁) == left_virtualspace(ψ)
@@ -298,8 +298,8 @@ module TestStates
298298
ϕ₁ = LeftGaugedQP(rand, ψ)
299299
ϕ₂ = LeftGaugedQP(rand, ψ)
300300

301-
@test GeometryStyle(ϕ₁) == InfiniteStyle()
302-
@test GeometryStyle(typeof(ϕ₂)) == InfiniteStyle()
301+
@test GeometryStyle(ϕ₁) == InfiniteChainStyle()
302+
@test GeometryStyle(typeof(ϕ₂)) == InfiniteChainStyle()
303303

304304
@test @constinferred physicalspace(ϕ₁) == physicalspace(ψ)
305305
@test @constinferred left_virtualspace(ϕ₁) == left_virtualspace(ψ)

0 commit comments

Comments
 (0)