Skip to content

Commit 99f469f

Browse files
committed
Removing deprecated files and updating REQUIRE
1 parent 8c095ed commit 99f469f

File tree

7 files changed

+5
-267
lines changed

7 files changed

+5
-267
lines changed

REQUIRE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ LaTeXStrings
1313
Makie
1414
MLKernels
1515
SpecialFunctions
16-
Statistics
1716
StatsBase
1817
StatsFuns
1918
ValueHistories

src/deprecated/BatchBSVM.jl

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/deprecated/OnlineRegression.jl

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/deprecated/OnlineXGPC.jl

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/deprecated/SparseBSVM.jl

Lines changed: 0 additions & 46 deletions
This file was deleted.

src/deprecated/XGPC_Functions.jl

Lines changed: 0 additions & 119 deletions
This file was deleted.

src/likelihood/logistic.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ end
5151

5252

5353
function local_updates!(model::VGP{<:AugmentedLogisticLikelihood,<:AnalyticInference})
54-
model.likelihood.c .= broadcast((μ,Σ)->sqrt.(diag(Σ)+μ.^2),model.μ,model.Σ)
54+
model.likelihood.c .= broadcast((μ,Σ)->sqrt.(Σ+abs2.(μ)),model.μ,diag.(model.Σ))
5555
model.likelihood.θ .= broadcast(c->0.5*tanh.(0.5*c)./c,model.likelihood.c)
5656
end
5757

5858
function local_updates!(model::SVGP{<:AugmentedLogisticLikelihood,<:AnalyticInference})
59-
model.likelihood.c .= broadcast((μ,Σ,K̃,κ)->sqrt.(K̃+opt_diag*Σ,κ)+*μ).^2),model.μ,model.Σ,model.K̃,model.κ)
59+
model.likelihood.c .= broadcast((μ,Σ,K̃,κ)->sqrt.(K̃+opt_diag*Σ,κ)+abs2.*μ)),model.μ,model.Σ,model.K̃,model.κ)
6060
model.likelihood.θ .= broadcast(c->0.5*tanh.(0.5*c)./c,model.likelihood.c)
6161
end
6262

@@ -92,14 +92,14 @@ end
9292

9393
function expecLogLikelihood(model::VGP{AugmentedLogisticLikelihood{T}}) where T
9494
tot = -model.nLatent*(0.5*model.nSample*logtwo)
95-
tot += sum(broadcast((μ,y,θ,Σ)->0.5.*(sum.*y)-dot(θ,Σ+μ.^2)),
95+
tot += sum(broadcast((μ,y,θ,Σ)->0.5.*(sum.*y)-dot(θ,Σ+abs2.(μ))),
9696
model.μ,model.y,model.likelihood.θ,diag.(model.Σ)))
9797
return tot
9898
end
9999

100100
function expecLogLikelihood(model::SVGP{AugmentedLogisticLikelihood{T}}) where T
101-
tot = -model.nLatent*(0.5*model.nSample*logtwo)
102-
tot += sum(broadcast((κμ,y,θ,κΣκ,K̃)->0.5.*(sum(κμ.*y)-dot(θ,K̃+κΣκ+κμ.^2))),
101+
tot = -model.nLatent*(0.5*model.inference.nSamplesUsed*logtwo)
102+
tot += sum(broadcast((κμ,y,θ,κΣκ,K̃)->0.5.*(sum(κμ.*y)-dot(θ,K̃+κΣκ+abs2.(κμ)))),
103103
model.κ.*model.μ,model.y,model.likelihood.θ,opt_diag(model.κ.*model.Σ,model.κ'),model.K̃)
104104
return model.inference.ρ*tot
105105
end

0 commit comments

Comments
 (0)