Skip to content

Commit da9bb3a

Browse files
authored
Merge pull request #204 from ReactiveBayes/dev_fix_format
Fix format in repo
2 parents 131f236 + 7249b0b commit da9bb3a

36 files changed

+90
-95
lines changed

src/common.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ function binomial_prod(n, p, x)
4545
end
4646
end
4747

48-
mvdigamma(η,p) = sum( digamma+ (one(d) - d)/2) for d=1:p)
48+
mvdigamma(η, p) = sum(digamma+ (one(d) - d) / 2) for d in 1:p)

src/distributions/beta.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ getgradlogpartition(::NaturalParametersSpace, ::Type{Beta}) = (η) -> begin
6969
ηsum = η₁p + η₂p
7070
dig = digamma(ηsum)
7171

72-
return SA[digamma(η₁p) - dig, digamma(η₂p) - dig]
72+
return SA[digamma(η₁p)-dig, digamma(η₂p)-dig]
7373
end
7474

7575
getfisherinformation(::NaturalParametersSpace, ::Type{Beta}) = (η) -> begin

src/distributions/binomial.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ end
9595

9696
getgradlogpartition(::NaturalParametersSpace, ::Type{Binomial}, ntrials) = (η) -> begin
9797
(η₁,) = unpack_parameters(Binomial, η)
98-
return SA[ntrials*exp(η₁) / (one(η₁) + exp(η₁))]
98+
return SA[ntrials*exp(η₁)/(one(η₁)+exp(η₁))]
9999
end
100100

101101
getfisherinformation(::NaturalParametersSpace, ::Type{Binomial}, ntrials) = (η) -> begin

src/distributions/categorical.jl

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ end
2828
# The default implementation via `@generated` function fails to infer this
2929
exponential_family_typetag(::Categorical) = Categorical
3030

31-
isproper(::NaturalParametersSpace, ::Type{Categorical}, η, conditioner) = isinteger(conditioner) && (conditioner === length(η)) && (length(η) >= 2) && (η[end] 0)
31+
isproper(::NaturalParametersSpace, ::Type{Categorical}, η, conditioner) =
32+
isinteger(conditioner) && (conditioner === length(η)) && (length(η) >= 2) && (η[end] 0)
3233
isproper(::MeanParametersSpace, ::Type{Categorical}, θ, conditioner) =
3334
isinteger(conditioner) && (conditioner === length(θ)) && (length(θ) >= 2) && all(>(0), θ) && isapprox(sum(θ), 1)
3435

@@ -51,14 +52,14 @@ function (::MeanToNatural{Categorical})(tuple_of_θ::Tuple{Any}, _)
5152
return (LoopVectorization.vmap(pᵢ -> log(pᵢ / pₖ), p),)
5253
end
5354

54-
function (::NaturalToMean{Categorical})(tuple_of_η::Tuple{V}, _) where { V <: Vector }
55+
function (::NaturalToMean{Categorical})(tuple_of_η::Tuple{V}, _) where {V <: Vector}
5556
(η,) = tuple_of_η
5657
return (softmax(η),)
5758
end
5859

5960
# We use `Categorical` from `Distributions.jl` for the `MeanParametersSpace`
6061
# and their implementation supports only `Vector`s
61-
function (::NaturalToMean{Categorical})(tuple_of_η::Tuple{V}, _) where { V <: AbstractVector }
62+
function (::NaturalToMean{Categorical})(tuple_of_η::Tuple{V}, _) where {V <: AbstractVector}
6263
(η,) = tuple_of_η
6364
return (softmax(convert(Vector, η)),)
6465
end
@@ -87,7 +88,7 @@ getlogpartition(::NaturalParametersSpace, ::Type{Categorical}, conditioner) =
8788
return logsumexp(η)
8889
end
8990

90-
getgradlogpartition(::NaturalParametersSpace, ::Type{Categorical}, conditioner) =
91+
getgradlogpartition(::NaturalParametersSpace, ::Type{Categorical}, conditioner) =
9192
(η) -> begin
9293
if (conditioner !== length(η))
9394
throw(
@@ -97,7 +98,7 @@ getgradlogpartition(::NaturalParametersSpace, ::Type{Categorical}, conditioner)
9798
)
9899
end
99100
sumη = vmapreduce(exp, +, η)
100-
return vmap(d->exp(d)/sumη ,η)
101+
return vmap(d -> exp(d) / sumη, η)
101102
end
102103

103104
getfisherinformation(::NaturalParametersSpace, ::Type{Categorical}, conditioner) =

src/distributions/chi_squared.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ unpack_parameters(::Type{Chisq}, packed) = (first(packed),)
5656
isbasemeasureconstant(::Type{Chisq}) = NonConstantBaseMeasure()
5757

5858
getbasemeasure(::Type{Chisq}) = (x) -> exp(-x / 2)
59-
getlogbasemeasure(::Type{Chisq}) = (x) -> -x/2
59+
getlogbasemeasure(::Type{Chisq}) = (x) -> -x / 2
6060
getsufficientstatistics(::Type{Chisq}) = (log,)
6161

6262
getlogpartition(::NaturalParametersSpace, ::Type{Chisq}) = (η) -> begin
@@ -67,7 +67,7 @@ end
6767

6868
getgradlogpartition(::NaturalParametersSpace, ::Type{Chisq}) = (η) -> begin
6969
(η1,) = unpack_parameters(Chisq, η)
70-
return SA[digamma(η1 + one(η1)) + logtwo]
70+
return SA[digamma(η1 + one(η1))+logtwo]
7171
end
7272

7373
getfisherinformation(::NaturalParametersSpace, ::Type{Chisq}) = (η) -> begin

src/distributions/dirichlet.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,4 @@ end
9292
getgradlogpartition(::MeanParametersSpace, ::Type{Dirichlet}) = (θ) -> begin
9393
(α,) = unpack_parameters(Dirichlet, θ)
9494
return digamma.(α) .- digamma(sum(α))
95-
end
95+
end

src/distributions/erlang.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ end
6060
getgradlogpartition(::NaturalParametersSpace, ::Type{Erlang}) = (η) -> begin
6161
(η1, η2) = unpack_parameters(Erlang, η)
6262
dη1 = digamma(η1 + 1) - log(-η2)
63-
dη2 = - (η1 + one(η1))*inv(η2)
63+
dη2 = -(η1 + one(η1)) * inv(η2)
6464
return SA[dη1, dη2]
6565
end
6666

src/distributions/gamma_family/gamma_family.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ end
102102

103103
getgradlogpartition(::NaturalParametersSpace, ::Type{Gamma}) = (η) -> begin
104104
(η₁, η₂) = unpack_parameters(Gamma, η)
105-
return SA[digamma(η₁ + one(η₁)) - log(-η₂), - (η₁ + one(η₁)) / η₂]
105+
return SA[digamma(η₁ + one(η₁))-log(-η₂), -(η₁ + one(η₁))/η₂]
106106
end
107107

108108
# Mean parametrization
@@ -122,5 +122,5 @@ end
122122

123123
getgradlogpartition(::MeanParametersSpace, ::Type{Gamma}) = (θ) -> begin
124124
(shape, scale) = unpack_parameters(Gamma, θ)
125-
return SA[digamma(shape) - log(scale), - shape / scale]
126-
end
125+
return SA[digamma(shape)-log(scale), -shape/scale]
126+
end

src/distributions/gamma_inverse.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ end
6666
getgradlogpartition(::NaturalParametersSpace, ::Type{GammaInverse}) = (η) -> begin
6767
(η₁, η₂) = unpack_parameters(GammaInverse, η)
6868
dη1 = -digamma(-η₁ - one(η₁)) + log(-η₂)
69-
dη2 = - (-η₁ - one(η₁))/η₂
69+
dη2 = -(-η₁ - one(η₁)) / η₂
7070
return SA[dη1, dη2]
7171
end
7272

src/distributions/geometric.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ end
6969
getgradlogpartition(::MeanParametersSpace, ::Type{Geometric}) = (θ) -> begin
7070
(p,) = unpack_parameters(Geometric, θ)
7171
return SA[one(p) / (p^2 - p);]
72-
end
72+
end

0 commit comments

Comments
 (0)