OnsetFormulas, Sequences, and Component Functions - v0.4.0 #104
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Comment on lines
+210
to
+211
|
|
||
|
|
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
behinger
changed the title
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
| @@ -62,7 +67,8 @@ function basis_shiftduration(evts, maxlength) | |||
| end | |||
|
|
|||
| # ## Simulate data with the new component type | |||
| erp = UnfoldSim.simulate( | |||
| erp = UnfoldSim.simulate_component( | |||
|
|
|||
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| @@ -40,7 +40,9 @@ design_single_shuffled = SingleSubjectDesign(; | |||
| :stimulus_type => ["natural", "artificial"], | |||
| :contrast_level => range(0, 1, length = 3), | |||
| ), | |||
|
|
|||
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| event_order_function = shuffle, | ||
|
|
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| @@ -46,11 +46,15 @@ makedocs(; | |||
| "Overview: Noise types" => "./generated/reference/noisetypes.md", | |||
| ], | |||
| "HowTo" => [ | |||
|
|
|||
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
docs/make.jl
Outdated
| "Get multiple trials with identical subject/item combinations" => "./generated/HowTo/repeatTrials.md", | ||
| "Define a new component (with variable duration and shift)" => "./generated/HowTo/newComponent.md", | ||
| "Generate multi channel data" => "./generated/HowTo/multichannel.md", | ||
| "Use existing experimental designs & onsets in the simulation" => "./generated/HowTo/predefinedData.md", | ||
| "Produce specific sequences of events" => "./generated/HowTo/sequence.md", | ||
|
|
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Comment on lines
+281
to
+282
| SequenceDesign{T}(d, s, sl) where {T<:AbstractDesign} = | ||
| new(d, check_sequence(s), sl) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| SequenceDesign{T}(d, s, sl) where {T<:AbstractDesign} = | |
| new(d, check_sequence(s), sl) | |
| SequenceDesign{T}(d, s, sl) where {T<:AbstractDesign} = new(d, check_sequence(s), sl) |
Comment on lines
+285
to
+286
| SequenceDesign(design, sequence) = | ||
| SequenceDesign(design = design, sequence = sequence) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| SequenceDesign(design, sequence) = | |
| SequenceDesign(design = design, sequence = sequence) | |
| SequenceDesign(design, sequence) = SequenceDesign(design = design, sequence = sequence) |
| SequenceDesign(design, sequence) = | ||
| SequenceDesign(design = design, sequence = sequence) | ||
|
|
||
| generate_events(rng,design::SequenceDesign{MultiSubjectDesign}) = error("not yet implemented") |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| generate_events(rng,design::SequenceDesign{MultiSubjectDesign}) = error("not yet implemented") | |
| generate_events(rng, design::SequenceDesign{MultiSubjectDesign}) = | |
| error("not yet implemented") |
| function UnfoldSim.generate_events(rng::AbstractRNG, design::RepeatDesign) | ||
| df = map(x -> generate_events(rng, design.design), 1:design.repeat) |> x -> vcat(x...) | ||
|
|
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
src/design.jl
Outdated
| # No way to find out what size it is without actually generating first... | ||
| Base.size( | ||
| design::Union{<:SequenceDesign,<:SubselectDesign,<:RepeatDesign{<:SequenceDesign}}, | ||
| ) = size(generate_events(design), 1) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| ) = size(generate_events(design), 1) | |
| ) = size(generate_events(design), 1) |
Co-authored-by: Benedikt Ehinger <[email protected]>
Add EffectsDesign
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New Features:
SequenceDesignwhich allows for fixed sequences e.g. Stimulus - Decision - Response, or Stim - Fix - Fix - Fix etc.@jschepers I think I added unittests for all new features + docstrings + tutorials
commit list