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.

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

A few fixes to SFM. #816

Merged
merged 4 commits into from Feb 9, 2016

Conversation

Projects
None yet
2 participants
@arokem
Member

arokem commented Dec 21, 2015

Previous reference was to a preprint that is now superseded by a peer-reviewed publication.

@arokem arokem changed the title from DOC: Updated the SFM reference wherever that appears. to WIP: A few fixes to SFM. Dec 21, 2015

@arokem

This comment has been minimized.

Member

arokem commented Dec 21, 2015

Changed this to WIP, because I need to do a couple more things in here.

@arokem arokem force-pushed the arokem:update-sfm-reference branch 2 times, most recently from 5b0c913 to d835662 Dec 21, 2015

@arokem arokem changed the title from WIP: A few fixes to SFM. to A few fixes to SFM. Dec 22, 2015

@arokem

This comment has been minimized.

Member

arokem commented Dec 22, 2015

This is ready for review. I managed to remove many of the warnings that arise here. The remaining ones would require some bending over backward, that I would rather avoid, because it would make the code hard to read, or slower to run (unless someone has some good suggestion...).

Returns
-------
ndarray : each column is a rotated version of the response function.

This comment has been minimized.

@Garyfallidis

Garyfallidis Jan 17, 2016

Member

Non standard docstring for parameter explanation

@arokem

This comment has been minimized.

Member

arokem commented Jan 22, 2016

OK - I have addressed your comment.

@arokem arokem force-pushed the arokem:update-sfm-reference branch from d835662 to f3ace86 Jan 22, 2016

@arokem

This comment has been minimized.

Member

arokem commented Jan 22, 2016

And rebased.

@arokem arokem force-pushed the arokem:update-sfm-reference branch from f3ace86 to 6352256 Jan 22, 2016

@arokem

This comment has been minimized.

Member

arokem commented Jan 22, 2016

Now rebased again, to drop the 3.2 Travis build that was failing.

arokem added some commits Dec 21, 2015

RF: Many warnings mitigated (still some remain...), and other improve…
…ments:

- Code repetition removed by creating a helper function for isotropic models.
- Performance improvement by using the isotropic predictor only once, instead
  of in every iteration.
- Error handling: checking of mask appropriateness.

@arokem arokem force-pushed the arokem:update-sfm-reference branch from 6352256 to bb88df5 Feb 3, 2016

@arokem

This comment has been minimized.

Member

arokem commented Feb 3, 2016

Rebased again. Could someone please take a look?

Garyfallidis added a commit that referenced this pull request Feb 9, 2016

@Garyfallidis Garyfallidis merged commit 58fddfb into nipy:master Feb 9, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment