Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a WeightedResampler #890

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add a WeightedResampler #890

wants to merge 6 commits into from

Conversation

rofinn
Copy link
Member

@rofinn rofinn commented May 10, 2019

Works for all VariateForm and ValueSupport types

The tests should document our use case, but two questions remain.

  1. We've been using @testsets internally, but it's unclear if that's the desired test organization for Distributions.jl
  2. There is some overlap with the AliasTable type, so perhaps we can merge the two... or maybe the WeightedResampler should use an alias table internally? I believe the current implementation has O(n) runtime and the alias table would give O(1) with an upfront cost of O(n log(n))?

@ararslan
Copy link
Member

The implementation seems good to me but I'm not that familiar with the samplers stuff here.

@ararslan ararslan requested a review from simonbyrne May 10, 2019 21:30
src/samplers.jl Outdated Show resolved Hide resolved
Project.toml Outdated Show resolved Hide resolved
@codecov-io
Copy link

codecov-io commented May 22, 2019

Codecov Report

Merging #890 into master will increase coverage by 0.08%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #890      +/-   ##
==========================================
+ Coverage   77.74%   77.82%   +0.08%     
==========================================
  Files         112      113       +1     
  Lines        5370     5390      +20     
==========================================
+ Hits         4175     4195      +20     
  Misses       1195     1195
Impacted Files Coverage Δ
src/samplers.jl 100% <ø> (ø) ⬆️
src/samplers/resampler.jl 100% <100%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3e01523...5fe34b8. Read the comment docs.

@nickrobinson251
Copy link
Contributor

This would be useful for me :) thanks for adding, Rory!

Bump?

@nickrobinson251
Copy link
Contributor

Is there anything left to do, before merging this?

@nickrobinson251
Copy link
Contributor

Bump :)

@matbesancon
Copy link
Member

Sorry about the delay, this looks good to my untrained eyes, and been stalled too long. @rofinn we can merge this after the conflict is resolved

test = ["Calculus", "Distributed", "FiniteDifferences", "ForwardDiff", "JSON", "StaticArrays", "Test"]
test = ["Calculus", "Distances", "Distributed", "FiniteDifferences", "ForwardDiff", "JSON", "StaticArrays", "Test"]


Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

wv::AbstractWeights
end

function WeightedResampler(obs::T, wv::AbstractWeights) where T<:AbstractArray
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any reason to restrict weights to AbstractWeights rather than AbstractVector? At JuliaLang/julia#31395, I made functions accept any array since there's no ambiguity.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Idk but maybe @rofinn does

But also it'd be an easy follow up to loosen it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping @rofinn ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we merge as is and open an issue about this? It'd be a non breaking change to loosen the constraint in future. Or just loosen it now and fix it if there's a bug report

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess merging this as-is is OK. I've noticed that the weights are passed directly to sample, so if we loosen the signature we should also ensure we convert the argument to AbstractWeights, which is what sample expects (currently at least). But I still think loosening this is a good idea, though not a requirement.

@matbesancon
Copy link
Member

bump on this :)

"""
struct WeightedResampler{F<:VariateForm, S<:ValueSupport, T<:AbstractArray} <: Sampleable{F, S}
obs::T
wv::AbstractWeights
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woops, this should be a type parameter!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants