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.

Sign up for GitHub

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

include lower truncation for normal distrubution #57

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+9 −4
Open

include lower truncation for normal distrubution #57

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7ff5efc
include lower truncation for normal distrubution
ReneSkukies Dec 11, 2023
71211ab
Apply suggestions from code review
ReneSkukies Dec 11, 2023
55a24bd
fix formatting
behinger Dec 12, 2023
3b72e0d
Apply suggestions from code review
behinger Dec 12, 2023
3b14299
Update onset.jl testset to include truncate_lower
ReneSkukies Dec 19, 2023
d943527
Apply suggestions from code review
ReneSkukies Dec 19, 2023
a9c31e9
Apply suggestions from code review
ReneSkukies Dec 19, 2023
1e02814
Apply suggestions from code review
ReneSkukies Dec 19, 2023
9ac5da3
mention truncate lower in docs
ReneSkukies Feb 16, 2024
c15e9a2
Merge branch 'main' into truncate_lower
ReneSkukies Feb 16, 2024
69902f8
Update test/onset.jl
ReneSkukies Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/onset.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,22 @@ end
σ # variance
offset = 0 # additional offset
truncate_upper = nothing # truncate at some sample?
truncate_lower = nothing # truncate at some lower sample?
end

#-------------
function rand_onsets(rng,onset::UniformOnset,design::AbstractDesign)
return Int.(round.(rand(deepcopy(rng), onset.offset:(onset.offset + onset.width), size(design))))
end

function rand_onsets(rng,onset::LogNormalOnset,design::AbstractDesign)
function rand_onsets(rng, onset::LogNormalOnset, design::AbstractDesign)
s = size(design)
fun = LogNormal(onset.μ,onset.σ)
fun = LogNormal(onset.μ, onset.σ)
if !isnothing(onset.truncate_upper)
fun = truncated(fun;upper=onset.truncate_upper)
fun = truncated(fun; upper = onset.truncate_upper)
end
if !isnothing(onset.truncate_lower)
fun = truncated(fun; lower = onset.truncate_lower)
end
return Int.(round.(onset.offset .+ rand(deepcopy(rng), fun, s)))
end
Expand Down
12 changes: 6 additions & 6 deletions test/onset.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
@test isapprox(std(log.(rand_vec)),1;atol=0.01)

# test offset
logNormalOnset = LogNormalOnset(;μ=4,σ=1,offset=100)
rand_vec = UnfoldSim.rand_onsets(StableRNG(1),logNormalOnset, dummydesign)
logNormalOnset = LogNormalOnset(; μ = 4, σ = 1, offset = 100)
rand_vec = UnfoldSim.rand_onsets(StableRNG(1), logNormalOnset, dummydesign)
@test minimum(rand_vec) > 100

# test Truncated
logNormalOnset = LogNormalOnset(;μ=4,σ=1,truncate_upper=100)
rand_vec = UnfoldSim.rand_onsets(StableRNG(1),logNormalOnset, dummydesign)
logNormalOnset =
LogNormalOnset(; μ = 4, σ = 1, truncate_lower = 10, truncate_upper = 100)
rand_vec = UnfoldSim.rand_onsets(StableRNG(1), logNormalOnset, dummydesign)
@test maximum(rand_vec) <= 100
@test minimum(rand_vec) >= 0
@test minimum(rand_vec) >= 10
end
@testset "gen_onsets" begin
# test accumulate always increasing
Expand Down