OnsetFormulas, Sequences, and Component Functions - v0.4.0 -> actually v0.5.0 #104
Conversation
This file contains hidden or 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
Co-authored-by: Judith Schepers <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ShiftOnsetByOne
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Comment on lines
+165
to
+166
| ) | ||
| ) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| ) | |
| ) | |
| ), | |
| ), |
| # add to every stepsize onset the maxlength of the response | ||
| #@debug onsets[stepsize:stepsize:end] | ||
| @debug stepsize | ||
| onsets[stepsize+1:stepsize:end] .+= 2 .* maxlength(simulation.components) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| onsets[stepsize+1:stepsize:end] .+= 2 .* maxlength(simulation.components) | |
| onsets[(stepsize+1):stepsize:end] .+= 2 .* maxlength(simulation.components) |
Co-authored-by: Judith Schepers <[email protected]>
…more comments to the code
…_continuoustime calculation
…tion of component offsets and sequences
…tead of a vector and adapt tests and max length continuoustime accordingly
Co-authored-by: Judith Schepers <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
| comb = vcat(gt_effects, ef) | ||
| plot_erp(comb; mapping = (; color = :type, col = :condition)) | ||
|
|
||
| # The simulated ground truth marginal effects, and the fitted marginal effects look similar as expected, but the fitted has some additional noise because of finite data (also as expected). No newline at end of file |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| # The simulated ground truth marginal effects, and the fitted marginal effects look similar as expected, but the fitted has some additional noise because of finite data (also as expected). | |
| # The simulated ground truth marginal effects, and the fitted marginal effects look similar as expected, but the fitted has some additional noise because of finite data (also as expected). | |
| axislegend(ax) | ||
| f | ||
|
|
||
| # Voila - the inter-onset intervals are `20` samples longer for condition `B`, exactly as specified. |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| # Voila - the inter-onset intervals are `20` samples longer for condition `B`, exactly as specified. | |
| # Voila - the inter-onset intervals are `20` samples longer for condition `B`, exactly as specified. | |
| off = get_offset(component) - minoffset(simulation.components) | ||
|
|
||
|
|
||
| @views epoch_data[1+off:length(component)+off, :] .+= |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| @views epoch_data[1+off:length(component)+off, :] .+= | |
| @views epoch_data[(1+off):(length(component)+off), :] .+= |
| @debug "3D Array" | ||
| @views epoch_data[:, 1:length(c), :] .+= simulate_component(rng, c, simulation) | ||
| off = get_offset(component) - minoffset(simulation.components) | ||
| @views epoch_data[:, 1+off:length(component)+off, :] .+= |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| @views epoch_data[:, 1+off:length(component)+off, :] .+= | |
| @views epoch_data[:, (1+off):(length(component)+off), :] .+= |
| o.offset_β | ||
|
|
||
| return Int.( | ||
| round.(reduce(vcat, rand.(deepcopy(rng), range.(offsets, offsets .+ widths), 1))) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| round.(reduce(vcat, rand.(deepcopy(rng), range.(offsets, offsets .+ widths), 1))) | |
| round.(reduce(vcat, rand.(deepcopy(rng), range.(offsets, offsets .+ widths), 1))), |
| e, | ||
| s, | ||
| one_onset:one_onset+max_length_component-1, | ||
| one_onset+minoffset(simulation.components):one_onset+max_length_component-1+maxoffset( |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| one_onset+minoffset(simulation.components):one_onset+max_length_component-1+maxoffset( | |
| (one_onset+minoffset(simulation.components)):(one_onset+max_length_component-1+maxoffset( |
| one_onset:one_onset+max_length_component-1, | ||
| one_onset+minoffset(simulation.components):one_onset+max_length_component-1+maxoffset( | ||
| simulation.components, | ||
| ), |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| ), | |
| )), |
test/sequence.jl
Outdated
| ) | ||
| s, e = simulate(design, c, NoOnset(); return_epoched = true) | ||
| @test size(s) == (40, 6) | ||
| end No newline at end of file |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| end | |
| end | |
Co-authored-by: Benedikt Ehinger <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
- Fix hanning function - include bases.jl tests Closes #122
Allow multiple different components in a sequence
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