From 55bb9b35b94d48a9cec209eb52eda9441d5cb717 Mon Sep 17 00:00:00 2001 From: Lucas ONDEL YANG <lucas.ondel@cnrs.fr> Date: Tue, 24 Jan 2023 14:24:31 +0100 Subject: [PATCH] change cumsum -> sum --- src/ops.jl | 6 +++--- test/runtests.jl | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/ops.jl b/src/ops.jl index 53a5044..5e1abee 100644 --- a/src/ops.jl +++ b/src/ops.jl @@ -1,13 +1,13 @@ # SPDX-License-Identifier: CECILL-2.1 """ - Base.cumsum(A[; n = nstates(A)]) + Base.cumsum(A[; init = initstates(A), n = nstates(A)]) Accumulate the weight of all the paths of length less or equal to `n`. """ -function Base.cumsum(A::AbstractFSA; vâ‚€ = α(A), n = nstates(A)) - v = vâ‚€ +function Base.sum(A::AbstractFSA; init = α(A), n = nstates(A)) + v = init σ = dot(v, ω(A)) + Ï(A) for i in 1:n v = T(A)' * v diff --git a/test/runtests.jl b/test/runtests.jl index 03f17ec..b1e006a 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -60,15 +60,15 @@ end # union B12 = convert((w, l) -> f(L, w, l), union(A1, A2)) - cs_B12 = cumsum(B12) - cs_B1_B2 = cumsum(B1) + cumsum(B2) + cs_B12 = sum(B12) + cs_B1_B2 = sum(B1) + sum(B2) @test cs_B12.tval[1] ≈ cs_B1_B2.tval[1] @test cs_B12.tval[2] == cs_B1_B2.tval[2] # concatenation B12 = convert((w, l) -> f(L, w, l), cat(A1, A2)) - cs_B12 = cumsum(B12) - cs_B1_B2 = cumsum(B2) * cumsum(B1) + cs_B12 = sum(B12) + cs_B1_B2 = sum(B2) * sum(B1) @test cs_B12.tval[1] ≈ cs_B1_B2.tval[1] @test cs_B12.tval[2] == cs_B1_B2.tval[2] @@ -82,10 +82,10 @@ end B2_n3 = B2 ∪ cat(B2, B2) ∪ cat(B2, B2, B2) ∪ Bϵ cB2p = closure(B2; plus = true) cB2 = closure(B2; plus = false) - cs_B2p_n3 = cumsum(B2p_n3; n = n) - cs_B2_n3 = cumsum(B2_n3; n = n) - cs_cB2p = cumsum(cB2p; n = n) - cs_cB2 = cumsum(cB2; n = n) + cs_B2p_n3 = sum(B2p_n3; n = n) + cs_B2_n3 = sum(B2_n3; n = n) + cs_cB2p = sum(cB2p; n = n) + cs_cB2 = sum(cB2; n = n) @test cs_cB2p.tval[1] ≈ cs_B2p_n3.tval[1] @test cs_cB2p.tval[2] == cs_B2p_n3.tval[2] @test cs_cB2.tval[1] ≈ cs_B2_n3.tval[1] @@ -93,13 +93,13 @@ end # reverse rB2 = convert((w, l) -> f(L, w, l), A2 |> reverse) - s1 = val(cumsum(B2).tval[2]) - s2 = Set((StringMonoid ∘ reverse ∘ val).((val ∘ cumsum)(rB2)[2])) + s1 = val(sum(B2).tval[2]) + s2 = Set((StringMonoid ∘ reverse ∘ val).((val ∘ sum)(rB2)[2])) @test s1 == s2 # renorm - @test Base.isapprox(val(cumsum(A1 |> renorm; n = 100)), val(one(K)), atol=1e-6) - @test Base.isapprox(val(cumsum(A2 |> renorm; n = 100)), val(one(K)), atol=1e-6) + @test Base.isapprox(val(sum(A1 |> renorm; n = 100)), val(one(K)), atol=1e-6) + @test Base.isapprox(val(sum(A2 |> renorm; n = 100)), val(one(K)), atol=1e-6) end end -- GitLab