Skip to content

Fixing issues with maxpolydeg #175

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

Merged
jacob-prince merged 1 commit into from
Mar 22, 2025
Merged

Fixing issues with maxpolydeg #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
298 changes: 45 additions & 253 deletions examples/example1.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion glmsingle/glmsingle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ def fit(self, design, data, stimdur, tr, outputdir=None, figuredir=None):
if 'maxpolydeg' not in params:
params['maxpolydeg'] = [
alt_round(
((self.data[r].shape[-1]*tr)/60)/2)
((self.data[r].shape[-1]*tr)/60)/2) + 1
for r in np.arange(numruns)]

if 'hrftoassume' not in params:
Expand Down
9 changes: 7 additions & 2 deletions glmsingle/ols/make_poly_matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,17 @@ def make_polynomial_matrix(n, degrees):

Args:
n (int): number of points
degrees (array): vector of polynomial degrees
degrees (array or int): vector of polynomial degrees or single degree

Returns:
polynomials: array of n x len(degrees)
polynomials: array of n x len(degrees) if degrees is array, or n x (degree+1) if degrees is int
"""
time_points = np.linspace(-1, 1, n)[np.newaxis].T

# Convert single integer to array of degrees from 0 to degrees
if isinstance(degrees, (int, np.integer)):
degrees = np.arange(degrees + 1)

polynomials = np.zeros((n, len(degrees)))

# Loop over degrees
Expand Down