Merge pull request #48

Fix Overloading `iterate`

Project.toml

@@ -1,7 +1,7 @@
 name = "HierarchicalEOM"
 uuid = "a62dbcb7-80f5-4d31-9a88-8b19fd92b128"
 authors = ["Yi-Te Huang <[email protected]>"]
-version = "1.3.1"
+version = "1.3.2"
 
 [deps]
 Crayons = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f"

src/ADOs.jl

@@ -106,17 +106,7 @@ function getindex(A::ADOs, r::UnitRange{Int})
 end
 getindex(A::ADOs, ::Colon) = getindex(A, 1:lastindex(A))
 
-function iterate(A::ADOs) 
-    return A[1], 2
-end
-function iterate(A::ADOs, state::Int) 
-    if state < length(A)
-        return A[state], state + 1
-    else
-        return A[state], nothing
-    end
-end
-iterate(A::ADOs, ::Nothing) = nothing
+iterate(A::ADOs, state::Int = 1) = state > length(A) ? nothing : (A[state], state + 1) 
 
 function show(io::IO, A::ADOs)
     print(io, 

src/Bath.jl

@@ -138,15 +138,7 @@ function getindex(B::AbstractBath, ::Colon)
     return getindex(B, 1:B.Nterm)
 end
 
-iterate(B::AbstractBath) = B[1], 2
-iterate(B::AbstractBath, ::Nothing) = nothing
-function iterate(B::AbstractBath, state) 
-    if state < length(B)
-        return B[state], state + 1
-    else
-        return B[state], nothing
-    end
-end
+iterate(B::AbstractBath, state::Int = 1) = state > length(B) ? nothing : (B[state], state + 1)
 
 isclose(a::Number, b::Number, rtol=1e-05, atol=1e-08) = abs(a - b) <= (atol + rtol * abs(b))
 

src/heom_matrices/Nvec.jl

@@ -45,17 +45,7 @@ getindex(nvec::Nvec, i::T) where {T <: Any} = nvec.data[i]
 
 keys(nvec::Nvec) = keys(nvec.data)
 
-function iterate(nvec::Nvec) 
-    return nvec[1], 2
-end
-function iterate(nvec::Nvec, state::Int) 
-    if state < length(nvec)
-        return nvec[state], state + 1
-    else
-        return nvec[state], nothing
-    end
-end
-iterate(nvec::Nvec, ::Nothing) = nothing
+iterate(nvec::Nvec, state::Int = 1) = state > length(nvec) ? nothing : (nvec[state], state + 1)
 
 function show(io::IO, nvec::Nvec)
     print(io, "Nvec($(nvec[:]))")

test/bath.jl

@@ -1,4 +1,6 @@
 # prepare coupling operator and coefficients of exponential-exponential-expansion terms
+η0 = [1]
+γ0 = [2]
 η1 = [1, 3, 5, 7, 9]
 η2 = [2, 4, 6, 8, 10]
 γ1 = [0.1, 0.3, 0.5, 0.3, 0.7]
@@ -9,7 +11,7 @@ op = [0 0; 0 0]
 
 ################################################
 # Boson bath
-b = BosonBath(op, η1, η2, combine=false)
+b = BosonBath(op, η1, γ1, combine=false)
 @test length(b) == 5
 
 ## check for combine
@@ -126,6 +128,8 @@ end
 
 ################################################
 # Exponent
+@test C(BosonBath(op, η0, γ0), [0.123])[1] ≈ η0[1] * exp(-γ0[1] * 0.123)
+
 ## check exceptions
 @test_throws ErrorException b[11]
 @test_throws ErrorException b[1:11]