Skip to content

Fix pspm_extract_segments#771

Merged
dominikbach merged 9 commits intodevelopfrom
fix-glm
Sep 5, 2024
Merged

Fix pspm_extract_segments#771
dominikbach merged 9 commits intodevelopfrom
fix-glm

Conversation

@dominikbach
Copy link
Copy Markdown
Contributor

Fixes a bug detected in beta testing.

Changes proposed in this pull request:

  • save events in pspm_glm
  • correct computation of events in case of edge cases in pspm_glm
  • add time stamp to the glm struct for troubleshooting
  • correct pspm_extract_segments when time units are markers and input is a GLM

@dominikbach dominikbach requested a review from teddphil August 29, 2024 07:54
@dominikbach dominikbach self-assigned this Aug 29, 2024
@dominikbach dominikbach added Bug Something isn't working Completed & Waiting for Review Completed and waiting for review labels Aug 29, 2024
@dominikbach dominikbach added this to the v7.0 milestone Aug 29, 2024
Comment thread src/pspm_glm.m
%% 12 collect data & regressors for output model
glm.input.data = y;
glm.input.sr = sr;
glm.input.events = events;
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I can add the description of glm to Outputs in help text if useful

@teddphil
Copy link
Copy Markdown

teddphil commented Sep 5, 2024

In pspm_extract_segments_test, at line 208, pspm_extract_segments expects that glm has the field glm.input.events, as this is used by line 158 in pspm_extract_segments. In the current version of pspm_extract_segments_test, there is no glm.input.events. I do not know if the test data shall be updated?

image

This has been resolved after updating dataset. Thank you.

@teddphil teddphil added Help Wanted Extra attention is needed Under Review Approved The pull request has been approved and can be checked and then merged. and removed Completed & Waiting for Review Completed and waiting for review Help Wanted Extra attention is needed Under Review labels Sep 5, 2024
@dominikbach dominikbach merged commit 6d8141b into develop Sep 5, 2024
@dominikbach dominikbach deleted the fix-glm branch September 5, 2024 10:56
@teddphil teddphil removed Bug Something isn't working Approved The pull request has been approved and can be checked and then merged. labels Sep 9, 2024
@teddphil teddphil mentioned this pull request Oct 12, 2024
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.

2 participants