From 3be8263d5e098872f3c6e50f3aba03b40009396b Mon Sep 17 00:00:00 2001 From: konkam Date: Wed, 8 Apr 2020 18:35:50 +0200 Subject: [PATCH] corrected type mistakes --- src/Cnk.jl | 2 +- src/Vnk.jl | 2 +- src/common_functions.jl | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Cnk.jl b/src/Cnk.jl index d5d1fba..1cb1d6b 100644 --- a/src/Cnk.jl +++ b/src/Cnk.jl @@ -1,7 +1,7 @@ function Cnk(n, k, σ) # = Cnk(n, k, σ, 0) σ_arb = RR(σ) - return 1//fac(RR(k)) * sum([ (-1)^i * binom(k, i, RR) * risingfac(-i * σ_arb,n) for i in 0:k]) + return 1//fac(RR(k)) * sum([ (-1)^i * binom(k, i, RR_in) * risingfac(-i * σ_arb,n) for i in 0:k]) end diff --git a/src/Vnk.jl b/src/Vnk.jl index bafd92c..95eb004 100644 --- a/src/Vnk.jl +++ b/src/Vnk.jl @@ -1,7 +1,7 @@ function Vnk_NGG(n, k, β, σ) β_arb = RR(β) σ_arb = RR(σ) - return exp(β_arb) * σ_arb^(k-1) // RR(gamma(n)) * sum([binom(n-1, i, RR) * (-1)^i * β_arb ^(i//σ_arb) * real(gamma(k-i//CC(σ_arb), CC(β_arb))) for i in 0:(n-1)]) + return exp(β_arb) * σ_arb^(k-1) // RR(gamma(n)) * sum([binom(n-1, i, RR_in) * (-1)^i * β_arb ^(i//σ_arb) * real(gamma(k-i//CC(σ_arb), CC(β_arb))) for i in 0:(n-1)]) end function Vnk_2PD(n, k, θ, σ) diff --git a/src/common_functions.jl b/src/common_functions.jl index a208f84..8f2061e 100644 --- a/src/common_functions.jl +++ b/src/common_functions.jl @@ -4,8 +4,8 @@ import Nemo.binom, Nemo.gamma prec = 5000 ## Increase for better precision RR_in = RealField(prec) RR(x)::arb = RR_in(x) -CC_in = ComplexField(prec) -CC(x)::acb = CC_in(x) +CC = ComplexField(prec) +# CC(x)::acb = CC_in(x) binom(n::Int64, k::Int64, r::Nemo.ArbField) = binom(convert(UInt64, n),convert(UInt64, k), r) gamma(x::Int64) = Nemo.gamma(RR(x))