Skip to content
This repository has been archived by the owner on Apr 2, 2020. It is now read-only.

Renamed resid methods to resdiuals #425

Merged
merged 13 commits into from
Jan 24, 2020
Merged

Conversation

kchawla-pi
Copy link
Collaborator

No description provided.

Copy link
Member

@bthirion bthirion left a comment

Choose a reason for hiding this comment

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

LGTM

…me-resid

* 'master' of https://github.com/nistats/nistats:
  First level residuals (nilearn#410)
  Replace numpy's deprecated dec with pytest's skipif (nilearn#423)
@codecov
Copy link

codecov bot commented Jan 13, 2020

Codecov Report

Merging #425 into master will increase coverage by 0.06%.
The diff coverage is 89.28%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #425      +/-   ##
==========================================
+ Coverage   92.58%   92.65%   +0.06%     
==========================================
  Files          40       40              
  Lines        4694     4708      +14     
==========================================
+ Hits         4346     4362      +16     
+ Misses        348      346       -2
Impacted Files Coverage Δ
nistats/model.py 89.23% <ø> (ø) ⬆️
nistats/tests/test_regression.py 100% <100%> (ø) ⬆️
nistats/regression.py 77.77% <83.33%> (+2.77%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 53514d6...59a9730. Read the comment docs.

@kchawla-pi
Copy link
Collaborator Author

Should I rename the method norm_resid, and parameter df_resid? What about the options, ['resid', 'norem_resid',...] ?

@bthirion
Copy link
Member

bthirion commented Jan 13, 2020 via email

@kchawla-pi
Copy link
Collaborator Author

I think so. But do we really need all these parameters ? (see #210, that I need to revive bzw).

@bthirion I think if you can complete Jerome's PR #416 that will serve the project better than completing #210 .

@kchawla-pi
Copy link
Collaborator Author

@bthirion If you are happy with the name changes, I will add tests for the changes. If there's an attribute/method you don't want changed tell me now and I won't add a test for that.

Also, some attributes might require to be treated as @property instead of using @setattr_on_read, only because we are changing the names.

If you think we should just change the names and no think about backwards compatibility, since this is still technically beta, let me know that as well.

@kchawla-pi
Copy link
Collaborator Author

Also, some attributes might require to be treated as @Property instead of using @setattr_on_read, only because we are changing the names.

The deprecated attributes might need to be set as property, not the final ones.

Copy link
Member

@bthirion bthirion left a comment

Choose a reason for hiding this comment

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

LGTM
Actually, I'd like to remove wresiduals and normalized residuals asap. But say, for another PR.

@kchawla-pi
Copy link
Collaborator Author

If you want to and are able to quickly work on that PR, while I adapt the GLM Reporter for multidimensional contrasts, that's fine with me. As long as your PR doesn't take too long.

…me-resid

* 'master' of https://github.com/nistats/nistats:
  Design matrices may have different columns (nilearn#416)
  Improve reporting: Correct alpha default value & enable 2 sided map_threshold (nilearn#418)
  Prevent duplication & insertion of reports from damaging website layout (nilearn#429)
  Fix whatsnew and the website's News/updates section (nilearn#428)
  GLM Reports: Computed masks are used if there is no user supplied one (nilearn#424)
 - Reduced verbosity in warning message.
 - Renamed wresiduals to whitened_residuals.
@kchawla-pi
Copy link
Collaborator Author

@bthirion Another review.
What do you wanna do with wY?

@bthirion
Copy link
Member

bthirion commented Jan 21, 2020 via email

@kchawla-pi
Copy link
Collaborator Author

Remove it? Or rename it to Y_whitened?

@bthirion
Copy link
Member

Sorry, in this PR we should rename it to 'Y_whitened', but in the next PR, I'd love to remove it.

@bthirion
Copy link
Member

I'm fine with the changes. Is it really meaningful to have deprection warning, since we're going to freeze nistats very soon ?

@kchawla-pi kchawla-pi merged commit 4c3d0e0 into nilearn:master Jan 24, 2020
@kchawla-pi kchawla-pi deleted the rename-resid branch January 24, 2020 13:09
kchawla-pi added a commit to kchawla-pi/nistats that referenced this pull request Jan 24, 2020
kchawla-pi added a commit that referenced this pull request Jan 24, 2020
kchawla-pi added a commit to kchawla-pi/nistats that referenced this pull request Jan 24, 2020
…ate-flake8

* 'master' of https://github.com/nistats/nistats:
  Renamed resid methods to resdiuals, w to whitened_ (nilearn#425)

# Conflicts:
#	nistats/model.py
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants