From 50960701c18a48389c6dc0f8dbcc90bd470e8778 Mon Sep 17 00:00:00 2001 From: dehann Date: Thu, 4 Oct 2018 17:23:42 -0400 Subject: [PATCH 1/5] removing errors and warnings also needed downstream --- src/DualTree01.jl | 4 ++-- src/KDE01.jl | 5 +---- src/KernelDensityEstimate.jl | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/DualTree01.jl b/src/DualTree01.jl index 86fd575..db5fabc 100644 --- a/src/DualTree01.jl +++ b/src/DualTree01.jl @@ -595,7 +595,7 @@ end function getKDERangeLinspace(bd::BallTreeDensity; extend::Float64=0.1, N::Int=201) v = getKDERange(bd,extend=extend) - return range(v[1], stop=v[2], length=N) #linspace(v[1],v[2],N) + return range(v[1], stop=v[2], length=N) end function getKDEMax(p::BallTreeDensity;N=200) @@ -603,7 +603,7 @@ function getKDEMax(p::BallTreeDensity;N=200) for i in 1:p.bt.dims mm = marginal(p,[i]) rangeV = getKDERange(mm) - X = linspace(rangeV[1],rangeV[2],N) + X = range(rangeV[1],stop=rangeV[2],length=N) # yV = evaluateDualTree(mm,X) yV = mm(reshape(collect(X), 1, N)) # TODO should allow AbstractArray m[i] = X[findfirst(yV,maximum(yV))] diff --git a/src/KDE01.jl b/src/KDE01.jl index a2d9612..834d38f 100644 --- a/src/KDE01.jl +++ b/src/KDE01.jl @@ -39,9 +39,6 @@ function getPoints(bd::BallTreeDensity) return pts end -function getType(bd::BallTreeDensity) - return 0 -end #s = zeros(dens.D,dens.N); #s(:,double(dens.perm(dens.N + (1:dens.N)))+1) = dens.bandwidth(:,dens.N + (1:dens.N)); @@ -80,7 +77,7 @@ function marginal(bd::BallTreeDensity, ind::Array{Int,1}) p = kde!(pts[ind,:],sig[ind], wts) end -function randKernel(N::Int, M::Int, t::Int) +function randKernel(N::Int, M::Int, ::Type{KernelDensityEstimate.GaussianKer}) #t::Int) return randn(N,M) end diff --git a/src/KernelDensityEstimate.jl b/src/KernelDensityEstimate.jl index 653ef41..774e917 100644 --- a/src/KernelDensityEstimate.jl +++ b/src/KernelDensityEstimate.jl @@ -60,5 +60,4 @@ A Julia package for Kernel Density Estimation and approximations of their produc """ - end From d2e00ea41b38622aa6e4ee608d4351576a90d401 Mon Sep 17 00:00:00 2001 From: dehann Date: Thu, 4 Oct 2018 17:30:22 -0400 Subject: [PATCH 2/5] fix for findfirst --- src/DualTree01.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DualTree01.jl b/src/DualTree01.jl index db5fabc..99d76fb 100644 --- a/src/DualTree01.jl +++ b/src/DualTree01.jl @@ -606,7 +606,7 @@ function getKDEMax(p::BallTreeDensity;N=200) X = range(rangeV[1],stop=rangeV[2],length=N) # yV = evaluateDualTree(mm,X) yV = mm(reshape(collect(X), 1, N)) # TODO should allow AbstractArray - m[i] = X[findfirst(yV,maximum(yV))] + m[i] = X[something(findfirst(isequal(maximum(yV)), yV), 0)] # findfirst(yV,maximum(yV)) end return m end From 267873100f1f39535139fec6a1116dba63190196 Mon Sep 17 00:00:00 2001 From: dehann Date: Thu, 4 Oct 2018 20:40:19 -0400 Subject: [PATCH 3/5] fixes --- src/DualTree01.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DualTree01.jl b/src/DualTree01.jl index 99d76fb..ffa7d63 100644 --- a/src/DualTree01.jl +++ b/src/DualTree01.jl @@ -606,13 +606,13 @@ function getKDEMax(p::BallTreeDensity;N=200) X = range(rangeV[1],stop=rangeV[2],length=N) # yV = evaluateDualTree(mm,X) yV = mm(reshape(collect(X), 1, N)) # TODO should allow AbstractArray - m[i] = X[something(findfirst(isequal(maximum(yV)), yV), 0)] # findfirst(yV,maximum(yV)) + m[i] = X[something(findfirst(isequal(maximum(yV)), yV), 0)] # findfirst(yV,maximum(yV)) end return m end function getKDEMean(p::BallTreeDensity) - return vec(Statistics.mean(getPoints(p),2)) + return vec(Statistics.mean(getPoints(p),dims=2)) end function getKDEfit(p::BallTreeDensity; distribution=MvNormal) fit(distribution, getPoints(p)) From e7d8a94bc490a4791183ce9e7f09dfb9d31b3acf Mon Sep 17 00:00:00 2001 From: dehann Date: Thu, 4 Oct 2018 21:59:09 -0400 Subject: [PATCH 4/5] fix more warnings and deprecations --- src/BallTree01.jl | 6 +++--- src/BallTreeDensity01.jl | 8 ++++---- src/MSGibbs01.jl | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/BallTree01.jl b/src/BallTree01.jl index 3290a5b..dbbd025 100644 --- a/src/BallTree01.jl +++ b/src/BallTree01.jl @@ -359,9 +359,9 @@ function makeBallTree(_pointsMatrix::Array{Float64,2}, _weights::Array{Float64,1 end function printBallTree(bt::BallTree) - @show round(bt.centers,15); - @show round(bt.weights,15); - @show round(bt.ranges,15); + @show round.(bt.centers,dims=15); + @show round.(bt.weights,dims=15); + @show round.(bt.ranges,dims=15); @show bt.left_child; @show bt.right_child; @show bt.highest_leaf; diff --git a/src/BallTreeDensity01.jl b/src/BallTreeDensity01.jl index 4171f41..92c8e6e 100644 --- a/src/BallTreeDensity01.jl +++ b/src/BallTreeDensity01.jl @@ -311,10 +311,10 @@ end function printBallTree(bd::BallTreeDensity, rnd=15) printBallTree(bd.bt); - @show round(bd.means,rnd); - @show round(bd.bandwidth,rnd); - @show round(bd.bandwidthMin,rnd); - @show round(bd.bandwidthMax,rnd); + @show round.(bd.means,digits=rnd); + @show round.(bd.bandwidth,digits=rnd); + @show round.(bd.bandwidthMin,digits=rnd); + @show round.(bd.bandwidthMax,digits=rnd); nothing end diff --git a/src/MSGibbs01.jl b/src/MSGibbs01.jl index 4e2a384..c23f4c4 100644 --- a/src/MSGibbs01.jl +++ b/src/MSGibbs01.jl @@ -252,14 +252,14 @@ function printGlbs(g::GbGlb, tag=Union{}) end println("Ndim=$(g.Ndim), Ndens=$(g.Ndens), Nlevels=$(g.Nlevels), dNp=$(g.dNp), dNpts=$(g.dNpts)") @show g.ind - @show round(g.particles,2) - @show round(g.variance,2) - @show round(g.p,2) - @show round(g.Malmost,2) - @show round(g.Calmost,2) + @show round.(g.particles, digits=2) + @show round.(g.variance, digits=2) + @show round.(g.p, digits=2) + @show round.(g.Malmost, digits=2) + @show round.(g.Calmost, digits=2) @show g.levelList @show g.levelListNew - @show round(g.newPoints,4) + @show round.(g.newPoints, digits=4) @show g.newIndices end From bc44504129bf88d1c37ae9ca6b21eee0ab7bab03 Mon Sep 17 00:00:00 2001 From: dehann Date: Thu, 4 Oct 2018 22:29:24 -0400 Subject: [PATCH 5/5] deprecation warn fix --- src/DualTree01.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DualTree01.jl b/src/DualTree01.jl index ffa7d63..2d05ba2 100644 --- a/src/DualTree01.jl +++ b/src/DualTree01.jl @@ -394,7 +394,7 @@ function evalAvgLogL(bd1::BallTreeDensity, bd2::BallTreeDensity) W = getWeights(bd2) ind = findall(L.==0.0) ll = nothing - if sum(findall(W[ind])) > 0 + if sum(findall(x->x!=0, W[ind])) > 0 # println("evalAvgLogL -- in if") ll=-Inf else