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

Fix SimpleRegressionResults #174

Open
wants to merge 273 commits into
base: master
Choose a base branch
from
Open

Conversation

Gilles86
Copy link
Contributor

@Gilles86 Gilles86 commented Mar 19, 2018

@Gilles86 Gilles86 changed the title Fix SimpleRegressionResults (https://github.com/nistats/nistats/issues/150) Fix SimpleRegressionResults Mar 19, 2018
bthirion and others added 28 commits May 28, 2018 15:58
[WIP] Memory efficient F test
ENH: Replace DataFrame.as_matrix() with .values
corrected wrong voxel selection in spm_plot_auditory
…das version

 - Updated miniconda installer URL to miniconda3 to fix
 Pandas incorrect version problem
 (Same error as nilearn/nilearn#1672).
 - Updated minimum versions of dependencies in nistats/version.py .
 - Updated versions of dependencies in for TravisCI builds.
… num must be integer)

* 'master' of https://github.com/kchawla-pi/nistats:
  FIX: Use rint instead of ceil
  FIX: numpy.linspace parameter num must be integer
…_contrast)

Fix memory caching issue when doing .compute_contrast in SecondLevelModel
…l.compute_contrast

* 'master' of https://github.com/kchawla-pi/nistats:
  Spurious commit to trigger the disappeared TravisCI
  Replaced `ols` in comments with `Ordinary Least Squares` in 3 files for clarity
  rename test case for clarification
  first_level_model test case - memory caching computation
  simplify memory caching if statement
  simplify test case for memory caching
  fix memory caching not working properly when doing compute_contrast
  remove unused import
…lt arg)

Fixed: param img_filters no longer has a mutable arg ([]) as default
… mutable default arg)

* 'master' of https://github.com/kchawla-pi/nistats:
  Fixed: param img_filters no longer has a mutable arg ([]) as default
…mination)

 - Renamed manual-cache-timestamp.txt to manual-cache-timestamp
… from scratch)

Enable external contributors to rebuild CircleCI from scratch
@Gilles86
Copy link
Contributor Author

Gilles86 commented Dec 7, 2018

OK gave it another try.

The bigger point is that SimpleRegressionResults does not have access to X or Y anymore, so you would have to provide that explicitly to get to residuals or predictions.

Maybe SimpleRegressionResults should at least store X?

@kchawla-pi
Copy link
Collaborator

This one we will have to fix. No need to submit a new PR necessarily, tell me the command you used to merge master into this.

@kchawla-pi
Copy link
Collaborator

kchawla-pi commented Dec 8, 2018

  1. I created a new branch from the commit 2cd2f45 "Test files should not be in  commit".
  2. Then i did a git pull --log upstream master.
  3. It created conflicts which I solved (incorrectly it would seem).
  4. Now the tests are not passing.
  5. I haven't made the changes afterwards that you did as part of addressing the review so that may be why it is not passing.
    Maybe you can do it again.
    Maybe as a new PR.
    @GaelVaroquaux Can you help with the Git-Fu?

@kchawla-pi
Copy link
Collaborator

What do you think @Gilles86 , this seems like a good candidate for a new PR.
You can also focus on completing the other one first before restarting on this if you like.
I don't want to intrude if you are doing other stuff. Lemme know.

@kchawla-pi
Copy link
Collaborator

Hi @Gilles86 !

We have incorporated all of Nilstats functionality into Nilearn's master and if you are still interested, i would urge you to reopen this PR there.

We are archiving this repo, so it is read-only.

I know this PR has been stalled for a while but I'm hoping to see you on Nilearn!

# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Small bugs in SimpleRegressionResults
8 participants